feat: use single registry for autocomplete (#286)

* feat: use single registry for autocomplete * align addon version
lifeart · May 26, 2021 · 58e18a8 · 58e18a8
1 parent dff1f4d
commit 58e18a8
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 12 deletions.
diff --git a/src/builtin-addons/core/script-completion-provider.ts b/src/builtin-addons/core/script-completion-provider.ts
@@ -86,6 +86,7 @@ export default class ScriptCompletionProvider {
         if (!this.meta.projectAddonsInfoInitialized) {
           mGetProjectAddonsInfo(root);
           this.enableRegistryCache('projectAddonsInfoInitialized');
+          this.project.invalidateRegistry();
         }
 
         const registry = this.registry;
@@ -108,6 +109,7 @@ export default class ScriptCompletionProvider {
         if (!this.meta.projectAddonsInfoInitialized) {
           mGetProjectAddonsInfo(root);
           this.enableRegistryCache('projectAddonsInfoInitialized');
+          this.project.invalidateRegistry();
         }
 
         const registry = this.registry;
@@ -130,6 +132,7 @@ export default class ScriptCompletionProvider {
         if (!this.meta.projectAddonsInfoInitialized) {
           mGetProjectAddonsInfo(root);
           this.enableRegistryCache('projectAddonsInfoInitialized');
+          this.project.invalidateRegistry();
         }
 
         const registry = this.registry;
@@ -184,6 +187,7 @@ export default class ScriptCompletionProvider {
         if (!this.meta.projectAddonsInfoInitialized) {
           mGetProjectAddonsInfo(root);
           this.enableRegistryCache('projectAddonsInfoInitialized');
+          this.project.invalidateRegistry();
         }
 
         const registry = this.registry;

diff --git a/src/builtin-addons/core/template-completion-provider.ts b/src/builtin-addons/core/template-completion-provider.ts
@@ -71,6 +71,10 @@ export function generateNamespacedComponentsHashMap(addonsMeta: Array<AddonMeta>
 
   // Iterate over the addons meta
   addonsMeta.forEach((addonData: AddonMeta) => {
+    if (addonData.version !== 1) {
+      return;
+    }
+
     // Get the component registry based on the addon root.
     // The component registry is a map where the file name is the key and the value are
     // potential file paths.
@@ -174,6 +178,8 @@ export default class TemplateCompletionProvider {
         mGetProjectAddonsInfo(project.root);
         this.enableRegistryCache('projectAddonsInfoInitialized');
 
+        this.project.invalidateRegistry();
+
         logInfo(project.root + ': registry initialized in ' + (Date.now() - initStartTime) + 'ms');
       } catch (e) {
         logError(e);
@@ -188,6 +194,7 @@ export default class TemplateCompletionProvider {
     if (!this.meta.projectAddonsInfoInitialized) {
       mGetProjectAddonsInfo(root);
       this.enableRegistryCache('projectAddonsInfoInitialized');
+      this.project.invalidateRegistry();
     }
 
     if (!this.meta.componentsRegistryInitialized) {
@@ -200,7 +207,7 @@ export default class TemplateCompletionProvider {
       this.enableRegistryCache('podComponentsRegistryInitialized');
     }
 
-    const registry = this.server.getRegistry(this.project.roots);
+    const registry = this.project.registry;
 
     return uniqBy(
       items
@@ -244,6 +251,7 @@ export default class TemplateCompletionProvider {
     if (!this.meta.projectAddonsInfoInitialized) {
       mGetProjectAddonsInfo(root);
       this.enableRegistryCache('projectAddonsInfoInitialized');
+      this.project.invalidateRegistry();
     }
 
     if (!this.meta.componentsRegistryInitialized) {
@@ -261,7 +269,7 @@ export default class TemplateCompletionProvider {
       this.enableRegistryCache('helpersRegistryInitialized');
     }
 
-    const registry = this.server.getRegistry(this.project.roots);
+    const registry = this.project.registry;
 
     const candidates: CompletionItem[] = [
       ...Object.keys(registry.component).map((rawName) => {
@@ -286,6 +294,7 @@ export default class TemplateCompletionProvider {
     if (!this.meta.projectAddonsInfoInitialized) {
       mGetProjectAddonsInfo(root);
       this.enableRegistryCache('projectAddonsInfoInitialized');
+      this.project.invalidateRegistry();
     }
 
     if (!this.meta.componentsRegistryInitialized) {
@@ -298,7 +307,7 @@ export default class TemplateCompletionProvider {
       this.enableRegistryCache('podComponentsRegistryInitialized');
     }
 
-    const registry = this.server.getRegistry(this.project.roots);
+    const registry = this.project.registry;
 
     return Object.keys(registry.component).map((rawName) => {
       return {
@@ -317,9 +326,10 @@ export default class TemplateCompletionProvider {
     if (!this.meta.projectAddonsInfoInitialized) {
       mGetProjectAddonsInfo(this.project.root);
       this.enableRegistryCache('projectAddonsInfoInitialized');
+      this.project.invalidateRegistry();
     }
 
-    const registry = this.server.getRegistry(this.project.roots);
+    const registry = this.project.registry;
 
     return Object.keys(registry.helper).map((helperName) => {
       return {
@@ -518,7 +528,7 @@ export default class TemplateCompletionProvider {
           this.enableRegistryCache('routesRegistryInitialized');
         }
 
-        const registry = this.server.getRegistry(this.project.roots);
+        const registry = this.project.registry;
 
         const results = Object.keys(registry.routePath).map((name) => {
           return {
@@ -538,7 +548,7 @@ export default class TemplateCompletionProvider {
           this.enableRegistryCache('routesRegistryInitialized');
         }
 
-        const registry = this.server.getRegistry(this.project.roots);
+        const registry = this.project.registry;
 
         const results = Object.keys(registry.routePath).map((name) => {
           return {
@@ -560,9 +570,10 @@ export default class TemplateCompletionProvider {
         if (!this.meta.projectAddonsInfoInitialized) {
           mGetProjectAddonsInfo(root);
           this.enableRegistryCache('projectAddonsInfoInitialized');
+          this.project.invalidateRegistry();
         }
 
-        const registry = this.server.getRegistry(this.project.roots);
+        const registry = this.project.registry;
 
         const resolvedModifiers = Object.keys(registry.modifier).map((name) => {
           return {

diff --git a/src/project.ts b/src/project.ts
@@ -51,6 +51,9 @@ export class Project extends BaseProject {
   private registryVersion = 0;
   private _registry!: IRegistry;
   private _registryVersion = -1;
+  invalidateRegistry() {
+    this._registryVersion = -1;
+  }
   get registry(): IRegistry {
     if (this._registryVersion !== this.registryVersion) {
       logInfo(`${this.name} registry version mismatch [${this._registryVersion}, ${this.registryVersion}], regenerating...`);

diff --git a/src/server.ts b/src/server.ts
@@ -56,7 +56,7 @@ import { MatchResultType } from './utils/path-matcher';
 import { FileChangeType } from 'vscode-languageserver/node';
 import { debounce } from 'lodash';
 import { Config, Initializer } from './types';
-import { isFileBelongsToRoots } from './utils/layout-helpers';
+import { isFileBelongsToRoots, mGetProjectAddonsInfo } from './utils/layout-helpers';
 
 export default class Server {
   initializers: Initializer[] = [];
@@ -157,6 +157,9 @@ export default class Server {
         };
       }
 
+      mGetProjectAddonsInfo(project.root);
+      project.invalidateRegistry();
+
       return {
         projectName: project.name,
         root: project.root,

diff --git a/test/bultin-addons/core/template-complation-provider-test.ts b/test/bultin-addons/core/template-complation-provider-test.ts
@@ -23,8 +23,8 @@ describe('filter util', function () {
 describe('generateNamespacedComponentsHashMap', function () {
   it('[Angle brackets] returns the expected namespaced map', function () {
     const mockAddonMetaArr = [
-      { name: '@company/foo', root: 'blah/bar/dummy/@company/foo' },
-      { name: 'biz', root: 'blah/baz/diz/biz' },
+      { name: '@company/foo', version: 1, root: 'blah/bar/dummy/@company/foo' },
+      { name: 'biz', version: 1, root: 'blah/baz/diz/biz' },
     ];
 
     const server: any = {
@@ -38,8 +38,8 @@ describe('generateNamespacedComponentsHashMap', function () {
 
   it('[Mustache] returns the expected namespaced map', function () {
     const mockAddonMetaArr = [
-      { name: '@company/test', root: 'blah/bar/dummy/@company/test' },
-      { name: 'biz', root: 'blah/baz/diz/biz' },
+      { name: '@company/test', version: 1, root: 'blah/bar/dummy/@company/test' },
+      { name: 'biz', version: 1, root: 'blah/baz/diz/biz' },
     ];
 
     const server: any = {