From 2172d0c6e329a21673ba6b376039f426d146855a Mon Sep 17 00:00:00 2001
From: Code-Ac <76821666+Code-Ac@users.noreply.github.com>
Date: Sat, 29 Jan 2022 18:41:23 +0100
Subject: [PATCH 1/3] Update IntelliJ project config
---
.idea/ant.xml | 6 ++++
.idea/codeStyles/Project.xml | 30 +++++++++++++++++++
.idea/modules.xml | 1 -
app/processing4-app.iml | 4 +--
core/processing4-core.iml | 3 +-
.../mode/java/CompletionGenerator.java | 1 +
6 files changed, 41 insertions(+), 4 deletions(-)
create mode 100644 .idea/ant.xml
create mode 100644 .idea/codeStyles/Project.xml
diff --git a/.idea/ant.xml b/.idea/ant.xml
new file mode 100644
index 0000000000..d23b5d8283
--- /dev/null
+++ b/.idea/ant.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000000..76b811f5a3
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 335d8c4b3e..dccf36f7ac 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -7,7 +7,6 @@
-
diff --git a/app/processing4-app.iml b/app/processing4-app.iml
index 946a9d3446..ce13897a42 100644
--- a/app/processing4-app.iml
+++ b/app/processing4-app.iml
@@ -36,7 +36,7 @@
-
+
@@ -45,7 +45,7 @@
-
+
diff --git a/core/processing4-core.iml b/core/processing4-core.iml
index 129c875258..927df83242 100644
--- a/core/processing4-core.iml
+++ b/core/processing4-core.iml
@@ -7,6 +7,7 @@
-
+
+
\ No newline at end of file
diff --git a/java/src/processing/mode/java/CompletionGenerator.java b/java/src/processing/mode/java/CompletionGenerator.java
index 83a7d5a1b9..6dccff8b07 100644
--- a/java/src/processing/mode/java/CompletionGenerator.java
+++ b/java/src/processing/mode/java/CompletionGenerator.java
@@ -1693,6 +1693,7 @@ public List preparePredictions(final PreprocSketch ps,
// If the parsed code contains pde enhancements, take 'em out.
// TODO: test this
+ // The Processing Foundation: Running untested code since 2016
TextTransform transform = new TextTransform(pdePhrase);
transform.addAll(SourceUtil.replaceTypeConstructors(pdePhrase));
transform.addAll(SourceUtil.replaceHexLiterals(pdePhrase));
From 04d1ea571bc1960512f7f9a64df21eb8e778d06b Mon Sep 17 00:00:00 2001
From: Code-Ac <76821666+Code-Ac@users.noreply.github.com>
Date: Sat, 29 Jan 2022 20:31:18 +0100
Subject: [PATCH 2/3] Add build instructions
---
build/README.md | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/build/README.md b/build/README.md
index 7ed751b16b..29955b53ef 100644
--- a/build/README.md
+++ b/build/README.md
@@ -207,4 +207,7 @@ Then copy that `jogl-all-src.jar` file to sit next to the `jogl-all.jar` folder
### IntelliJ
-Using Eclipse isn't supported, and I've switched to IntelliJ. However, IntelliJ is baffling enough that I don't have good instructions yet on how to develop inside there. If you and IntelliJ have a better relationship than I do, [please help!](https://github.com/processing/processing4/issues/275)
+For IntelliJ, just use the "File/New/Project from Version Control..." from the navbar or the "Get from VCS" button in the Main menu - then select GIT and type in `git clone https://github.com/processing/processing4.git` as the URL. Click "Clone" and the project will be downloaded and opened.
+
+To run Ant tasks like build or run, open the Ant tab (defaults to the very right) and double-click your task. The build output can be seen in the "Messages" tab (select from the bottom tabs).
+
From 1c47fd3d61f04ed00b9615825fa00392d43c5d48 Mon Sep 17 00:00:00 2001
From: Code-Ac
Date: Sat, 29 Jan 2022 22:59:23 +0100
Subject: [PATCH 3/3] Sorry, just removed it
---
java/src/processing/mode/java/CompletionGenerator.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/java/src/processing/mode/java/CompletionGenerator.java b/java/src/processing/mode/java/CompletionGenerator.java
index 6dccff8b07..f1d871786f 100644
--- a/java/src/processing/mode/java/CompletionGenerator.java
+++ b/java/src/processing/mode/java/CompletionGenerator.java
@@ -1692,8 +1692,6 @@ public List preparePredictions(final PreprocSketch ps,
ASTNode astRootNode = (ASTNode) ps.compilationUnit.types().get(0);
// If the parsed code contains pde enhancements, take 'em out.
- // TODO: test this
- // The Processing Foundation: Running untested code since 2016
TextTransform transform = new TextTransform(pdePhrase);
transform.addAll(SourceUtil.replaceTypeConstructors(pdePhrase));
transform.addAll(SourceUtil.replaceHexLiterals(pdePhrase));