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

reducing dependencies

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-09-22 19:31:36 +02:00
parent 19cef426a5
commit 16a4577cde
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
+14 -10
View File
@@ -16,6 +16,8 @@
package com.intellij.psi.impl.compiled;
import com.intellij.ide.caches.FileContent;
import com.intellij.ide.highlighter.JavaClassFileType;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.lang.ASTNode;
import com.intellij.lang.FileASTNode;
import com.intellij.lang.java.JavaLanguage;
@@ -24,8 +26,8 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.NonCancelableSection;
import com.intellij.openapi.progress.ProgressIndicatorProvider;
import com.intellij.openapi.ui.Queryable;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.vfs.VirtualFile;
@@ -266,7 +268,7 @@ public class ClsFileImpl extends ClsRepositoryPsiElement<PsiClassHolderFileStub>
VirtualFile virtualFile = getVirtualFile();
final Document document = FileDocumentManager.getInstance().getDocument(virtualFile);
String text = document.getText();
String ext = StdFileTypes.JAVA.getDefaultExtension();
String ext = JavaFileType.INSTANCE.getDefaultExtension();
PsiClass[] classes = getClasses();
String fileName = (classes.length > 0 ? classes[0].getName(): virtualFile.getNameWithoutExtension()) + "." + ext;
@@ -275,12 +277,14 @@ public class ClsFileImpl extends ClsRepositoryPsiElement<PsiClassHolderFileStub>
final ASTNode mirrorTreeElement = SourceTreeToPsiMap.psiElementToTree(mirror);
//IMPORTANT: do not take lock too early - FileDocumentManager.getInstance().saveToString() can run write action...
ProgressManager.getInstance().executeNonCancelableSection(new Runnable() {
public void run() {
setMirror((TreeElement)mirrorTreeElement);
myMirrorFileElement.putUserData(DOCUMENT_IN_MIRROR_KEY, document);
}
});
final NonCancelableSection section = ProgressIndicatorProvider.getInstance().startNonCancelableSection();
try {
setMirror((TreeElement)mirrorTreeElement);
myMirrorFileElement.putUserData(DOCUMENT_IN_MIRROR_KEY, document);
}
finally {
section.done();
}
}
return myMirrorFileElement.getPsi();
@@ -311,7 +315,7 @@ public class ClsFileImpl extends ClsRepositoryPsiElement<PsiClassHolderFileStub>
@NotNull
public FileType getFileType() {
return StdFileTypes.CLASS;
return JavaClassFileType.INSTANCE;
}
@NotNull