mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-10-01 19:02:13 +07:00
IJPL-219723 [java, xml] Move JspFileTypeUtil to XML API module; remove unused isJspX(PsiFile)
GitOrigin-RevId: 042d7949295f6773eb4df0f6a7e1c81f0f825946
This commit is contained in:
committed by
intellij-monorepo-bot
parent
e038f5e308
commit
5b24f03695
+1
-1
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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");
|
||||
|
||||
+1
-10
@@ -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
|
||||
Reference in New Issue
Block a user