feat: add support for multinamespaced components (#212)

* support autocomplete for same component name from different namespaces allow us have autocomplete for components with same name, located in different namespaces * does not filter items if no roots found * use-case test
lifeart · Apr 1, 2021 · 6b03c83 · 6b03c83
1 parent 580973b
commit 6b03c83
Show file tree

Hide file tree

Showing 12 changed files with 164 additions and 12 deletions.
diff --git a/src/builtin-addons/core/template-completion-provider.ts b/src/builtin-addons/core/template-completion-provider.ts
@@ -345,8 +345,8 @@ export default class TemplateCompletionProvider {
 
     if (this.hasNamespaceSupport) {
       const registry = this.server.getRegistry(this.project.root);
-
-      completions.forEach((item) => {
+      const extraCompletions: CompletionItem[] = [];
+      const filteredCompletions = completions.filter((item) => {
         if (item.detail === 'component') {
           const paths = registry.component[normalizeToClassicComponent(item.label)] || [];
           const roots = this.project.addonsMeta
@@ -356,13 +356,27 @@ export default class TemplateCompletionProvider {
             .sort((a, b) => {
               return b.root.length - a.root.length;
             });
-          const closestRoot: null | string = roots.length ? roots[0].name : null;
 
-          if (closestRoot !== null) {
-            item.label = `${normalizeToAngleBracketComponent(closestRoot)}$${item.label}`;
+          roots.forEach((r) => {
+            extraCompletions.push({
+              ...item,
+              ...{
+                label: `${normalizeToAngleBracketComponent(r.name)}$${item.label}`,
+              },
+            });
+          });
+
+          if (roots.length) {
+            return false;
+          } else {
+            return true;
           }
         }
+
+        return true;
       });
+
+      return [...filteredCompletions, ...extraCompletions];
     }
 
     return completions;

diff --git a/test/__snapshots__/batman-fixture-based-integration-test.ts.snap b/test/__snapshots__/batman-fixture-based-integration-test.ts.snap
@@ -1,5 +1,100 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`With \`batman project\` initialized on server Completion request returns all angle-bracket components with same name from different namespaces 1`] = `
+Array [
+  Object {
+    "detail": "component",
+    "kind": 7,
+    "label": "AnotherAwesomeComponent",
+    "textEdit": Object {
+      "newText": "AnotherAwesomeComponent",
+      "range": Object {
+        "end": Object {
+          "character": 1,
+          "line": 0,
+        },
+        "start": Object {
+          "character": 1,
+          "line": 0,
+        },
+      },
+    },
+  },
+  Object {
+    "detail": "component",
+    "kind": 7,
+    "label": "MyAwesomeComponent",
+    "textEdit": Object {
+      "newText": "MyAwesomeComponent",
+      "range": Object {
+        "end": Object {
+          "character": 1,
+          "line": 0,
+        },
+        "start": Object {
+          "character": 1,
+          "line": 0,
+        },
+      },
+    },
+  },
+  Object {
+    "detail": "component",
+    "kind": 7,
+    "label": "Nested::NestedComponent",
+    "textEdit": Object {
+      "newText": "Nested::NestedComponent",
+      "range": Object {
+        "end": Object {
+          "character": 1,
+          "line": 0,
+        },
+        "start": Object {
+          "character": 1,
+          "line": 0,
+        },
+      },
+    },
+  },
+  Object {
+    "detail": "component",
+    "kind": 7,
+    "label": "Boo$Bar",
+    "textEdit": Object {
+      "newText": "Boo$Bar",
+      "range": Object {
+        "end": Object {
+          "character": 1,
+          "line": 0,
+        },
+        "start": Object {
+          "character": 1,
+          "line": 0,
+        },
+      },
+    },
+  },
+  Object {
+    "detail": "component",
+    "kind": 7,
+    "label": "Foo$Bar",
+    "textEdit": Object {
+      "newText": "Foo$Bar",
+      "range": Object {
+        "end": Object {
+          "character": 1,
+          "line": 0,
+        },
+        "start": Object {
+          "character": 1,
+          "line": 0,
+        },
+      },
+    },
+  },
+]
+`;
+
 exports[`With \`batman project\` initialized on server Completion request returns all angle-bracket in a element expression for in repo addons with batman syntax 1`] = `
 Array [
   Object {
@@ -36,7 +131,7 @@ Array [
         "line": 0,
       },
     },
-    "uri": "/lib/foo/addon/templates/components/bar.hbs",
+    "uri": "/lib/boo/addon/templates/components/bar.hbs",
   },
 ]
 `;
@@ -54,7 +149,7 @@ Array [
         "line": 0,
       },
     },
-    "uri": "/lib/foo/app/components/bar.js",
+    "uri": "/lib/foo/addon/components/bar.js",
   },
 ]
 `;
diff --git a/test/batman-fixture-based-integration-test.ts b/test/batman-fixture-based-integration-test.ts
@@ -63,6 +63,25 @@ describe('With `batman project` initialized on server', () => {
 
       expect(response).toMatchSnapshot();
     });
+
+    it('returns all angle-bracket components with same name from different namespaces', async () => {
+      const applicationTemplatePath = path.join(__dirname, 'fixtures', 'batman', 'app', 'templates', 'same-component-name.hbs');
+      const params = {
+        textDocument: {
+          uri: URI.file(applicationTemplatePath).toString(),
+        },
+        position: {
+          line: 0,
+          character: 1,
+        },
+      };
+
+      openFile(connection, applicationTemplatePath);
+
+      const response = await connection.sendRequest(CompletionRequest.method, params);
+
+      expect(response).toMatchSnapshot();
+    });
   });
 
   describe('Definition request', () => {

diff --git a/test/fixtures/batman/app/templates/batman-definition.hbs b/test/fixtures/batman/app/templates/batman-definition.hbs
@@ -1 +1 @@
-<Foo$Bar />
+<Boo$Bar />
diff --git a/test/fixtures/batman/app/templates/same-component-name.hbs b/test/fixtures/batman/app/templates/same-component-name.hbs
@@ -0,0 +1 @@
+<
diff --git a/test/fixtures/batman/lib/boo/addon/templates/components/bar.hbs b/test/fixtures/batman/lib/boo/addon/templates/components/bar.hbs
@@ -0,0 +1,2 @@
+<Foo$Bar />
+<Boo$Bar />
diff --git a/test/fixtures/batman/lib/boo/index.js b/test/fixtures/batman/lib/boo/index.js
@@ -0,0 +1,10 @@
+/* eslint-env node */
+'use strict';
+
+module.exports = {
+  name: 'boo',
+
+  isDevelopingAddon() {
+    return true;
+  }
+};
diff --git a/test/fixtures/batman/lib/boo/package.json b/test/fixtures/batman/lib/boo/package.json
@@ -0,0 +1,9 @@
+{
+    "name": "boo",
+    "keywords": [
+      "ember-addon"
+    ],
+    "dependencies": {
+
+    }
+  }
diff --git a/test/fixtures/batman/lib/foo/addon/components/bar.js b/test/fixtures/batman/lib/foo/addon/components/bar.js
diff --git a/test/fixtures/batman/lib/foo/addon/templates/components/bar.hbs b/test/fixtures/batman/lib/foo/addon/templates/components/bar.hbs
@@ -0,0 +1,4 @@
+
+<MyAwesomeComponent />
+
+<Boo$Bar />
diff --git a/test/fixtures/batman/lib/foo/app/components/bar.js b/test/fixtures/batman/lib/foo/app/components/bar.js
diff --git a/test/fixtures/batman/package.json b/test/fixtures/batman/package.json
@@ -49,7 +49,8 @@
   },
   "ember-addon": {
     "paths": [
-      "lib/foo"
+      "lib/foo",
+	  "lib/boo"
     ]
   }
 }