Merge pull request #7 from apache/feature/WW-5446-fix-deprecation

WW-5446 Fixes deprecated code and missing dependencies
apache · Aug 30, 2024 · 172a5ea · 172a5ea
2 parents 60aa6c5 + 041ac6e
commit 172a5ea
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -27,6 +27,7 @@ intellij {
         "com.intellij.freemarker",
         "com.intellij.velocity",
         "org.intellij.groovy",
+        "com.intellij.java",
         "com.intellij.jsp",
         "JavaScript",
         "com.intellij.java-i18n"

diff --git a/src/main/java/com/intellij/struts2/dom/inspection/Struts2ModelInspection.java b/src/main/java/com/intellij/struts2/dom/inspection/Struts2ModelInspection.java
@@ -173,7 +173,7 @@ protected boolean shouldCheckResolveProblems(final GenericDomValue value) {
       }
 
       // WEB-INF/**/*.jsp
-      if (stringValue.matches("/WEB-INF/*/.*\\.jsp")) {
+      if (stringValue.matches("/*/.*\\.jsp")) {
         LOG.info("Inspecting jsp file: " + stringValue);
         return false;
       }

diff --git a/src/main/java/com/intellij/struts2/facet/ui/StrutsFilesTree.java b/src/main/java/com/intellij/struts2/facet/ui/StrutsFilesTree.java
@@ -20,6 +20,7 @@
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.ui.CheckboxTreeBase;
 import com.intellij.ui.CheckedTreeNode;
+import com.intellij.util.containers.TreeTraversal;
 import com.intellij.util.ui.tree.TreeUtil;
 import com.intellij.xml.config.ConfigFilesTreeBuilder;
 
@@ -50,7 +51,7 @@ public void customizeRenderer(final JTree tree,
 
   public void updateFileSet(final StrutsFileSet fileSet) {
     final Set<VirtualFile> configured = new HashSet<>();
-    TreeUtil.traverse((TreeNode)getModel().getRoot(), node -> {
+    TreeUtil.treeNodeTraverser((TreeNode)getModel().getRoot()).traverse(TreeTraversal.POST_ORDER_DFS).processEach(node -> {
       final CheckedTreeNode checkedTreeNode = (CheckedTreeNode)node;
       if (!checkedTreeNode.isChecked()) {
         return true;

diff --git a/src/main/java/com/intellij/struts2/jsp/TaglibCssInlineStyleInjector.java b/src/main/java/com/intellij/struts2/jsp/TaglibCssInlineStyleInjector.java
@@ -14,10 +14,11 @@
  */
 package com.intellij.struts2.jsp;
 
+import com.intellij.jsp.highlighter.JspxFileType;
+import com.intellij.jsp.highlighter.NewJspFileType;
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.lang.injection.MultiHostRegistrar;
 import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.patterns.ElementPattern;
@@ -57,7 +58,7 @@ private static class Holder {
   @Override
   public void getLanguagesToInject(@NotNull final MultiHostRegistrar registrar, @NotNull final PsiElement context) {
     final FileType fileType = context.getContainingFile().getFileType();
-    if (fileType != StdFileTypes.JSP && fileType != StdFileTypes.JSPX) {
+    if (!NewJspFileType.INSTANCE.equals(fileType) && !JspxFileType.INSTANCE.equals(fileType)) {
       return;
     }
 

diff --git a/src/main/java/com/intellij/struts2/jsp/TaglibJavaScriptInjector.java b/src/main/java/com/intellij/struts2/jsp/TaglibJavaScriptInjector.java
@@ -15,12 +15,13 @@
 
 package com.intellij.struts2.jsp;
 
+import com.intellij.jsp.highlighter.JspxFileType;
+import com.intellij.jsp.highlighter.NewJspFileType;
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.lang.injection.MultiHostRegistrar;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.injections.JSInXmlLanguagesInjector;
 import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.patterns.ElementPattern;
@@ -87,7 +88,7 @@ private static class Holder {
   @Override
   public void getLanguagesToInject(@NotNull final MultiHostRegistrar registrar, @NotNull final PsiElement host) {
     final FileType fileType = host.getContainingFile().getFileType();
-    if (fileType != StdFileTypes.JSP && fileType != StdFileTypes.JSPX) {
+    if (!NewJspFileType.INSTANCE.equals(fileType) && !JspxFileType.INSTANCE.equals(fileType)) {
       return;
     }
 

diff --git a/src/main/java/com/intellij/struts2/jsp/TaglibOgnlInjector.java b/src/main/java/com/intellij/struts2/jsp/TaglibOgnlInjector.java
@@ -14,12 +14,13 @@
  */
 package com.intellij.struts2.jsp;
 
+import com.intellij.jsp.highlighter.JspxFileType;
+import com.intellij.jsp.highlighter.NewJspFileType;
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.lang.injection.MultiHostRegistrar;
 import com.intellij.lang.ognl.OgnlLanguage;
 import com.intellij.lang.ognl.OgnlLanguageInjector;
 import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.patterns.ElementPattern;
 import com.intellij.patterns.XmlAttributeValuePattern;
@@ -74,7 +75,7 @@ private static class Holder {
   public void getLanguagesToInject(@NotNull final MultiHostRegistrar multiHostRegistrar,
                                    @NotNull final PsiElement psiElement) {
     final FileType fileType = psiElement.getContainingFile().getFileType();
-    if (fileType != StdFileTypes.JSP && fileType != StdFileTypes.JSPX) {
+    if (!NewJspFileType.INSTANCE.equals(fileType) && !JspxFileType.INSTANCE.equals(fileType)) {
       return;
     }
 

diff --git a/src/main/java/com/intellij/struts2/ognl/completion/OgnlKeywordCompletionContributor.java b/src/main/java/com/intellij/struts2/ognl/completion/OgnlKeywordCompletionContributor.java
@@ -16,11 +16,18 @@
 package com.intellij.lang.ognl.completion;
 
 import com.intellij.codeInsight.TailType;
+import com.intellij.codeInsight.TailTypes;
 import com.intellij.codeInsight.completion.*;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.codeInsight.lookup.TailTypeDecorator;
 import com.intellij.lang.ognl.OgnlTypes;
 import com.intellij.lang.ognl.psi.*;
+import com.intellij.lang.ognl.psi.OgnlExpression;
+import com.intellij.lang.ognl.psi.OgnlFqnTypeExpression;
+import com.intellij.lang.ognl.psi.OgnlReferenceExpression;
+import com.intellij.lang.ognl.psi.OgnlTokenGroups;
+import com.intellij.lang.ognl.psi.OgnlVariableAssignmentExpression;
+import com.intellij.lang.ognl.psi.OgnlVariableExpression;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.patterns.PsiElementPattern;
 import com.intellij.psi.PsiElement;
@@ -135,7 +142,7 @@ protected void addCompletions(@NotNull final CompletionParameters completionPara
                                            @NotNull final CompletionResultSet completionResultSet) {
                for (final String keyword : keywords) {
                  final LookupElementBuilder builder = LookupElementBuilder.create(keyword).bold();
-                 completionResultSet.addElement(TailTypeDecorator.withTail(builder, TailType.SPACE));
+                 completionResultSet.addElement(TailTypeDecorator.withTail(builder, TailTypes.spaceType()));
                }
              }
            });

diff --git a/src/main/java/com/intellij/struts2/reference/StrutsTaglibReferenceContributorBase.java b/src/main/java/com/intellij/struts2/reference/StrutsTaglibReferenceContributorBase.java
@@ -15,7 +15,8 @@
 
 package com.intellij.struts2.reference;
 
-import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.jsp.highlighter.JspxFileType;
+import com.intellij.jsp.highlighter.NewJspFileType;
 import com.intellij.openapi.paths.PathReferenceManager;
 import com.intellij.patterns.XmlAttributeValuePattern;
 import com.intellij.psi.*;
@@ -132,8 +133,8 @@ public PsiElement resolve() {
    */
   private final XmlAttributeValuePattern jspElementPattern =
       xmlAttributeValue()
-          .inVirtualFile(or(virtualFile().ofType(StdFileTypes.JSP),
-                            virtualFile().ofType(StdFileTypes.JSPX)))
+          .inVirtualFile(or(virtualFile().ofType(NewJspFileType.INSTANCE),
+                            virtualFile().ofType(JspxFileType.INSTANCE)))
           .withSuperParent(2, xmlTag().withNamespace(getNamespace()));
 
   /**

diff --git a/src/main/java/com/intellij/struts2/spellchecker/Struts2BundledDictionaryProvider.java b/src/main/java/com/intellij/struts2/spellchecker/Struts2BundledDictionaryProvider.java
@@ -26,7 +26,7 @@ public class Struts2BundledDictionaryProvider implements BundledDictionaryProvid
 
   @Override
   public String[] getBundledDictionaries() {
-    return new String[]{"struts2.dic"};
+    return new String[]{"/struts2.dic"};
   }
 
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -22,8 +22,10 @@
     <category>JVM Frameworks</category>
 
     <dependencies>
+        <plugin id="com.intellij.java"/>
         <plugin id="com.intellij.javaee"/>
         <plugin id="com.intellij.javaee.web"/>
+        <plugin id="com.intellij.jsp"/>
         <plugin id="JavaScript"/>
         <plugin id="com.intellij.java-i18n"/>
     </dependencies>

diff --git a/...intellij/struts2/spellchecker/struts2.dic → src/main/resources/struts2.dic b/...intellij/struts2/spellchecker/struts2.dic → src/main/resources/struts2.dic