MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

dependencies cleanup

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-09-22 19:31:35 +02:00
parent bcdcf195ed
commit 19cef426a5
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java
+2 -2
View File
@@ -15,11 +15,11 @@
*/
package com.intellij.psi.impl.compiled;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.lang.ASTNode;
import com.intellij.lang.Language;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
@@ -113,7 +113,7 @@ public abstract class ClsElementImpl extends PsiElementBase implements PsiCompil
}
protected int getIndentSize() {
return CodeStyleSettingsManager.getSettings(getProject()).getIndentSize(StdFileTypes.JAVA);
return CodeStyleSettingsManager.getSettings(getProject()).getIndentSize(JavaFileType.INSTANCE);
}
public abstract void setMirror(@NotNull TreeElement element);
java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileImpl.java
+5 -9
View File
@@ -15,21 +15,17 @@
*/
package com.intellij.psi.impl.source;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.lexer.JavaLexer;
import com.intellij.lexer.Lexer;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.FileIndexFacade;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.FileViewProvider;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiElementFactory;
import com.intellij.psi.PsiPackageStatement;
import com.intellij.psi.impl.java.stubs.JavaStubElementTypes;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.GlobalSearchScopes;
import com.intellij.util.IncorrectOperationException;
import com.intellij.testFramework.LightVirtualFile;
import org.jetbrains.annotations.NotNull;
@@ -51,7 +47,7 @@ public class PsiJavaFileImpl extends PsiJavaFileBaseImpl {
public GlobalSearchScope getResolveScope() {
final VirtualFile file = getVirtualFile();
if (file != null && !(file instanceof LightVirtualFile)) {
final ProjectFileIndex index = ProjectRootManager.getInstance(getProject()).getFileIndex();
final FileIndexFacade index = ServiceManager.getService(getProject(), FileIndexFacade.class);
if (!index.isInSource(file) && !index.isInLibraryClasses(file)) {
return GlobalSearchScopes.fileScope(this);
}
@@ -61,6 +57,6 @@ public class PsiJavaFileImpl extends PsiJavaFileBaseImpl {
@NotNull
public FileType getFileType() {
return StdFileTypes.JAVA;
return JavaFileType.INSTANCE;
}
}