From 15028b76ef5a61dde5c8a0b37c78470307e6a805 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 10 Jun 2014 16:50:35 +0400 Subject: [PATCH] Always provide not null project in scope for JavaClassFinderImpl --- .../jet/lang/resolve/java/JavaClassFinderImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java index b1131c1086c..102957bb90c 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java @@ -71,6 +71,13 @@ public class JavaClassFinderImpl implements JavaClassFinder { } return compare; } + + //NOTE: expected by class finder to be not null + @NotNull + @Override + public Project getProject() { + return project; + } }; javaFacade = new JavaPsiFacadeKotlinHacks(project); }