mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
use cheaper viewProvider.getFileType where possible
This commit is contained in:
+1
-1
@@ -84,7 +84,7 @@ public abstract class JavaLineBreakpointTypeBase<P extends JavaBreakpointPropert
|
||||
public final boolean canPutAt(@NotNull final VirtualFile file, final int line, @NotNull Project project) {
|
||||
final PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
|
||||
// JSPX supports jvm debugging, but not in XHTML files
|
||||
if (psiFile == null || psiFile.getVirtualFile().getFileType() == StdFileTypes.XHTML) {
|
||||
if (psiFile == null || psiFile.getViewProvider().getFileType() == StdFileTypes.XHTML) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ public class JsonFileImpl extends PsiFileBase implements JsonFile {
|
||||
@NotNull
|
||||
@Override
|
||||
public FileType getFileType() {
|
||||
return getViewProvider().getVirtualFile().getFileType();
|
||||
return getViewProvider().getFileType();
|
||||
}
|
||||
|
||||
@Nullable
|
||||
|
||||
@@ -42,7 +42,6 @@ public class PsiBinaryFileImpl extends PsiElementBase implements PsiBinaryFile,
|
||||
private String myName; // for myFile == null only
|
||||
private byte[] myContents; // for myFile == null only
|
||||
private final long myModificationStamp;
|
||||
private final FileType myFileType;
|
||||
private final FileViewProvider myViewProvider;
|
||||
|
||||
public PsiBinaryFileImpl(PsiManagerImpl manager, FileViewProvider viewProvider) {
|
||||
@@ -50,7 +49,6 @@ public class PsiBinaryFileImpl extends PsiElementBase implements PsiBinaryFile,
|
||||
myManager = manager;
|
||||
final VirtualFile virtualFile = myViewProvider.getVirtualFile();
|
||||
myModificationStamp = virtualFile.getModificationStamp();
|
||||
myFileType = viewProvider.getVirtualFile().getFileType();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -277,7 +275,7 @@ public class PsiBinaryFileImpl extends PsiElementBase implements PsiBinaryFile,
|
||||
@Override
|
||||
@NotNull
|
||||
public FileType getFileType() {
|
||||
return myFileType;
|
||||
return myViewProvider.getFileType();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -28,7 +28,7 @@ public class PsiPlainTextFileImpl extends PsiFileImpl implements PsiPlainTextFil
|
||||
|
||||
public PsiPlainTextFileImpl(FileViewProvider viewProvider) {
|
||||
super(PlainTextTokenTypes.PLAIN_TEXT_FILE, PlainTextTokenTypes.PLAIN_TEXT_FILE, viewProvider);
|
||||
myFileType = viewProvider.getBaseLanguage() != PlainTextLanguage.INSTANCE ? PlainTextFileType.INSTANCE : viewProvider.getVirtualFile().getFileType();
|
||||
myFileType = viewProvider.getBaseLanguage() != PlainTextLanguage.INSTANCE ? PlainTextFileType.INSTANCE : viewProvider.getFileType();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -52,8 +52,7 @@ public final class CommandLineFile extends PsiFileBase implements CommandLinePar
|
||||
@NotNull
|
||||
@Override
|
||||
public FileType getFileType() {
|
||||
|
||||
return getViewProvider().getVirtualFile().getFileType();
|
||||
return getViewProvider().getFileType();
|
||||
}
|
||||
|
||||
@Nullable
|
||||
|
||||
@@ -349,7 +349,7 @@ public class ExternalDocumentValidator {
|
||||
return;
|
||||
}
|
||||
|
||||
final FileType fileType = containingFile.getViewProvider().getVirtualFile().getFileType();
|
||||
final FileType fileType = containingFile.getViewProvider().getFileType();
|
||||
if (fileType != XmlFileType.INSTANCE && fileType != XHtmlFileType.INSTANCE) {
|
||||
return;
|
||||
}
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ public class HtmlStructureViewBuilderProvider implements XmlStructureViewBuilder
|
||||
@Override
|
||||
@Nullable
|
||||
public StructureViewBuilder createStructureViewBuilder(@NotNull final XmlFile file) {
|
||||
if (file.getViewProvider().getVirtualFile().getFileType() != HtmlFileType.INSTANCE) return null;
|
||||
if (file.getViewProvider().getFileType() != HtmlFileType.INSTANCE) return null;
|
||||
|
||||
return new TreeBasedStructureViewBuilder() {
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user