diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/JavaInlineActionHandler.java b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/JavaInlineActionHandler.java index 3a1696d213e4..12c52ca2e341 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/JavaInlineActionHandler.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/JavaInlineActionHandler.java @@ -1,10 +1,10 @@ // Copyright 2000-2021 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.refactoring.inline; -import com.intellij.java.util.JspFileTypeUtil; import com.intellij.lang.Language; import com.intellij.lang.java.JavaLanguage; import com.intellij.lang.refactoring.InlineActionHandler; +import com.intellij.xml.util.JspFileTypeUtil; public abstract class JavaInlineActionHandler extends InlineActionHandler { diff --git a/java/java-impl/src/com/intellij/codeEditor/printing/HyperlinksToClassesOption.java b/java/java-impl/src/com/intellij/codeEditor/printing/HyperlinksToClassesOption.java index e1414044107c..c25759ed1e9c 100644 --- a/java/java-impl/src/com/intellij/codeEditor/printing/HyperlinksToClassesOption.java +++ b/java/java-impl/src/com/intellij/codeEditor/printing/HyperlinksToClassesOption.java @@ -4,11 +4,11 @@ package com.intellij.codeEditor.printing; import com.intellij.ide.highlighter.JavaFileType; import com.intellij.java.JavaBundle; -import com.intellij.java.util.JspFileTypeUtil; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.UnnamedConfigurable; import com.intellij.psi.*; +import com.intellij.xml.util.JspFileTypeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCharFilter.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCharFilter.java index 540e02b8cd76..bebccaf95efb 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCharFilter.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCharFilter.java @@ -7,7 +7,6 @@ import com.intellij.codeInsight.lookup.Lookup; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.VariableLookupItem; import com.intellij.java.syntax.parser.JavaKeywords; -import com.intellij.java.util.JspFileTypeUtil; import com.intellij.lang.java.JavaLanguage; import com.intellij.patterns.PsiJavaPatterns; import com.intellij.pom.java.JavaFeature; @@ -16,6 +15,7 @@ import com.intellij.psi.javadoc.PsiDocComment; import com.intellij.psi.javadoc.PsiDocToken; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; +import com.intellij.xml.util.JspFileTypeUtil; public final class JavaCharFilter extends CharFilter { diff --git a/java/java-impl/src/com/intellij/lang/OuterModelsModificationTracker.java b/java/java-impl/src/com/intellij/lang/OuterModelsModificationTracker.java index dc1c34639721..b2756fcf1c11 100644 --- a/java/java-impl/src/com/intellij/lang/OuterModelsModificationTracker.java +++ b/java/java-impl/src/com/intellij/lang/OuterModelsModificationTracker.java @@ -2,7 +2,6 @@ package com.intellij.lang; import com.intellij.ide.highlighter.HtmlFileType; -import com.intellij.java.util.JspFileTypeUtil; import com.intellij.openapi.Disposable; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.LanguageFileType; @@ -21,6 +20,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.spi.psi.SPIFile; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.messages.MessageBusConnection; +import com.intellij.xml.util.JspFileTypeUtil; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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 14a1dc1039f9..a628a2afba2e 100644 --- a/platform/ide-core/src/com/intellij/openapi/fileTypes/StdFileTypes.java +++ b/platform/ide-core/src/com/intellij/openapi/fileTypes/StdFileTypes.java @@ -24,13 +24,15 @@ public final class StdFileTypes extends FileTypes { public static volatile FileType CLASS = FileTypeManager.getInstance().getStdFileType("CLASS"); /** - * @deprecated use {@link com.intellij.jsp.highlighter.NewJspFileType#INSTANCE} instead. + * @deprecated use {@link com.intellij.jsp.highlighter.NewJspFileType#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 JSP = (LanguageFileType)FileTypeManager.getInstance().getStdFileType("JSP"); /** - * @deprecated use {@link com.intellij.jsp.highlighter.JspxFileType#INSTANCE} instead. + * @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"); diff --git a/java/openapi/src/com/intellij/java/util/JspFileTypeUtil.java b/xml/xml-psi-api/src/com/intellij/xml/util/JspFileTypeUtil.java similarity index 91% rename from java/openapi/src/com/intellij/java/util/JspFileTypeUtil.java rename to xml/xml-psi-api/src/com/intellij/xml/util/JspFileTypeUtil.java index 47a30d111f49..d432aeab20e0 100644 --- a/java/openapi/src/com/intellij/java/util/JspFileTypeUtil.java +++ b/xml/xml-psi-api/src/com/intellij/xml/util/JspFileTypeUtil.java @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.util; +package com.intellij.xml.util; import com.intellij.lang.Language; import com.intellij.openapi.fileTypes.FileType; @@ -44,15 +44,6 @@ public final class JspFileTypeUtil { return language != null && language.getID().equals("JSP"); } - /** - * @param file file to check - * @return true if the file is a JSPX file - */ - @Contract(pure = true) - public static boolean isJspX(@NotNull PsiFile file) { - return isJsp(file.getFileType()); - } - /** * @param fileType file type to check * @return true if the file type is a JSPX file type