update

vaadin · Dec 16, 2024 · cae7472 · cae7472
1 parent 09c3eae
commit cae7472
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 19 deletions.
diff --git a/src/main/kotlin/com/vaadin/plugin/endpoints/HillaReferenceContributor.kt b/src/main/kotlin/com/vaadin/plugin/endpoints/HillaReferenceContributor.kt
@@ -17,6 +17,8 @@ class HillaReferenceContributor : PsiReferenceContributor() {
 
     internal class TsxToJavaReferenceProvider : PsiReferenceProvider() {
         override fun getReferencesByElement(element: PsiElement, context: ProcessingContext): Array<PsiReference> {
+            println(element.toString())
+            println(element.text)
             if (element.parent is JSCallExpression) {
                 val methodExpression = (element.parent as JSCallExpression).methodExpression
                 val className = methodExpression?.firstChild?.text
@@ -54,8 +56,8 @@ class HillaReferenceContributor : PsiReferenceContributor() {
     }
 
     override fun registerReferenceProviders(registrar: PsiReferenceRegistrar) {
-
         registrar.registerReferenceProvider(
-            PlatformPatterns.psiElement(JSReferenceExpression::class.java), TsxToJavaReferenceProvider())
+            PlatformPatterns.psiElement(JSReferenceExpression::class.java),
+                TsxToJavaReferenceProvider())
     }
 }
diff --git a/src/main/kotlin/com/vaadin/plugin/endpoints/VaadinEndpointGroup.kt b/src/main/kotlin/com/vaadin/plugin/endpoints/VaadinEndpointGroup.kt
@@ -0,0 +1,15 @@
+package com.vaadin.plugin.endpoints
+
+import com.intellij.microservices.endpoints.ModuleEndpointsFilter
+import com.intellij.openapi.project.Project
+
+internal enum class ENDPOINT_GROUP {
+    HILLA,
+    FLOW
+}
+
+internal class VaadinEndpointGroup(
+    val project: Project,
+    val filter: ModuleEndpointsFilter,
+    val endPointGroup: ENDPOINT_GROUP
+)
diff --git a/src/main/kotlin/com/vaadin/plugin/endpoints/VaadinEndpointsProvider.kt b/src/main/kotlin/com/vaadin/plugin/endpoints/VaadinEndpointsProvider.kt
@@ -14,24 +14,12 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.ModificationTracker
 import com.intellij.psi.PsiElement
 import com.intellij.uast.UastModificationTracker
-import com.vaadin.plugin.endpoints.VaadinEndpointsProvider.VaadinEndpointGroup
 import com.vaadin.plugin.utils.VaadinIcons
 import com.vaadin.plugin.utils.hasVaadin
 
 internal class VaadinEndpointsProvider : EndpointsProvider<VaadinEndpointGroup, VaadinRoute> {
     override val endpointType: EndpointType = HTTP_SERVER_TYPE
 
-    enum class ENDPOINT_GROUP {
-        HILLA,
-        FLOW
-    }
-
-    internal class VaadinEndpointGroup(
-        val project: Project,
-        val filter: ModuleEndpointsFilter,
-        val endPointGroup: ENDPOINT_GROUP
-    )
-
     override val presentation: FrameworkPresentation =
         FrameworkPresentation("Vaadin", "Vaadin", VaadinIcons.VAADIN_BLUE)
 
@@ -77,7 +65,7 @@ internal class VaadinEndpointsProvider : EndpointsProvider<VaadinEndpointGroup,
         val urlString = run {
             if (urlMapping.isBlank()) return@run "/"
             if (group.endPointGroup == ENDPOINT_GROUP.FLOW && !urlMapping.startsWith("/")) return@run "/$urlMapping"
-            if (group.endPointGroup == ENDPOINT_GROUP.HILLA) return@run "$urlMapping"
+            if (group.endPointGroup == ENDPOINT_GROUP.HILLA) return@run urlMapping
             return@run urlMapping
         }
 

diff --git a/src/main/kotlin/com/vaadin/plugin/endpoints/VaadinModel.kt b/src/main/kotlin/com/vaadin/plugin/endpoints/VaadinModel.kt
@@ -60,8 +60,6 @@ internal fun findHillaEndpoints(project: Project, scope: GlobalSearchScope): Col
                 val className = psiClass.name
 
                 if (sourcePsi == null || className == null) return@Processor true
-                //                val uAnnotation = uClass.findAnnotation(HILLA_BROWSER_CALLABLE) ?:
-                // return@Processor true
 
                 endpoints.add(VaadinRoute(className, className, PsiAnchor.create(sourcePsi)))
 

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -31,13 +31,13 @@
     <depends>com.intellij.modules.java</depends>
     <depends>org.jetbrains.idea.maven</depends>
     <depends>org.jetbrains.plugins.gradle</depends>
-    <depends>JavaScript</depends>
 
     <!-- Vaadin Endpoints IntelliJ Ultimate dependencies -->
     <depends>com.intellij.properties</depends>
     <depends optional="true" config-file="vaadin-with-microservices.xml">com.intellij.modules.microservices</depends>
     <depends optional="true" config-file="vaadin-with-microservices-jvm.xml">com.intellij.microservices.jvm</depends>
     <depends optional="true" config-file="vaadin-with-ultimate.xml">com.intellij.modules.ultimate</depends>
+    <depends optional="true" config-file="vaadin-with-javascript.xml">JavaScript</depends>
 
     <change-notes>
         <![CDATA[

diff --git a/src/main/resources/META-INF/vaadin-with-javascript.xml b/src/main/resources/META-INF/vaadin-with-javascript.xml
@@ -0,0 +1,7 @@
+<idea-plugin>
+
+    <extensions defaultExtensionNs="com.intellij">
+        <psi.referenceContributor language="TypeScript" implementation="com.vaadin.plugin.endpoints.HillaReferenceContributor"/>
+    </extensions>
+
+</idea-plugin>
diff --git a/src/main/resources/META-INF/vaadin-with-ultimate.xml b/src/main/resources/META-INF/vaadin-with-ultimate.xml
@@ -2,7 +2,6 @@
 
     <extensions defaultExtensionNs="com.intellij">
         <psi.referenceContributor language="UAST" implementation="com.vaadin.plugin.endpoints.VaadinReferenceContributor"/>
-        <psi.referenceContributor language="TypeScript" implementation="com.vaadin.plugin.endpoints.HillaReferenceContributor"/>
     </extensions>
 
 </idea-plugin>