Fix no props completion

vuejs · Jul 30, 2020 · e8fe639 · e8fe639
1 parent 3c686d0
commit e8fe639
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/server/src/modes/script/childComponents.ts b/server/src/modes/script/childComponents.ts
@@ -1,5 +1,5 @@
 import * as ts from 'typescript';
-import { getLastChild, buildDocumentation, getObjectLiteralExprFromExportExpr } from './componentInfo';
+import { getLastChild, buildDocumentation, getDefaultExportObjectLiteralExpr } from './componentInfo';
 import { T_TypeScript } from '../../services/dependencyService';
 
 interface InternalChildComponent {
@@ -58,7 +58,10 @@ export function getChildComponents(
       if (objectLiteralSymbol.flags & tsModule.SymbolFlags.Alias) {
         const definitionObjectLiteralSymbol = checker.getAliasedSymbol(objectLiteralSymbol);
         if (definitionObjectLiteralSymbol.valueDeclaration) {
-          const defaultExportExpr = getLastChild(definitionObjectLiteralSymbol.valueDeclaration);
+          const defaultExportExpr = getDefaultExportObjectLiteralExpr(
+            tsModule,
+            definitionObjectLiteralSymbol.valueDeclaration.getSourceFile()
+          );
           if (!defaultExportExpr) {
             return;
           }
@@ -71,7 +74,7 @@ export function getChildComponents(
               start: defaultExportExpr.getStart(undefined, true),
               end: defaultExportExpr.getEnd()
             },
-            defaultExportExpr: getObjectLiteralExprFromExportExpr(tsModule, defaultExportExpr)
+            defaultExportExpr
           });
         }
       }

diff --git a/server/src/modes/script/componentInfo.ts b/server/src/modes/script/componentInfo.ts
@@ -81,7 +81,7 @@ export function analyzeDefaultExportExpr(
   };
 }
 
-function getDefaultExportObjectLiteralExpr(
+export function getDefaultExportObjectLiteralExpr(
   tsModule: T_TypeScript,
   sourceFile: ts.SourceFile
 ): ts.Expression | undefined {

diff --git a/test/interpolation/fixture/completion/Basic.vue b/test/interpolation/fixture/completion/Basic.vue
@@ -53,5 +53,5 @@ export default {
       console.log(this.msg)
     }
   }
-}
+};
 </script>