From 7491728786b2d6b23585c9be4bdcd84daf5680a1 Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Wed, 30 May 2012 17:04:48 +0200 Subject: [PATCH] environment initialization for UpSource --- .../com/intellij/core/JavaCoreProjectEnvironment.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 ac3cb98853e4..1d0d3622b5c4 100644 --- a/java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java +++ b/java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java @@ -43,21 +43,22 @@ public class JavaCoreProjectEnvironment extends CoreProjectEnvironment { public JavaCoreProjectEnvironment(Disposable parentDisposable, CoreApplicationEnvironment applicationEnvironment) { super(parentDisposable, applicationEnvironment); - myFileManager = createCoreFileManager(); - myPackageIndex = createCorePackageIndex(); myProject.registerService(PsiElementFactory.class, new PsiElementFactoryImpl(myPsiManager)); myProject.registerService(JavaPsiImplementationHelper.class, new CoreJavaPsiImplementationHelper()); myProject.registerService(PsiResolveHelper.class, new PsiResolveHelperImpl(myPsiManager)); myProject.registerService(LanguageLevelProjectExtension.class, new CoreLanguageLevelProjectExtension()); - myProject.registerService(PackageIndex.class, myPackageIndex); myProject.registerService(JavaResolveCache.class, new JavaResolveCache(myMessageBus)); myProject.registerService(JavaCodeStyleSettingsFacade.class, new CoreJavaCodeStyleSettingsFacade()); myProject.registerService(JavaCodeStyleManager.class, new CoreJavaCodeStyleManager()); - registerProjectExtensionPoint(PsiElementFinder.EP_NAME, PsiElementFinder.class); - JavaPsiFacadeImpl javaPsiFacade = new JavaPsiFacadeImpl(myProject, myPsiManager, myFileManager, myMessageBus); + myPackageIndex = createCorePackageIndex(); + myProject.registerService(PackageIndex.class, myPackageIndex); + + myFileManager = createCoreFileManager(); myProject.registerService(JavaFileManager.class, myFileManager); + + JavaPsiFacadeImpl javaPsiFacade = new JavaPsiFacadeImpl(myProject, myPsiManager, myFileManager, myMessageBus); registerProjectComponent(JavaPsiFacade.class, javaPsiFacade); myProject.registerService(JavaPsiFacade.class, javaPsiFacade); }