From ecf452d293bd95ac7f538b2a5e5254a316a270f5 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Tue, 9 Dec 2025 17:11:00 +0100 Subject: [PATCH] cleanup [core, xpath, psiViewer]: remove GUI_DESIGNER_FORM, JSPX file types (unused anymore) CLASS file type is still used in plugins; keep for now XPath: use isBinary+InternalFileType check PsiViewer: just remove GUI designer, as nobody cares GitOrigin-RevId: 32f70b54e9c417606fe65b7fbb6bc95a9ceacdbb --- platform/ide-core/api-dump-unreviewed.txt | 2 -- .../openapi/fileTypes/StdFileTypes.java | 20 +------------------ .../src/PsiViewerSourceWrapper.java | 4 +--- .../xpath/xslt/run/XsltRunSettingsEditor.java | 9 +-------- 4 files changed, 3 insertions(+), 32 deletions(-) diff --git a/platform/ide-core/api-dump-unreviewed.txt b/platform/ide-core/api-dump-unreviewed.txt index 74e303434167..3fb31419b7e1 100644 --- a/platform/ide-core/api-dump-unreviewed.txt +++ b/platform/ide-core/api-dump-unreviewed.txt @@ -1007,12 +1007,10 @@ f:com.intellij.openapi.fileTypes.StdFileTypes - com.intellij.openapi.fileTypes.FileTypes - s:CLASS:com.intellij.openapi.fileTypes.FileType - s:DTD:com.intellij.openapi.fileTypes.LanguageFileType -- s:GUI_DESIGNER_FORM:com.intellij.openapi.fileTypes.FileType - s:HTML:com.intellij.openapi.fileTypes.LanguageFileType - s:JAVA:com.intellij.openapi.fileTypes.LanguageFileType - s:JS:com.intellij.openapi.fileTypes.LanguageFileType - s:JSP:com.intellij.openapi.fileTypes.LanguageFileType -- s:JSPX:com.intellij.openapi.fileTypes.LanguageFileType - s:PROPERTIES:com.intellij.openapi.fileTypes.LanguageFileType - s:XHTML:com.intellij.openapi.fileTypes.LanguageFileType - s:XML:com.intellij.openapi.fileTypes.LanguageFileType diff --git a/platform/ide-core/src/com/intellij/openapi/fileTypes/StdFileTypes.java b/platform/ide-core/src/com/intellij/openapi/fileTypes/StdFileTypes.java index a628a2afba2e..21ccf6201186 100644 --- a/platform/ide-core/src/com/intellij/openapi/fileTypes/StdFileTypes.java +++ b/platform/ide-core/src/com/intellij/openapi/fileTypes/StdFileTypes.java @@ -20,7 +20,7 @@ public final class StdFileTypes extends FileTypes { /** * @deprecated use {@link com.intellij.ide.highlighter.JavaClassFileType#INSTANCE} (Java plugin) instead. */ - @Deprecated + @Deprecated(forRemoval = true) public static volatile FileType CLASS = FileTypeManager.getInstance().getStdFileType("CLASS"); /** @@ -30,13 +30,6 @@ public final class StdFileTypes extends FileTypes { @Deprecated(forRemoval = true) public static volatile LanguageFileType JSP = (LanguageFileType)FileTypeManager.getInstance().getStdFileType("JSP"); - /** - * @deprecated use {@link com.intellij.jsp.highlighter.JspxFileType#INSTANCE} or - * {@link com.intellij.xml.util.JspFileTypeUtil} instead (the latter can be used if direct dependency on JSP module is undesired). - */ - @Deprecated(forRemoval = true) - public static volatile LanguageFileType JSPX = (LanguageFileType)FileTypeManager.getInstance().getStdFileType("JSPX"); - /** * @deprecated use {@link com.intellij.ide.highlighter.XmlFileType#INSTANCE} instead. */ @@ -74,12 +67,6 @@ public final class StdFileTypes extends FileTypes { @Deprecated(forRemoval = true) public static volatile LanguageFileType PROPERTIES = (LanguageFileType)FileTypeManager.getInstance().getStdFileType("Properties"); - /** - * @deprecated use {@link com.intellij.uiDesigner.GuiFormFileType#INSTANCE} instead. - */ - @Deprecated(forRemoval = true) - public static volatile FileType GUI_DESIGNER_FORM = FileTypeManager.getInstance().getStdFileType("GUI_DESIGNER_FORM"); - public static class StdFileTypesUpdater implements FileTypeListener { @Override @@ -91,14 +78,12 @@ public final class StdFileTypes extends FileTypes { case "JAVA" -> JAVA = (LanguageFileType)addedFileType; case "CLASS" -> CLASS = addedFileType; case "JSP" -> JSP = (LanguageFileType)addedFileType; - case "JSPX" -> JSPX = (LanguageFileType)addedFileType; case "XML" -> XML = (LanguageFileType)addedFileType; case "DTD" -> DTD = (LanguageFileType)addedFileType; case "HTML" -> HTML = (LanguageFileType)addedFileType; case "XHTML" -> XHTML = (LanguageFileType)addedFileType; case "JavaScript" -> JS = (LanguageFileType)addedFileType; case "Properties" -> PROPERTIES = (LanguageFileType)addedFileType; - case "GUI_DESIGNER_FORM" -> GUI_DESIGNER_FORM = addedFileType; } } @@ -109,15 +94,12 @@ public final class StdFileTypes extends FileTypes { case "JAVA" -> JAVA = PLAIN_TEXT; case "CLASS" -> CLASS = PLAIN_TEXT; case "JSP" -> JSP = PLAIN_TEXT; - case "JSPX" -> JSPX = PLAIN_TEXT; case "XML" -> XML = PLAIN_TEXT; case "DTD" -> DTD = PLAIN_TEXT; case "HTML" -> HTML = PLAIN_TEXT; case "XHTML" -> XHTML = PLAIN_TEXT; case "JavaScript" -> JS = PLAIN_TEXT; case "Properties" -> PROPERTIES = PLAIN_TEXT; - case "GUI_DESIGNER_FORM" -> GUI_DESIGNER_FORM = PLAIN_TEXT; - case "PATCH" -> {} } } } diff --git a/plugins/dev/intellij.dev.psiViewer/src/PsiViewerSourceWrapper.java b/plugins/dev/intellij.dev.psiViewer/src/PsiViewerSourceWrapper.java index afaf2589d3a5..60555705d59a 100644 --- a/plugins/dev/intellij.dev.psiViewer/src/PsiViewerSourceWrapper.java +++ b/plugins/dev/intellij.dev.psiViewer/src/PsiViewerSourceWrapper.java @@ -9,7 +9,6 @@ import com.intellij.lang.Language; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.fileTypes.FileTypes; -import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.fileTypes.impl.AbstractFileType; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.Nls; @@ -74,8 +73,7 @@ class PsiViewerSourceWrapper implements Comparable { } private static boolean isAcceptableFileType(FileType fileType) { - return fileType != StdFileTypes.GUI_DESIGNER_FORM && - fileType != ModuleFileType.INSTANCE && + return fileType != ModuleFileType.INSTANCE && fileType != ProjectFileType.INSTANCE && fileType != WorkspaceFileType.INSTANCE && fileType != ArchiveFileType.INSTANCE && diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java index c945a9a7ea8c..2cbb63da6997 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java @@ -18,9 +18,6 @@ package org.intellij.lang.xpath.xslt.run; import com.intellij.execution.impl.CheckableRunConfigurationEditor; import com.intellij.icons.AllIcons; import com.intellij.ide.IdeCoreBundle; -import com.intellij.ide.highlighter.ModuleFileType; -import com.intellij.ide.highlighter.ProjectFileType; -import com.intellij.ide.highlighter.WorkspaceFileType; import com.intellij.ide.highlighter.XmlFileType; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.application.ReadAction; @@ -353,11 +350,7 @@ class XsltRunSettingsEditor extends SettingsEditor final FileType[] fileTypes = FileTypeManager.getInstance().getRegisteredFileTypes(); for (FileType fileType : fileTypes) { // get rid of file types useless for highlighting - if (fileType == StdFileTypes.CLASS || - fileType == ProjectFileType.INSTANCE || - fileType == WorkspaceFileType.INSTANCE || - fileType == ModuleFileType.INSTANCE || - fileType == StdFileTypes.GUI_DESIGNER_FORM) { + if (fileType.isBinary() || fileType instanceof InternalFileType) { continue; }