support vue.js compoenents in any components key

Haehnchen · Feb 25, 2024 · ab4fa36 · ab4fa36
1 parent 96aa0ae
commit ab4fa36
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 4 deletions.
diff --git a/src/main/java/de/espend/idea/vuejs/index/ComponentUsageIndex.java b/src/main/java/de/espend/idea/vuejs/index/ComponentUsageIndex.java
@@ -1,10 +1,18 @@
 package de.espend.idea.vuejs.index;
 
 import com.intellij.lang.ecmascript6.psi.ES6ImportedBinding;
+import com.intellij.lang.ecmascript6.psi.ES6Property;
 import com.intellij.lang.ecmascript6.resolve.JSFileReferencesUtil;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
+import com.intellij.lang.javascript.psi.JSProperty;
+import com.intellij.lang.javascript.psi.JSReferenceExpression;
+import com.intellij.lang.javascript.psi.impl.JSReferenceExpressionImpl;
+import com.intellij.lang.javascript.psi.util.JSStubBasedPsiTreeUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiRecursiveElementVisitor;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.PathUtil;
 import com.intellij.util.indexing.*;
@@ -47,14 +55,36 @@ public class ComponentUsageIndex extends FileBasedIndexExtension<String, List<St
                             @Override
                             public void visitElement(@NotNull PsiElement element) {
                                 if (element instanceof ES6ImportedBinding es6ImportedBinding) {
-                                    VueJsUtil.ES6Import singleImported = VueJsUtil.getSingleImported(es6ImportedBinding);
-                                    if (singleImported != null) {
-                                        String fileName = PathUtil.getFileName(singleImported.fileNameWithoutExtension());
-                                        imports.put(JSFileReferencesUtil.getFileNameWithoutExtension(fileName, new String[] {".vue"}), Arrays.asList(singleImported.referenceText(), singleImported.importName()));
+                                    visitImportedBinding(es6ImportedBinding);
+                                } else if (element instanceof JSProperty jsProperty && "components".equals(jsProperty.getName())) {
+                                    // components: {Foobar}
+                                    JSExpression value = jsProperty.getValue();
+                                    if (value instanceof JSObjectLiteralExpression jsObjectLiteralExpression) {
+                                        for (ES6Property es6Property : PsiTreeUtil.collectElementsOfType(jsObjectLiteralExpression, ES6Property.class)) {
+                                            JSExpression value1 = es6Property.getValue();
+                                            if (value1 instanceof JSReferenceExpression jsReferenceExpression) {
+                                                String referenceName = JSReferenceExpressionImpl.getReferenceName(jsReferenceExpression.getNode());
+                                                if (referenceName != null) {
+                                                    for (PsiElement resolveLocallyWithMergedResult : JSStubBasedPsiTreeUtil.resolveLocallyWithMergedResults(referenceName, jsReferenceExpression)) {
+                                                        if (resolveLocallyWithMergedResult instanceof ES6ImportedBinding es6ImportedBinding) {
+                                                            visitImportedBinding(es6ImportedBinding);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
                                     }
                                 }
                                 super.visitElement(element);
                             }
+
+                            private void visitImportedBinding(@NotNull ES6ImportedBinding es6ImportedBinding) {
+                                VueJsUtil.ES6Import singleImported = VueJsUtil.getSingleImported(es6ImportedBinding);
+                                if (singleImported != null) {
+                                    String fileName = PathUtil.getFileName(singleImported.fileNameWithoutExtension());
+                                    imports.put(JSFileReferencesUtil.getFileNameWithoutExtension(fileName, new String[] {".vue"}), Arrays.asList(singleImported.referenceText(), singleImported.importName()));
+                                }
+                            }
                         });
                     }
 

diff --git a/src/test/java/tests/de/espend/idea/vuejs/index/fixtures/component-annotation.vue b/src/test/java/tests/de/espend/idea/vuejs/index/fixtures/component-annotation.vue
@@ -0,0 +1,14 @@
+<script>
+import ButtonCounter from './ButtonCounter.vue'
+
+@Component({
+  components: {
+    ButtonCounter,
+  },
+})
+export default {}
+
+<template>
+  <h1>Here is a child component!</h1>
+  <ButtonCounter />
+</template>
diff --git a/src/test/java/tests/de/espend/idea/vuejs/index/fixtures/component-composition.vue b/src/test/java/tests/de/espend/idea/vuejs/index/fixtures/component-composition.vue
@@ -0,0 +1,8 @@
+<script setup>
+import ButtonCounter from './ButtonCounter.vue'
+</script>
+
+<template>
+  <h1>Here is a child component!</h1>
+  <ButtonCounter />
+</template>
diff --git a/src/test/java/tests/de/espend/idea/vuejs/index/fixtures/component-options.vue b/src/test/java/tests/de/espend/idea/vuejs/index/fixtures/component-options.vue
@@ -0,0 +1,14 @@
+<script>
+import ButtonCounter from './ButtonCounter.vue'
+
+export default {
+  components: {
+    ButtonCounter
+  }
+}
+</script>
+
+<template>
+  <h1>Here is a child component!</h1>
+  <ButtonCounter />
+</template>