When building light classes don't resolve irrelevant declarations in the same package

2013-09-26 18:57:00 -07:00
parent 783258d91a
commit 623b169d71
5 changed files with 62 additions and 42 deletions
@@ -103,22 +103,23 @@ public class CliLightClassGenerationSupport extends LightClassGenerationSupport
        module = null;
    }

-    private LightClassConstructionContext analyzeRelevantCode() {
+    @NotNull
+    @Override
+    public LightClassConstructionContext getContextForPackage(@NotNull Collection<JetFile> files) {
+        return getContext();
+    }
+
+    @NotNull
+    @Override
+    public LightClassConstructionContext getContextForClassOrObject(@NotNull JetClassOrObject classOrObject) {
+        return getContext();
+    }
+
+    @NotNull
+    private LightClassConstructionContext getContext() {
        return new LightClassConstructionContext(getTrace().getBindingContext(), null);
    }

-    @NotNull
-    @Override
-    public LightClassConstructionContext analyzeRelevantCode(@NotNull Collection<JetFile> files) {
-        return analyzeRelevantCode();
-    }
-
-    @NotNull
-    @Override
-    public LightClassConstructionContext analyzeRelevantCode(@NotNull JetClassOrObject classOrObject) {
-        return analyzeRelevantCode();
-    }
-
    @NotNull
    @Override
    public Collection<JetClassOrObject> findClassOrObjectDeclarations(@NotNull FqName fqName, @NotNull GlobalSearchScope searchScope) {