Bugfix: Inner classes where not properly resolved inside className at…

…tributes in JSP files
dmarks2 · Jan 11, 2022 · 33b2e2f · 33b2e2f
1 parent 8be0e07
commit 33b2e2f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 0 deletions.
diff --git a/changelog.md b/changelog.md
@@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file.
 - Feature: Add support for comments in bnd.bnd files
 - Bugfix: Exception when trying to inject Javascript inside aui:script-tags containing additonal attributes (like "use" or "require")
 - Bugfix: Avoid NullPointerException when trying to lookup documentation for an unknown OSGi property
+- Bugfix: Inner classes where not properly resolved inside className attributes in JSP files
 - Change: Fixed support for IntelliJ 2021.3
 
 ## 0.0.12

diff --git a/.../java/de/dm/intellij/liferay/language/jsp/LiferayTaglibClassNameReferenceContributor.java b/.../java/de/dm/intellij/liferay/language/jsp/LiferayTaglibClassNameReferenceContributor.java
@@ -22,6 +22,7 @@ protected PsiReferenceProvider getReferenceProvider() {
 
         provider.setOption(JavaClassReferenceProvider.ADVANCED_RESOLVE, Boolean.TRUE);
         provider.setOption(JavaClassReferenceProvider.RESOLVE_QUALIFIED_CLASS_NAME, Boolean.TRUE);
+        provider.setOption(JavaClassReferenceProvider.ALLOW_DOLLAR_NAMES, Boolean.FALSE);
 
         return provider;
     }

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -39,6 +39,7 @@
             <li>Feature: Add support for comments in bnd.bnd files</li>
             <li>Bugfix: Exception when trying to inject Javascript inside aui:script-tags containing additonal attributes (like "use" or "require")</li>
             <li>Bugfix: Avoid NullPointerException when trying to lookup documentation for an unknown OSGi property</li>
+            <li>Bugfix: Inner classes where not properly resolved inside className attributes in JSP files</li>
             <li>Change: Fixed support for IntelliJ 2021.3</li>
         </ul>
         <p>Version 0.0.12</p>

diff --git a/...a/de/dm/intellij/liferay/language/jsp/LiferayTaglibClassNameReferenceContributorTest.java b/...a/de/dm/intellij/liferay/language/jsp/LiferayTaglibClassNameReferenceContributorTest.java
@@ -28,4 +28,11 @@ public void testCompletion() {
         assertTrue(strings.contains("MyObject"));
     }
 
+    public void testCompletionInnerClass() {
+        myFixture.configureByFiles("inner.jsp", "liferay-aui.tld", "de/dm/Outer.java");
+        myFixture.complete(CompletionType.BASIC, 1);
+        List<String> strings = myFixture.getLookupElementStrings();
+        assertTrue("className should suggest inner classes separated with a dot (and not a dollar sign)", strings.contains("Inner"));
+    }
+
 }
diff --git a/...llij/liferay/language/jsp/LiferayTaglibClassNameReferenceContributorTest/de/dm/Outer.java b/...llij/liferay/language/jsp/LiferayTaglibClassNameReferenceContributorTest/de/dm/Outer.java
@@ -0,0 +1,8 @@
+package de.dm;
+
+public interface Outer {
+
+    interface Inner {
+
+    }
+}
diff --git a/...dm/intellij/liferay/language/jsp/LiferayTaglibClassNameReferenceContributorTest/inner.jsp b/...dm/intellij/liferay/language/jsp/LiferayTaglibClassNameReferenceContributorTest/inner.jsp
@@ -0,0 +1,3 @@
+<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %>
+
+<aui:model-context model="de.dm.Outer.<caret>" />
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %>

		<aui:model-context model="de.dm.Outer.<caret>" />