Skip to content

Commit bfe357b

Browse files
Manindra29Manindra29
committed
wrap up #2951 
1 parent d1c121f commit bfe357b

2 files changed

Lines changed: 48 additions & 49 deletions

File tree

‎java/src/processing/mode/java/pdex/ASTGenerator.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3520,18 +3520,17 @@ protected boolean ignorableImport(String impName, String fullClassName) {
35203520
log("SuggestionsMap is null or empty, won't be able to trim class names");
35213521
return true;
35223522
}
3523-
final String processingInclude = "include.processing";
3524-
final String processingExclude = "exclude.processing";
3525-
final String jdkInclude = "include.jdk";
3523+
final String include = "include";
3524+
final String exclude = "exclude";
35263525

35273526
if (impName.startsWith("processing")) {
3528-
if (JavaMode.suggestionsMap.get(processingInclude).contains(impName)) {
3527+
if (JavaMode.suggestionsMap.get(include).contains(impName)) {
35293528
return false;
3530-
} else if (JavaMode.suggestionsMap.get(processingExclude).contains(impName)) {
3529+
} else if (JavaMode.suggestionsMap.get(exclude).contains(impName)) {
35313530
return true;
35323531
}
35333532
} else if (impName.startsWith("java")) {
3534-
if (JavaMode.suggestionsMap.get(jdkInclude).contains(impName)) {
3533+
if (JavaMode.suggestionsMap.get(include).contains(impName)) {
35353534
return false;
35363535
}
35373536
}

‎java/suggestions.txt‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
#List of suggestions to include/exclude in code completion
22

3-
#<include/exclude>.<label>=<fully qualified class name>
3+
#<include/exclude>=<fully qualified class name>
44

5-
include.processing=processing.core.PApplet
6-
include.processing=processing.core.PFont
7-
include.processing=processing.core.PGraphics
8-
include.processing=processing.core.PImage
9-
include.processing=processing.core.PMatrix2D
10-
include.processing=processing.core.PMatrix3D
11-
include.processing=processing.core.PStyle
12-
include.processing=processing.core.PVector
13-
include.processing=processing.core.PShape
14-
include.processing=processing.core.PGraphicsJava2D
15-
include.processing=processing.core.PGraphics2D
16-
include.processing=processing.core.PGraphics3D
17-
include.processing=processing.data.FloatDict
18-
include.processing=processing.data.FloatList
19-
include.processing=processing.data.IntDict
20-
include.processing=processing.data.IntList
21-
include.processing=processing.data.JSONArray
22-
include.processing=processing.data.JSONObject
23-
include.processing=processing.data.StringDict
24-
include.processing=processing.data.StringList
25-
include.processing=processing.data.Table
26-
include.processing=processing.data.XML
27-
include.processing=processing.event.Event
28-
include.processing=processing.event.KeyEvent
29-
include.processing=processing.event.MouseEvent
30-
include.processing=processing.event.TouchEvent
31-
include.processing=processing.opengl.PShader
32-
include.processing=processing.opengl.PGL
5+
include=processing.core.PApplet
6+
include=processing.core.PFont
7+
include=processing.core.PGraphics
8+
include=processing.core.PImage
9+
include=processing.core.PMatrix2D
10+
include=processing.core.PMatrix3D
11+
include=processing.core.PStyle
12+
include=processing.core.PVector
13+
include=processing.core.PShape
14+
include=processing.core.PGraphicsJava2D
15+
include=processing.core.PGraphics2D
16+
include=processing.core.PGraphics3D
17+
include=processing.data.FloatDict
18+
include=processing.data.FloatList
19+
include=processing.data.IntDict
20+
include=processing.data.IntList
21+
include=processing.data.JSONArray
22+
include=processing.data.JSONObject
23+
include=processing.data.StringDict
24+
include=processing.data.StringList
25+
include=processing.data.Table
26+
include=processing.data.XML
27+
include=processing.event.Event
28+
include=processing.event.KeyEvent
29+
include=processing.event.MouseEvent
30+
include=processing.event.TouchEvent
31+
include=processing.opengl.PShader
32+
include=processing.opengl.PGL
3333

34-
exclude.processing=processing.core.PGraphicsRetina2D
35-
exclude.processing=processing.core.PShapeOBJ
36-
exclude.processing=processing.core.PShapeSVG
37-
exclude.processing=processing.data.Sort
38-
exclude.processing=processing.opengl.FrameBuffer
39-
exclude.processing=processing.opengl.LinePath
40-
exclude.processing=processing.opengl.LinePath.PathIterator
41-
exclude.processing=processing.opengl.LineStroker
42-
exclude.processing=processing.opengl.PGraphicsOpenGL
34+
exclude=processing.core.PGraphicsRetina2D
35+
exclude=processing.core.PShapeOBJ
36+
exclude=processing.core.PShapeSVG
37+
exclude=processing.data.Sort
38+
exclude=processing.opengl.FrameBuffer
39+
exclude=processing.opengl.LinePath
40+
exclude=processing.opengl.LinePath.PathIterator
41+
exclude=processing.opengl.LineStroker
42+
exclude=processing.opengl.PGraphicsOpenGL
4343

44-
include.jdk=java.util.ArrayList
45-
include.jdk=java.io.BufferedReader
46-
include.jdk=java.util.HashMap
47-
include.jdk=java.io.PrintWriter
48-
include.jdk=java.lang.String
44+
include=java.util.ArrayList
45+
include=java.io.BufferedReader
46+
include=java.util.HashMap
47+
include=java.io.PrintWriter
48+
include=java.lang.String

0 commit comments

Comments
 (0)