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

Deprecated StdFileTypes usages replaced

Browse Source 
GitOrigin-RevId: efa786a155eb3312d723e5419677bc63a53b8ec4
This commit is contained in:
Tagir Valeev
2020-05-26 09:12:03 +03:00
committed by intellij-monorepo-bot
parent f40e12f838
commit 8ec4f3b419
24 changed files with 72 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java
+2 -2
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.compiler.actions;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.lang.IdeLanguageCustomization;
import com.intellij.notification.NotificationGroup;
import com.intellij.notification.NotificationType;
@@ -23,7 +24,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonShortcuts;
import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.compiler.JavaCompilerBundle;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.Task;
@@ -68,7 +68,7 @@ public class BuildArtifactAction extends DumbAwareAction {
final Project project = getEventProject(e);
final Presentation presentation = e.getPresentation();
boolean enabled = project != null && !ArtifactUtil.getArtifactWithOutputPaths(project).isEmpty();
if (IdeLanguageCustomization.getInstance().getPrimaryIdeLanguages().contains(StdFileTypes.JAVA.getLanguage())
if (IdeLanguageCustomization.getInstance().getPrimaryIdeLanguages().contains(JavaFileType.INSTANCE.getLanguage())
&& ActionPlaces.MAIN_MENU.equals(e.getPlace())) {
//building artifacts is a valuable functionality for Java IDEs, let's not hide 'Build Artifacts' item from the main menu
presentation.setEnabled(enabled);
java/compiler/impl/src/com/intellij/compiler/backwardRefs/view/TestCompilerRefFunctionalExpressionSearchAction.java
+2 -2
View File
@@ -2,7 +2,7 @@
package com.intellij.compiler.backwardRefs.view;
import com.intellij.compiler.backwardRefs.CompilerReferenceServiceImpl;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.psi.LambdaUtil;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
@@ -22,7 +22,7 @@ public class TestCompilerRefFunctionalExpressionSearchAction extends TestCompile
protected CompilerReferenceHierarchyTestInfo getHierarchy(@NotNull PsiElement element,
@NotNull CompilerReferenceServiceImpl refService,
@NotNull GlobalSearchScope scope) {
return refService.getTestFunExpressions((PsiNamedElement)element, scope, StdFileTypes.JAVA);
return refService.getTestFunExpressions((PsiNamedElement)element, scope, JavaFileType.INSTANCE);
}
@Override
java/compiler/impl/src/com/intellij/compiler/backwardRefs/view/TestCompilerRefInheritanceAction.java
+2 -2
View File
@@ -2,7 +2,7 @@
package com.intellij.compiler.backwardRefs.view;
import com.intellij.compiler.backwardRefs.CompilerReferenceServiceImpl;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiNamedElement;
@@ -25,6 +25,6 @@ public class TestCompilerRefInheritanceAction extends TestCompilerHierarchyBaseA
protected CompilerReferenceHierarchyTestInfo getHierarchy(@NotNull PsiElement element,
@NotNull CompilerReferenceServiceImpl refService,
@NotNull GlobalSearchScope scope) {
return refService.getTestHierarchy((PsiNamedElement)element, scope, StdFileTypes.JAVA);
return refService.getTestHierarchy((PsiNamedElement)element, scope, JavaFileType.INSTANCE);
}
}
java/compiler/impl/src/com/intellij/compiler/impl/MessagesContainer.java
+2 -2
View File
@@ -3,13 +3,13 @@ package com.intellij.compiler.impl;
import com.intellij.application.options.CodeStyle;
import com.intellij.compiler.CompilerMessageImpl;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.compiler.CompilerMessage;
import com.intellij.openapi.compiler.CompilerMessageCategory;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
@@ -40,7 +40,7 @@ public class MessagesContainer {
private static int getTabSize(@NotNull Project project) {
try {
return CodeStyle.getSettings(project).getTabSize(StdFileTypes.JAVA);
return CodeStyle.getSettings(project).getTabSize(JavaFileType.INSTANCE);
}
catch (ProcessCanceledException e) {
throw e;
java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/FilePathActionJavac.java
+4 -3
View File
@@ -16,11 +16,12 @@
package com.intellij.compiler.impl.javaCompiler.javac;
import com.intellij.compiler.OutputParser;
import com.intellij.ide.highlighter.JavaClassFileType;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.compiler.JavaCompilerBundle;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.fileTypes.StdFileTypes;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -52,11 +53,11 @@ public class FilePathActionJavac extends JavacParserAction {
final String name = index >= 0 ? filePath.substring(index + 1) : filePath;
final FileType fileType = FileTypeManager.getInstance().getFileTypeByFileName(name);
if (StdFileTypes.JAVA.equals(fileType)) {
if (JavaFileType.INSTANCE.equals(fileType)) {
callback.fileProcessed(filePath);
callback.setProgressText(JavaCompilerBundle.message("progress.parsing.file", name));
}
else if (StdFileTypes.CLASS.equals(fileType)) {
else if (JavaClassFileType.INSTANCE.equals(fileType)) {
callback.fileGenerated(filePath);
}
}
java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOutputParser.java
+3 -3
View File
@@ -17,12 +17,12 @@ package com.intellij.compiler.impl.javaCompiler.javac;
import com.intellij.application.options.CodeStyle;
import com.intellij.compiler.OutputParser;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.compiler.JavaCompilerBundle;
import com.intellij.openapi.compiler.CompilerMessageCategory;
import com.intellij.openapi.compiler.JavaCompilerBundle;
import com.intellij.openapi.editor.ex.util.EditorUtil;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
@@ -42,7 +42,7 @@ public class JavacOutputParser extends OutputParser {
@NonNls private String WARNING_PREFIX = "warning:"; // default value
public JavacOutputParser(Project project) {
myTabSize = CodeStyle.getSettings(project).getTabSize(StdFileTypes.JAVA);
myTabSize = CodeStyle.getSettings(project).getTabSize(JavaFileType.INSTANCE);
if (ApplicationManager.getApplication().isUnitTestMode()) {
// emulate patterns setup if 'embedded' javac is used (javac is started not via JavacRunner)
addJavacPattern(JavacResourcesReader.MSG_PARSING_STARTED + JavacResourcesReader.CATEGORY_VALUE_DIVIDER + "[parsing started {0}]");
java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java
+4 -3
View File
@@ -1,9 +1,9 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.debugger.actions;
import com.intellij.debugger.JavaDebuggerBundle;
import com.intellij.debugger.DebuggerManagerEx;
import com.intellij.debugger.InstanceFilter;
import com.intellij.debugger.JavaDebuggerBundle;
import com.intellij.debugger.SourcePosition;
import com.intellij.debugger.engine.DebugProcessImpl;
import com.intellij.debugger.engine.DebuggerUtils;
@@ -16,13 +16,14 @@ import com.intellij.debugger.ui.breakpoints.Breakpoint;
import com.intellij.debugger.ui.breakpoints.BreakpointManager;
import com.intellij.debugger.ui.breakpoints.FieldBreakpoint;
import com.intellij.debugger.ui.impl.watch.*;
import com.intellij.ide.highlighter.JavaClassFileType;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.vfs.VirtualFile;
@@ -185,7 +186,7 @@ public class ToggleFieldBreakpointAction extends AnAction {
if (file != null) {
final VirtualFile virtualFile = file.getVirtualFile();
FileType fileType = virtualFile != null ? virtualFile.getFileType() : null;
if (StdFileTypes.JAVA == fileType || StdFileTypes.CLASS == fileType) {
if (JavaFileType.INSTANCE == fileType || JavaClassFileType.INSTANCE == fileType) {
final PsiField field = FieldBreakpoint.findField(project, document, editor.getCaretModel().getOffset());
if(field != null){
return SourcePosition.createFromElement(field);
java/debugger/impl/src/com/intellij/debugger/actions/ToggleMethodBreakpointAction.java
+3 -2
View File
@@ -21,6 +21,8 @@ import com.intellij.debugger.impl.DebuggerUtilsEx;
import com.intellij.debugger.ui.breakpoints.Breakpoint;
import com.intellij.debugger.ui.breakpoints.BreakpointManager;
import com.intellij.debugger.ui.breakpoints.MethodBreakpoint;
import com.intellij.ide.highlighter.JavaClassFileType;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.actionSystem.ActionPlaces;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -29,7 +31,6 @@ import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDocumentManager;
@@ -113,7 +114,7 @@ public class ToggleMethodBreakpointAction extends AnAction {
if (file != null) {
final VirtualFile virtualFile = file.getVirtualFile();
FileType fileType = virtualFile != null ? virtualFile.getFileType() : null;
if (StdFileTypes.JAVA == fileType || StdFileTypes.CLASS == fileType) {
if (JavaFileType.INSTANCE == fileType || JavaClassFileType.INSTANCE == fileType) {
method = findMethod(project, editor);
}
}
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/DefaultCodeFragmentFactory.java
+3 -3
View File
@@ -3,15 +3,15 @@ package com.intellij.debugger.engine.evaluation;
import com.intellij.codeInsight.completion.CompletionService;
import com.intellij.codeInsight.completion.JavaCompletionUtil;
import com.intellij.debugger.JavaDebuggerBundle;
import com.intellij.debugger.DebuggerManagerEx;
import com.intellij.debugger.JavaDebuggerBundle;
import com.intellij.debugger.codeinsight.RuntimeTypeEvaluator;
import com.intellij.debugger.engine.evaluation.expression.EvaluatorBuilder;
import com.intellij.debugger.engine.evaluation.expression.EvaluatorBuilderImpl;
import com.intellij.debugger.impl.DebuggerContextImpl;
import com.intellij.debugger.impl.DebuggerSession;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
@@ -114,7 +114,7 @@ public class DefaultCodeFragmentFactory extends CodeFragmentFactory {
@Override
@NotNull
public LanguageFileType getFileType() {
return StdFileTypes.JAVA;
return JavaFileType.INSTANCE;
}
@Override
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/TextWithImportsImpl.java
+2 -2
View File
@@ -1,10 +1,10 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.debugger.engine.evaluation;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.lang.LanguageUtil;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.util.Trinity;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.JavaCodeFragment;
@@ -35,7 +35,7 @@ public final class TextWithImportsImpl implements TextWithImports{
if(containingFile instanceof PsiExpressionCodeFragment) {
myText = text;
myImports = ((JavaCodeFragment)containingFile).importsToString();
myFileType = StdFileTypes.JAVA;
myFileType = JavaFileType.INSTANCE;
}
else {
Trinity<String, String, FileType> trinity = parseExternalForm(text);
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/EvaluatorBuilderImpl.java
+2 -2
View File
@@ -18,9 +18,9 @@ import com.intellij.debugger.engine.JVMName;
import com.intellij.debugger.engine.JVMNameUtil;
import com.intellij.debugger.engine.evaluation.*;
import com.intellij.debugger.impl.DebuggerUtilsEx;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.lang.jvm.JvmModifier;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
@@ -1388,7 +1388,7 @@ public class EvaluatorBuilderImpl implements EvaluatorBuilder {
}
private Evaluator buildFromJavaCode(String code, String imports, @NotNull PsiElement context) {
TextWithImportsImpl text = new TextWithImportsImpl(CodeFragmentKind.CODE_BLOCK, code, imports, StdFileTypes.JAVA);
TextWithImportsImpl text = new TextWithImportsImpl(CodeFragmentKind.CODE_BLOCK, code, imports, JavaFileType.INSTANCE);
JavaCodeFragment codeFragment = DefaultCodeFragmentFactory.getInstance().createCodeFragment(text, context, context.getProject());
return accept(codeFragment);
}
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
+2 -2
View File
@@ -25,13 +25,13 @@ import com.intellij.execution.filters.TextConsoleBuilderFactory;
import com.intellij.execution.ui.ConsoleView;
import com.intellij.execution.ui.RunnerLayoutUi;
import com.intellij.execution.ui.layout.impl.RunnerContentUi;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
@@ -755,7 +755,7 @@ public abstract class DebuggerUtilsEx extends DebuggerUtils {
public static String prepareValueText(String text, Project project) {
text = StringUtil.unquoteString(text);
text = StringUtil.unescapeStringCharacters(text);
int tabSize = CodeStyle.getSettings(project).getTabSize(StdFileTypes.JAVA);
int tabSize = CodeStyle.getSettings(project).getTabSize(JavaFileType.INSTANCE);
if (tabSize < 0) {
tabSize = 0;
}
java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java
+8 -8
View File
@@ -1,8 +1,8 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.debugger.settings;
import com.intellij.debugger.JavaDebuggerBundle;
import com.intellij.debugger.DebuggerContext;
import com.intellij.debugger.JavaDebuggerBundle;
import com.intellij.debugger.engine.DebugProcess;
import com.intellij.debugger.engine.JavaValuePresentation;
import com.intellij.debugger.engine.evaluation.*;
@@ -15,6 +15,7 @@ import com.intellij.debugger.ui.tree.ArrayElementDescriptor;
import com.intellij.debugger.ui.tree.DebuggerTreeNode;
import com.intellij.debugger.ui.tree.ValueDescriptor;
import com.intellij.debugger.ui.tree.render.*;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.components.PersistentStateComponent;
@@ -22,7 +23,6 @@ import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.components.State;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.openapi.project.Project;
@@ -393,9 +393,9 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
public static ExpressionChildrenRenderer createExpressionChildrenRenderer(@NonNls String expressionText,
@NonNls String childrenExpandableText) {
final ExpressionChildrenRenderer childrenRenderer = new ExpressionChildrenRenderer();
childrenRenderer.setChildrenExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, expressionText, "", StdFileTypes.JAVA));
childrenRenderer.setChildrenExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, expressionText, "", JavaFileType.INSTANCE));
if (childrenExpandableText != null) {
childrenRenderer.setChildrenExpandable(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, childrenExpandableText, "", StdFileTypes.JAVA));
childrenRenderer.setChildrenExpandable(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, childrenExpandableText, "", JavaFileType.INSTANCE));
}
return childrenRenderer;
}
@@ -406,7 +406,7 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
ArrayList<EnumerationChildrenRenderer.ChildInfo> childrenList = new ArrayList<>(expressions.length);
for (String[] expression : expressions) {
childrenList.add(new EnumerationChildrenRenderer.ChildInfo(
expression[0], new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, expression[1], "", StdFileTypes.JAVA), false));
expression[0], new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, expression[1], "", JavaFileType.INSTANCE), false));
}
childrenRenderer.setChildren(childrenList);
}
@@ -430,7 +430,7 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
return evaluated + postfix;
}
};
labelRenderer.setLabelExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, expressionText, "", StdFileTypes.JAVA));
labelRenderer.setLabelExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, expressionText, "", JavaFileType.INSTANCE));
return labelRenderer;
}
@@ -444,8 +444,8 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
private MapEntryLabelRenderer() {
super("java.util.Map$Entry");
myKeyExpression.setReferenceExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, "this.getKey()", "", StdFileTypes.JAVA));
myValueExpression.setReferenceExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, "this.getValue()", "", StdFileTypes.JAVA));
myKeyExpression.setReferenceExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, "this.getKey()", "", JavaFileType.INSTANCE));
myValueExpression.setReferenceExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, "this.getValue()", "", JavaFileType.INSTANCE));
}
@Override
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaLineBreakpointTypeBase.java
+2 -1
View File
@@ -2,6 +2,7 @@
package com.intellij.debugger.ui.breakpoints;
import com.intellij.debugger.engine.DebuggerUtils;
import com.intellij.ide.highlighter.JavaClassFileType;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.fileEditor.FileDocumentManager;
@@ -77,7 +78,7 @@ public abstract class JavaLineBreakpointTypeBase<P extends JavaBreakpointPropert
return false;
}
if (!StdFileTypes.CLASS.equals(psiFile.getFileType()) && !DebuggerUtils.isBreakpointAware(psiFile)) {
if (!JavaClassFileType.INSTANCE.equals(psiFile.getFileType()) && !DebuggerUtils.isBreakpointAware(psiFile)) {
return false;
}
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/JavaTextBlockIndentPass.java
+2 -2
View File
@@ -3,6 +3,7 @@ package com.intellij.codeInsight.daemon.impl;
import com.intellij.application.options.CodeStyle;
import com.intellij.codeHighlighting.TextEditorHighlightingPass;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.RangeMarker;
@@ -14,7 +15,6 @@ import com.intellij.openapi.editor.markup.CustomHighlighterRenderer;
import com.intellij.openapi.editor.markup.HighlighterTargetArea;
import com.intellij.openapi.editor.markup.MarkupModel;
import com.intellij.openapi.editor.markup.RangeHighlighter;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.TextRange;
@@ -213,7 +213,7 @@ public class JavaTextBlockIndentPass extends TextEditorHighlightingPass {
IndentType indentType = findIndentType(lines, indent);
if (indentType == null) return -1;
if (indentType == IndentType.TABS) {
indent *= CodeStyle.getSettings(literal.getProject()).getTabSize(StdFileTypes.JAVA);
indent *= CodeStyle.getSettings(literal.getProject()).getTabSize(JavaFileType.INSTANCE);
}
return indent;
}
plugins/ant/src/com/intellij/lang/ant/AntImportsIndex.java
+2 -2
View File
@@ -1,7 +1,7 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.lang.ant;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.ide.highlighter.XmlFileType;
import com.intellij.util.indexing.*;
import com.intellij.util.io.EnumeratorIntegerDescriptor;
import com.intellij.util.io.KeyDescriptor;
@@ -73,7 +73,7 @@ public class AntImportsIndex extends ScalarIndexExtension<Integer>{
@NotNull
@Override
public FileBasedIndex.InputFilter getInputFilter() {
return new DefaultFileTypeSpecificInputFilter(StdFileTypes.XML);
return new DefaultFileTypeSpecificInputFilter(XmlFileType.INSTANCE);
}
@Override
plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java
+2 -2
View File
@@ -11,6 +11,7 @@ import com.intellij.ide.CommonActionsManager;
import com.intellij.ide.DataManager;
import com.intellij.ide.TreeExpander;
import com.intellij.ide.dnd.FileCopyPasteUtil;
import com.intellij.ide.highlighter.XmlFileType;
import com.intellij.lang.ant.AntActionsUsagesCollector;
import com.intellij.lang.ant.AntBundle;
import com.intellij.lang.ant.config.*;
@@ -28,7 +29,6 @@ import com.intellij.openapi.fileChooser.FileChooser;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.fileTypes.FileTypeRegistry;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.keymap.KeymapManagerListener;
import com.intellij.openapi.keymap.impl.ui.EditKeymapsDialog;
import com.intellij.openapi.project.Project;
@@ -564,7 +564,7 @@ public class AntExplorer extends SimpleToolWindowPanel implements DataProvider,
public boolean isFileVisible(VirtualFile file, boolean showHiddenFiles) {
boolean b = super.isFileVisible(file, showHiddenFiles);
if (!file.isDirectory()) {
b &= FileTypeRegistry.getInstance().isFileOfType(file, StdFileTypes.XML);
b &= FileTypeRegistry.getInstance().isFileOfType(file, XmlFileType.INSTANCE);
}
return b;
}
plugins/ant/src/com/intellij/lang/ant/dom/AntDomProperty.java
+3 -2
View File
@@ -16,9 +16,9 @@
package com.intellij.lang.ant.dom;
import com.intellij.lang.properties.IProperty;
import com.intellij.lang.properties.PropertiesFileType;
import com.intellij.lang.properties.PropertiesImplUtil;
import com.intellij.lang.properties.psi.PropertiesFile;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.pom.references.PomService;
import com.intellij.psi.PsiElement;
@@ -222,7 +222,8 @@ public abstract class AntDomProperty extends AntDomClasspathComponent implements
if (stream != null) {
try {
// todo: Remote file can be XmlPropertiesFile
final PropertiesFile propFile = (PropertiesFile)CustomAntElementsRegistry.loadContentAsFile(getXmlTag().getProject(), stream, StdFileTypes.PROPERTIES);
final PropertiesFile propFile = (PropertiesFile)CustomAntElementsRegistry.loadContentAsFile(getXmlTag().getProject(), stream,
PropertiesFileType.INSTANCE);
result = new HashMap<>();
for (final IProperty property : propFile.getProperties()) {
result.put(property.getUnescapedKey(), property.getUnescapedValue());
plugins/ant/src/com/intellij/lang/ant/dom/CustomAntElementsRegistry.java
+8 -9
View File
@@ -15,15 +15,16 @@
*/
package com.intellij.lang.ant.dom;
import com.intellij.ide.highlighter.XmlFileType;
import com.intellij.lang.ant.AntFilesProvider;
import com.intellij.lang.ant.AntSupport;
import com.intellij.lang.ant.ReflectedProject;
import com.intellij.lang.ant.config.impl.AntResourcesClassLoader;
import com.intellij.lang.properties.IProperty;
import com.intellij.lang.properties.PropertiesFileType;
import com.intellij.lang.properties.psi.PropertiesFile;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.Pair;
@@ -387,10 +388,8 @@ public class CustomAntElementsRegistry {
final InputStream stream = loader.getResourceAsStream(antLibResource);
if (stream != null) {
try {
final XmlFile xmlFile = (XmlFile)loadContentAsFile(xmlElement.getProject(), stream, StdFileTypes.XML);
if (xmlFile != null) {
loadDefinitionsFromAntlib(xmlFile, uri, loader, null, myAntProject);
}
final XmlFile xmlFile = (XmlFile)loadContentAsFile(xmlElement.getProject(), stream, XmlFileType.INSTANCE);
loadDefinitionsFromAntlib(xmlFile, uri, loader, null, myAntProject);
}
catch (IOException e) {
LOG.info(e);
@@ -535,10 +534,10 @@ public class CustomAntElementsRegistry {
if (stream != null) {
try {
if (isXmlFormat(typedef, resource)) {
xmlFile = (XmlFile)loadContentAsFile(project, stream, StdFileTypes.XML);
xmlFile = (XmlFile)loadContentAsFile(project, stream, XmlFileType.INSTANCE);
}
else {
propFile = (PropertiesFile)loadContentAsFile(project, stream, StdFileTypes.PROPERTIES);
propFile = (PropertiesFile)loadContentAsFile(project, stream, PropertiesFileType.INSTANCE);
}
}
catch (IOException e) {
@@ -553,10 +552,10 @@ public class CustomAntElementsRegistry {
final PsiFileSystemItem file = typedef.getFile().getValue();
if (file instanceof PsiFile) {
if (isXmlFormat(typedef, file.getName())) {
xmlFile = file instanceof XmlFile ? (XmlFile)file : (XmlFile)loadContentAsFile((PsiFile)file, StdFileTypes.XML);
xmlFile = file instanceof XmlFile ? (XmlFile)file : (XmlFile)loadContentAsFile((PsiFile)file, XmlFileType.INSTANCE);
}
else { // assume properties format
propFile = file instanceof PropertiesFile ? (PropertiesFile)file : (PropertiesFile)loadContentAsFile((PsiFile)file, StdFileTypes.PROPERTIES);
propFile = file instanceof PropertiesFile ? (PropertiesFile)file : (PropertiesFile)loadContentAsFile((PsiFile)file, PropertiesFileType.INSTANCE);
}
}
}
plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java
+2 -1
View File
@@ -17,6 +17,7 @@ package com.maddyhome.idea.copyright.ui;
import com.intellij.copyright.CopyrightBundle;
import com.intellij.copyright.CopyrightManager;
import com.intellij.ide.highlighter.XmlFileType;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonShortcuts;
@@ -228,7 +229,7 @@ class CopyrightProfilesPanel extends MasterDetailsComponent implements Searchabl
FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor()
.withFileFilter(file -> {
final FileType fileType = file.getFileType();
return fileType != PlainTextFileType.INSTANCE && (fileType == StdFileTypes.IDEA_MODULE || fileType == StdFileTypes.XML);
return fileType != PlainTextFileType.INSTANCE && (fileType == StdFileTypes.IDEA_MODULE || fileType == XmlFileType.INSTANCE);
})
.withTitle(CopyrightBundle.message("dialog.file.chooser.title.choose.file.containing.copyright.notice"));
FileChooser.chooseFile(descriptor, myProject, null, file -> {
plugins/copyright/src/com/maddyhome/idea/copyright/ui/FileTypeCopyrightConfigurableFactory.java
+4 -2
View File
@@ -16,6 +16,8 @@
package com.maddyhome.idea.copyright.ui;
import com.intellij.ide.highlighter.HtmlFileType;
import com.intellij.ide.highlighter.XmlFileType;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.options.Configurable;
@@ -31,10 +33,10 @@ public class FileTypeCopyrightConfigurableFactory {
if (fileType.equals(StdFileTypes.JAVA)) {
return new TemplateCommentPanel(fileType, parentPanel, new String[]{"Before Package", "Before Imports", "Before Class"}, project);
}
else if (fileType.equals(StdFileTypes.XML)) {
else if (fileType.equals(XmlFileType.INSTANCE)) {
return new TemplateCommentPanel(fileType, parentPanel, LOCATIONS_IN_FILE, project);
}
else if (fileType.equals(StdFileTypes.HTML)) {
else if (fileType.equals(HtmlFileType.INSTANCE)) {
return new TemplateCommentPanel(fileType, parentPanel, LOCATIONS_IN_FILE, project);
}
else if (fileType.equals(StdFileTypes.JSP)) {
plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java
+4 -2
View File
@@ -2,6 +2,8 @@
package com.maddyhome.idea.copyright.util;
import com.intellij.ide.highlighter.HtmlFileType;
import com.intellij.ide.highlighter.XmlFileType;
import com.intellij.lang.Commenter;
import com.intellij.lang.LanguageCommenters;
import com.intellij.openapi.Disposable;
@@ -226,8 +228,8 @@ public class FileTypeUtil implements Disposable {
}
private void createMappings() {
noSeparators.add(StdFileTypes.XML);
noSeparators.add(StdFileTypes.HTML);
noSeparators.add(XmlFileType.INSTANCE);
noSeparators.add(HtmlFileType.INSTANCE);
noSeparators.add(StdFileTypes.JSP);
noSeparators.add(StdFileTypes.JSPX);
}
plugins/coverage/src/com/intellij/coverage/JavaCoverageEngine.java
+2 -2
View File
@@ -15,6 +15,7 @@ import com.intellij.execution.configurations.coverage.CoverageEnabledConfigurati
import com.intellij.execution.configurations.coverage.JavaCoverageEnabledConfiguration;
import com.intellij.execution.testframework.AbstractTestProxy;
import com.intellij.ide.BrowserUtil;
import com.intellij.ide.highlighter.JavaClassFileType;
import com.intellij.java.coverage.JavaCoverageBundle;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.application.ApplicationManager;
@@ -22,7 +23,6 @@ import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.compiler.CompilerManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.progress.ProgressIndicator;
@@ -435,7 +435,7 @@ public class JavaCoverageEngine extends CoverageEngine {
for (final PsiClass psiClass : classes) {
final String className = ReadAction.compute(() -> psiClass.getName());
for (File child : children) {
if (FileUtilRt.extensionEquals(child.getName(), StdFileTypes.CLASS.getDefaultExtension())) {
if (FileUtilRt.extensionEquals(child.getName(), JavaClassFileType.INSTANCE.getDefaultExtension())) {
final String childName = FileUtilRt.getNameWithoutExtension(child.getName());
if (childName.equals(className) || //class or inner
childName.startsWith(className) && childName.charAt(className.length()) == '$') {
plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineFrameworkDetector.java
+2 -2
View File
@@ -22,8 +22,8 @@ import com.intellij.facet.FacetType;
import com.intellij.framework.FrameworkType;
import com.intellij.framework.detection.FacetBasedFrameworkDetector;
import com.intellij.framework.detection.FileContentPattern;
import com.intellij.ide.highlighter.XmlFileType;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.patterns.ElementPattern;
import com.intellij.util.indexing.FileContent;
@@ -58,7 +58,7 @@ public class AppEngineFrameworkDetector extends FacetBasedFrameworkDetector<AppE
@NotNull
@Override
public FileType getFileType() {
return StdFileTypes.XML;
return XmlFileType.INSTANCE;
}
@NotNull