You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2024/08/15 06:18:05 UTC
(struts-intellij-plugin) 01/01: WW-5446 Fixes JSP highlighting and navigating
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/WW-5446-jsp-clickable
in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git
commit 5bd7959cfbad160a21c6fbcf08efbe18c5c6b152
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Thu Aug 15 08:17:53 2024 +0200
WW-5446 Fixes JSP highlighting and navigating
---
build.gradle.kts | 2 +-
settings.gradle.kts | 2 +-
.../struts2/dom/inspection/Struts2ModelInspection.java | 11 +++++++++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index e59fe01..40276ee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
}
group = "com.intellij"
-version = "2024.4.1"
+version = "2024.4.2"
repositories {
mavenCentral()
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 116513b..3b7dc22 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,4 +5,4 @@ pluginManagement {
}
}
-rootProject.name = "Apache Struts IntelliJ IDEA plugin"
+rootProject.name = "struts-intellij-plugin"
diff --git a/src/main/java/com/intellij/struts2/dom/inspection/Struts2ModelInspection.java b/src/main/java/com/intellij/struts2/dom/inspection/Struts2ModelInspection.java
index f318593..5aaff29 100644
--- a/src/main/java/com/intellij/struts2/dom/inspection/Struts2ModelInspection.java
+++ b/src/main/java/com/intellij/struts2/dom/inspection/Struts2ModelInspection.java
@@ -16,6 +16,7 @@
package com.intellij.struts2.dom.inspection;
import com.intellij.codeInspection.options.OptPane;
+import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
@@ -34,6 +35,7 @@ import com.intellij.struts2.dom.struts.action.StrutsPathReferenceConverter;
import com.intellij.struts2.dom.struts.impl.path.ResultTypeResolver;
import com.intellij.struts2.dom.struts.model.StrutsManager;
import com.intellij.struts2.dom.struts.strutspackage.ResultType;
+import com.intellij.struts2.facet.StrutsFrameworkSupportProvider;
import com.intellij.struts2.facet.ui.StrutsFileSet;
import com.intellij.util.io.URLUtil;
import com.intellij.util.xml.*;
@@ -55,6 +57,8 @@ import static com.intellij.codeInspection.options.OptPane.pane;
*/
public class Struts2ModelInspection extends BasicDomElementsInspection<StrutsRoot> {
+ private static final Logger LOG = Logger.getInstance(Struts2ModelInspection.class);
+
/**
* @noinspection PublicField
*/
@@ -89,6 +93,7 @@ public class Struts2ModelInspection extends BasicDomElementsInspection<StrutsRoo
final Set<StrutsFileSet> fileSets = StrutsManager.getInstance(xmlFile.getProject()).getAllConfigFileSets(module);
for (final StrutsFileSet strutsFileSet : fileSets) {
+ LOG.info("Checking file set: " + strutsFileSet);
if (strutsFileSet.hasFile(virtualFile)) {
super.checkFileElement(strutsRootDomFileElement, holder);
break;
@@ -166,6 +171,12 @@ public class Struts2ModelInspection extends BasicDomElementsInspection<StrutsRoo
if (URLUtil.containsScheme(stringValue)) {
return false;
}
+
+ // WEB-INF/**/*.jsp
+ if (stringValue.matches("/WEB-INF/*/.*\\.jsp")) {
+ LOG.info("Inspecting jsp file: " + stringValue);
+ return false;
+ }
}
return true;