PDEX: simplify import suggestion handling

JakubValtar · JakubValtar · commit a79fe7fdc459 · 2016-12-16T04:45:42.000+01:00
diff --git a/java/src/processing/mode/java/pdex/PDEX.java b/java/src/processing/mode/java/pdex/PDEX.java
@@ -36,8 +36,10 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Deque;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -1074,6 +1076,9 @@ public void dispose() {
 
 
     private void handleSketchProblems(PreprocessedSketch ps) {
+      Map<String, String[]> suggCache =
+          JavaMode.importSuggestEnabled ? new HashMap<>() : Collections.emptyMap();
+
       // Process problems
       IProblem[] iproblems = ps.compilationUnit.getProblems();
       final List<Problem> problems = Arrays.stream(iproblems)
@@ -1095,38 +1100,20 @@ private void handleSketchProblems(PreprocessedSketch ps) {
             int line = ps.tabOffsetToTabLine(in.tabIndex, in.startTabOffset);
             JavaProblem p = new JavaProblem(iproblem, in.tabIndex, line);
             p.setPDEOffsets(in.startTabOffset, in.stopTabOffset);
+
+            // Handle import suggestions
+            if (JavaMode.importSuggestEnabled && isUndefinedTypeProblem(iproblem)) {
+              ClassPath cp = ps.searchClassPath;
+              String[] s = suggCache.computeIfAbsent(iproblem.getArguments()[0],
+                                                     name -> getImportSuggestions(cp, name));
+              p.setImportSuggestions(s);
+            }
+
             return p;
           })
-          .filter(p -> p != null)
+          .filter(Objects::nonNull)
           .collect(Collectors.toList());
 
-      // Handle import suggestions
-      if (JavaMode.importSuggestEnabled) {
-        Map<String, List<Problem>> undefinedTypeProblems = problems.stream()
-            // Get only problems with undefined types/names
-            .filter(p -> {
-              int id = ((JavaProblem) p).getIProblem().getID();
-              return id == IProblem.UndefinedType ||
-                  id == IProblem.UndefinedName ||
-                  id == IProblem.UnresolvedVariable;
-            })
-            // Group problems by the missing type/name
-            .collect(Collectors.groupingBy(p -> ((JavaProblem) p).getIProblem().getArguments()[0]));
-
-        if (!undefinedTypeProblems.isEmpty()) {
-          final ClassPath cp = ps.searchClassPath;
-
-          // Get suggestions for each missing type, update the problems
-          undefinedTypeProblems.entrySet().stream()
-              .forEach(entry -> {
-                String missingClass = entry.getKey();
-                List<Problem> affectedProblems = entry.getValue();
-                String[] suggestions = getImportSuggestions(cp, missingClass);
-                affectedProblems.forEach(p -> ((JavaProblem) p).setImportSuggestions(suggestions));
-              });
-        }
-      }
-
       if (scheduledUiUpdate != null) {
         scheduledUiUpdate.cancel(true);
       }
@@ -1142,6 +1129,14 @@ private void handleSketchProblems(PreprocessedSketch ps) {
     }
 
 
+    private boolean isUndefinedTypeProblem(IProblem iproblem) {
+      int id = iproblem.getID();
+      return id == IProblem.UndefinedType ||
+          id == IProblem.UndefinedName ||
+          id == IProblem.UnresolvedVariable;
+    }
+
+
     public static String[] getImportSuggestions(ClassPath cp, String className) {
       RegExpResourceFilter regf = new RegExpResourceFilter(
           Pattern.compile(".*"),
