azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get JavaFileManager as service.

Browse Source 
Fix tests after update to IDEA 134.1160 EAP.
This commit is contained in:
Zalim Bashorov
2014-02-21 22:09:44 +04:00
parent 62afa2c742
commit 033b8289d7
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeKotlinHacks.java
+5 -8
View File
@@ -18,20 +18,17 @@ package org.jetbrains.jet.lang.resolve.java;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.intellij.core.CoreJavaFileManager; import com.intellij.core.CoreJavaFileManager;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.progress.ProgressIndicatorProvider; import com.intellij.openapi.progress.ProgressIndicatorProvider;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.psi.*; import com.intellij.psi.*;
import com.intellij.psi.impl.JavaPsiFacadeImpl; import com.intellij.psi.impl.JavaPsiFacadeImpl;
import com.intellij.psi.impl.file.impl.JavaFileManager; import com.intellij.psi.impl.file.impl.JavaFileManager;
import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashMap;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* TODO Temporary class until {@link JavaPsiFacadeImpl} hacked. * TODO Temporary class until {@link JavaPsiFacadeImpl} hacked.
@@ -55,12 +52,12 @@ public class JavaPsiFacadeKotlinHacks {
} }
@NotNull @NotNull
private JavaFileManager findJavaFileManager(@NotNull Project project) { private static JavaFileManager findJavaFileManager(@NotNull Project project) {
JavaFileManager javaFileManager = project.getComponent(JavaFileManager.class); JavaFileManager javaFileManager = ServiceManager.getService(project, JavaFileManager.class);
if (javaFileManager != null) { if (javaFileManager != null) {
return javaFileManager; return javaFileManager;
} }
javaFileManager = project.getComponent(CoreJavaFileManager.class); javaFileManager = ServiceManager.getService(project, CoreJavaFileManager.class);
if (javaFileManager != null) { if (javaFileManager != null) {
// TODO: why it is not found by JavaFileManager? // TODO: why it is not found by JavaFileManager?
return javaFileManager; return javaFileManager;
@@ -81,7 +78,7 @@ public class JavaPsiFacadeKotlinHacks {
return psiPackage; return psiPackage;
} }
} }
return psiPackage; return null;
} }
public PsiClass findClass(@NotNull String qualifiedName, @NotNull GlobalSearchScope scope) { public PsiClass findClass(@NotNull String qualifiedName, @NotNull GlobalSearchScope scope) {