From 10e04d282e48c96b300aa80c0a252266a28ca164 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 12 Oct 2016 16:13:05 +0200 Subject: [PATCH] provide hook for registering PsiElementFinder extensions before JavaPsiFacade is created in JavaCoreProjectEnvironment (required for Kotlin_ --- .../src/com/intellij/core/JavaCoreProjectEnvironment.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java b/java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java index eff11c980183..19a83f4a5717 100644 --- a/java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java +++ b/java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java @@ -60,6 +60,10 @@ public class JavaCoreProjectEnvironment extends CoreProjectEnvironment { myFileManager = createCoreFileManager(); myProject.registerService(JavaFileManager.class, myFileManager); + registerJavaPsiFacade(); + } + + protected void registerJavaPsiFacade() { JavaPsiFacadeImpl javaPsiFacade = new JavaPsiFacadeImpl(myProject, myPsiManager, myFileManager, myMessageBus); myProject.registerService(JavaPsiFacade.class, javaPsiFacade); }