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

cleanup [core, xpath, psiViewer]: remove GUI_DESIGNER_FORM, JSPX file types (unused anymore)

Browse Source 
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
This commit is contained in:
Tagir Valeev
2025-12-09 19:15:22 +00:00
committed by intellij-monorepo-bot
parent 6ae3e6ed7f
commit ecf452d293
4 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/ide-core/api-dump-unreviewed.txt
-2
View File
@@ -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
platform/ide-core/src/com/intellij/openapi/fileTypes/StdFileTypes.java
+1 -19
View File
@@ -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" -> {}
}
}
}
plugins/dev/intellij.dev.psiViewer/src/PsiViewerSourceWrapper.java
+1 -3
View File
@@ -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<PsiViewerSourceWrapper> {
}
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 &&
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java
+1 -8
View File
@@ -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<XsltRunConfiguration>
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;
}