From 1f78c75db083816193f69464ee85d6658d4b5e07 Mon Sep 17 00:00:00 2001
From: Jakub Valtar <jakub.valtar@gmail.com>
Date: Thu, 14 Apr 2016 20:02:28 +0200
Subject: [PATCH] ASTGen: use classpath from preprocessed sketch

---
 java/src/processing/mode/java/pdex/ASTGenerator.java        | 6 +-----
 java/src/processing/mode/java/pdex/ErrorCheckerService.java | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java
index 85efaa52b..f36c737d2 100644
--- a/java/src/processing/mode/java/pdex/ASTGenerator.java
+++ b/java/src/processing/mode/java/pdex/ASTGenerator.java
@@ -128,11 +128,6 @@ public class ASTGenerator {
     //loadJavaDoc();
   }
 
-  /**
-   * Used for searching for package declaration of a class
-   */
-  protected ClassPath classPath;
-
 
   public static CompletionCandidate[] checkForTypes(ASTNode node) {
 
@@ -2659,6 +2654,7 @@ public class ASTGenerator {
       // We're seeing a simple name that's not defined locally or in
       // the parent class. So most probably a pre-defined type.
       log("Empty can. " + phrase);
+      ClassPath classPath = errorCheckerService.latestResult.classPath;
       if (classPath != null) {
         RegExpResourceFilter regExpResourceFilter =
             new RegExpResourceFilter(Pattern.compile(".*"),
diff --git a/java/src/processing/mode/java/pdex/ErrorCheckerService.java b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
index 9a5695972..c8068587d 100644
--- a/java/src/processing/mode/java/pdex/ErrorCheckerService.java
+++ b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
@@ -220,7 +220,6 @@ public class ErrorCheckerService {
                     public void run() {
                       synchronized (astGenerator) {
                         astGenerator.updateAST(latestResult.compilationUnit, tree);
-                        astGenerator.classPath = result.classPath;
                       }
                       updateErrorTable(result.problems);
                       editor.updateErrorBar(result.problems);