fix: material-help

apptools-lab · Aug 16, 2021 · d7e4a90 · d7e4a90
1 parent 50f2664
commit d7e4a90
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 12 deletions.
diff --git a/extensions/material-helper/src/importAutoComplete/getAlreadyImportSet.ts b/extensions/material-helper/src/importAutoComplete/getAlreadyImportSet.ts
@@ -11,7 +11,7 @@ export default (doc: vscode.TextDocument): Set<string> => {
   try {
     const ast = parse(documentText, {
       sourceType: 'module',
-      plugins: getBabelParserPlugins('jsx'),
+      plugins: getBabelParserPlugins('ts'),
       errorRecovery: true,
     });
     traverse(ast, {

diff --git a/extensions/material-helper/src/mtopAutoComplete/getCurrentMtopRequestCall.ts b/extensions/material-helper/src/mtopAutoComplete/getCurrentMtopRequestCall.ts
@@ -7,8 +7,7 @@ import getBabelParserPlugins from '../utils/getBabelParserPlugins';
 function isCursorInObjectExpression(callExpression: CallExpression, cursorPosition: number): boolean {
   const callArguments = callExpression.arguments;
   const node = callArguments?.[0];
-
-  return isObjectExpression(node) && (node.start < cursorPosition && cursorPosition < node.end);
+  return isObjectExpression(node) && (<number>node.start < cursorPosition && cursorPosition < <number>node.end);
 }
 
 function conditionOfCompletion(callExpression: CallExpression, cursorPosition: number): boolean {
@@ -31,7 +30,7 @@ function getOriginCurrentCallExpress(
   try {
     const ast = parse(code, {
       sourceType: 'module',
-      plugins: getBabelParserPlugins('jsx'),
+      plugins: getBabelParserPlugins('ts'),
     });
     traverse(ast, {
       CallExpression(path: NodePath<CallExpression>) {

diff --git a/extensions/material-helper/src/propTypesAutoComplete/getJsxPropKeys.ts b/extensions/material-helper/src/propTypesAutoComplete/getJsxPropKeys.ts
@@ -14,7 +14,7 @@ export default (doc: vscode.TextDocument, location: vscode.Location): string[] =
   try {
     const ast = parse(definitionsCode, {
       sourceType: 'module',
-      plugins: getBabelParserPlugins('jsx'),
+      plugins: getBabelParserPlugins('js'),
     });
     if (checkIsCapitalizeWord(originSelectionCode) && checkIsJsxComponent(ast)) {
       return getJsxPropKeysFromAst(ast);

diff --git a/extensions/material-helper/src/propTypesAutoComplete/getPropTypesDependentName.ts b/extensions/material-helper/src/propTypesAutoComplete/getPropTypesDependentName.ts
@@ -9,7 +9,7 @@ export default (code: string, uri: vscode.Uri): string => {
   try {
     const ast = parse(code, {
       sourceType: 'module',
-      plugins: getBabelParserPlugins('jsx'),
+      plugins: getBabelParserPlugins('js'),
       errorRecovery: true,
     });
 

diff --git a/extensions/material-helper/src/propsAutoComplete/getPropKeysFromCode.ts b/extensions/material-helper/src/propsAutoComplete/getPropKeysFromCode.ts
@@ -12,7 +12,7 @@ export default function getPropKeysFromCode(componentPath: string): string[] {
   try {
     const ast = parse(fs.readFileSync(componentPath, 'utf-8'), {
       sourceType: 'module',
-      plugins: getBabelParserPlugins('jsx'),
+      plugins: getBabelParserPlugins('js'),
     });
 
     if (ast) {

diff --git a/extensions/material-helper/src/utils/getBabelParserPlugins.ts b/extensions/material-helper/src/utils/getBabelParserPlugins.ts
@@ -1,7 +1,8 @@
 import { ParserPlugin } from '@babel/parser';
 
-export default function getBabelParserPlugins(language: string): ParserPlugin[] {
+export default function getBabelParserPlugins(language: 'ts' | 'js'): ParserPlugin[] {
   const plugins: ParserPlugin[] = [
+    'jsx',
     'doExpressions',
     'objectRestSpread',
     'decorators-legacy',
@@ -18,7 +19,6 @@ export default function getBabelParserPlugins(language: string): ParserPlugin[]
     plugins.unshift('typescript');
   } else {
     plugins.unshift('flow');
-    plugins.unshift('jsx');
   }
 
   return plugins;

diff --git a/extensions/material-helper/src/utils/getComponentSource.ts b/extensions/material-helper/src/utils/getComponentSource.ts
@@ -9,7 +9,7 @@ function getComponentSource(
 ) {
   const ast = parser.parse(documentText, {
     sourceType: 'module',
-    plugins: getBabelParserPlugins('jsx'),
+    plugins: getBabelParserPlugins('ts'),
   });
 
   const result = { source: '', importedComponent: '' };

diff --git a/extensions/material-helper/src/utils/getCurrentJsxElement.ts b/extensions/material-helper/src/utils/getCurrentJsxElement.ts
@@ -16,7 +16,7 @@ export default function getCurrentJsxElement(
     // https://babeljs.io/docs/en/babel-parser
     const ast = parse(documentText, {
       sourceType: 'module',
-      plugins: getBabelParserPlugins('jsx'),
+      plugins: getBabelParserPlugins('ts'),
     });
 
     if (ast) {

diff --git a/extensions/material-helper/src/utils/getJsxElements.ts b/extensions/material-helper/src/utils/getJsxElements.ts
@@ -14,7 +14,7 @@ export default function getJsxElements(
     // https://babeljs.io/docs/en/babel-parser
     const ast = parse(documentText, {
       sourceType: 'module',
-      plugins: getBabelParserPlugins('jsx'),
+      plugins: getBabelParserPlugins('ts'),
     });
 
     if (ast) {