(struts-intellij-plugin) branch fix/WW-5446-jsp-clickable updated (5bd7959 -> 9d0ca5d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5446-jsp-clickable in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 5bd7959 WW-5446 Fixes JSP highlighting and navigating add f3078e9 WW-5446 Uses proper link to plugin webpage add 1915ace WW-5446 Simplified plugin name add 4d1cb54 Fixes branch name add 674d035 WW-5446 Adds missing dependency add 9d0ca5d Merge branch 'main' into fix/WW-5446-jsp-clickable No new revisions were added by this update. Summary of changes: .asf.yaml | 2 +- build.gradle.kts | 1 + settings.gradle.kts| 2 +- src/main/resources/META-INF/plugin.xml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-)
(struts-intellij-plugin) branch main updated (674d035 -> 60aa6c5)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 674d035 WW-5446 Adds missing dependency add 5bd7959 WW-5446 Fixes JSP highlighting and navigating add 9d0ca5d Merge branch 'main' into fix/WW-5446-jsp-clickable new 60aa6c5 Merge pull request #6 from apache/fix/WW-5446-jsp-clickable The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.gradle.kts | 2 +- .../struts2/dom/inspection/Struts2ModelInspection.java| 11 +++ 2 files changed, 12 insertions(+), 1 deletion(-)
(struts-intellij-plugin) 01/01: Merge pull request #6 from apache/fix/WW-5446-jsp-clickable
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git commit 60aa6c54447775349f088057f630c634bd1f1f93 Merge: 674d035 9d0ca5d Author: Lukasz Lenart AuthorDate: Wed Aug 21 15:39:40 2024 +0200 Merge pull request #6 from apache/fix/WW-5446-jsp-clickable WW-5446 Fixes JSP highlighting and navigating build.gradle.kts | 2 +- .../struts2/dom/inspection/Struts2ModelInspection.java| 11 +++ 2 files changed, 12 insertions(+), 1 deletion(-)
(struts-intellij-plugin) branch fix/WW-5446-jsp-clickable deleted (was 9d0ca5d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5446-jsp-clickable in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git was 9d0ca5d Merge branch 'main' into fix/WW-5446-jsp-clickable The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts-intellij-plugin) 02/03: WW-5446 Fixes loading of dictionary
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5446-fix-deprecation
in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git
commit 60e2ba96225d43808e8b0d4fbba68081b3fb27d2
Author: Lukasz Lenart
AuthorDate: Wed Aug 21 15:40:45 2024 +0200
WW-5446 Fixes loading of dictionary
---
.../{java/com/intellij/struts2/spellchecker => resources}/struts2.dic | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/intellij/struts2/spellchecker/struts2.dic
b/src/main/resources/struts2.dic
similarity index 100%
rename from src/main/java/com/intellij/struts2/spellchecker/struts2.dic
rename to src/main/resources/struts2.dic
(struts-intellij-plugin) branch feature/WW-5446-fix-deprecation created (now 8618ac1)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5446-fix-deprecation in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git at 8618ac1 WW-5446 Replaces deprecated code with recommended approach This branch includes the following new commits: new df6b80e WW-5446 Adds missing dependency new 60e2ba9 WW-5446 Fixes loading of dictionary new 8618ac1 WW-5446 Replaces deprecated code with recommended approach The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(struts-intellij-plugin) 01/03: WW-5446 Adds missing dependency
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5446-fix-deprecation
in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git
commit df6b80e19e420575c92ca3849f53ea900dd08412
Author: Lukasz Lenart
AuthorDate: Wed Aug 21 15:40:33 2024 +0200
WW-5446 Adds missing dependency
---
build.gradle.kts | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.gradle.kts b/build.gradle.kts
index dd58d89..b39d3c2 100644
--- 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"
(struts-intellij-plugin) 03/03: WW-5446 Replaces deprecated code with recommended approach
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5446-fix-deprecation
in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git
commit 8618ac19cdf6c237143aa118738d07a433b8750f
Author: Lukasz Lenart
AuthorDate: Wed Aug 21 15:41:01 2024 +0200
WW-5446 Replaces deprecated code with recommended approach
---
src/main/java/com/intellij/struts2/facet/ui/StrutsFilesTree.java | 3 ++-
.../com/intellij/struts2/jsp/TaglibCssInlineStyleInjector.java | 5 +++--
.../java/com/intellij/struts2/jsp/TaglibJavaScriptInjector.java | 5 +++--
src/main/java/com/intellij/struts2/jsp/TaglibOgnlInjector.java | 5 +++--
.../ognl/completion/OgnlKeywordCompletionContributor.java| 9 -
.../struts2/reference/StrutsTaglibReferenceContributorBase.java | 7 ---
.../struts2/spellchecker/Struts2BundledDictionaryProvider.java | 2 +-
7 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/intellij/struts2/facet/ui/StrutsFilesTree.java
b/src/main/java/com/intellij/struts2/facet/ui/StrutsFilesTree.java
index 12aea94..3c900cb 100644
--- 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.openapi.vfs.pointers.VirtualFilePointer;
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 class StrutsFilesTree extends CheckboxTreeBase {
public void updateFileSet(final StrutsFileSet fileSet) {
final Set 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
index e69b0f6..d86d975 100644
--- 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 @@ final class TaglibCssInlineStyleInjector implements
MultiHostInjector, DumbAware
@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
index 3f26fd3..e654cbe 100644
--- 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 @@ final class TaglibJavaScriptInjector implements
MultiHostInjector, DumbAware {
@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)) {
svn commit: r71037 - /dev/struts/idea-plugin/struts-intellij-plugin-2024.4.2.zip
Author: lukaszlenart Date: Wed Aug 21 13:44:55 2024 New Revision: 71037 Log: Drops test build Removed: dev/struts/idea-plugin/struts-intellij-plugin-2024.4.2.zip
svn commit: r71039 - /dev/struts/idea-plugin/struts2-2024.4.zip
Author: lukaszlenart Date: Wed Aug 21 13:45:49 2024 New Revision: 71039 Log: Drops test build Removed: dev/struts/idea-plugin/struts2-2024.4.zip
svn commit: r71040 - /dev/struts/idea-plugin/struts-2024.4.2.zip
Author: lukaszlenart Date: Wed Aug 21 13:46:15 2024 New Revision: 71040 Log: Adds the latest plugin version Added: dev/struts/idea-plugin/struts-2024.4.2.zip (with props) Added: dev/struts/idea-plugin/struts-2024.4.2.zip == Binary file - no diff available. Propchange: dev/struts/idea-plugin/struts-2024.4.2.zip -- svn:mime-type = application/octet-stream
svn commit: r71038 - /dev/struts/idea-plugin/struts2-2024.4.1.zip
Author: lukaszlenart Date: Wed Aug 21 13:45:24 2024 New Revision: 71038 Log: Drops test build Removed: dev/struts/idea-plugin/struts2-2024.4.1.zip
(struts-intellij-plugin) branch feature/WW-5446-fix-deprecation updated (8618ac1 -> 73b8aed)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5446-fix-deprecation in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 8618ac1 WW-5446 Replaces deprecated code with recommended approach add 73b8aed WW-5446 Adds missing plugin dependencies No new revisions were added by this update. Summary of changes: src/main/resources/META-INF/plugin.xml | 2 ++ 1 file changed, 2 insertions(+)
svn commit: r71042 - /dev/struts/idea-plugin/struts-2024.4.2.zip
Author: lukaszlenart Date: Wed Aug 21 14:08:29 2024 New Revision: 71042 Log: Adds the latest plugin version Added: dev/struts/idea-plugin/struts-2024.4.2.zip (with props) Added: dev/struts/idea-plugin/struts-2024.4.2.zip == Binary file - no diff available. Propchange: dev/struts/idea-plugin/struts-2024.4.2.zip -- svn:mime-type = application/octet-stream
svn commit: r71041 - /dev/struts/idea-plugin/struts-2024.4.2.zip
Author: lukaszlenart Date: Wed Aug 21 14:08:07 2024 New Revision: 71041 Log: Drops test build Removed: dev/struts/idea-plugin/struts-2024.4.2.zip
