commit uncommited

Author: zardoy

package.json

@@ -22,7 +22,7 @@
         "javascript",
         "plugin",
         "webstorm",
-        "TypeScript Hero"
+        "typescript hero"
     ],
     "activationEvents": [
         "onLanguage:javascript",

typescript/src/completionsAtPosition.ts

@@ -228,7 +228,7 @@ export const getCompletionsAtPosition = (
 
     // prevent vscode-builtin wrong insertText with methods snippets enabled
     if (!isGoodPositionBuiltinMethodCompletion(ts, sourceFile, position)) {
-        prior.entries = prior.entries.map(item => ({ ...item, insertText: item.insertText ?? item.name, isSnippet: true }))
+        prior.entries = prior.entries.map(item => ({ ...item, insertText: (item.insertText ?? item.name).replace(/\$/g, '\\$'), isSnippet: true }))
     }
 
     if (c('correctSorting.enable')) prior.entries = prior.entries.map((entry, index) => ({ ...entry, sortText: `${entry.sortText ?? ''}${index}` }))

typescript/src/dummyLanguageService.ts

@@ -15,6 +15,12 @@ export const createLanguageService = (files: Record<string, string>) => {
         },
         getCurrentDirectory: () => '',
         getDefaultLibFileName: () => require.resolve('typescript/lib/lib.esnext.full.d.ts'),
+        fileExists(path) {
+            return path in files
+        },
+        readFile(path) {
+            return files[path]!
+        },
     })
     return {
         languageService,

typescript/src/isGoodPositionMethodCompletion.ts

@@ -2,13 +2,17 @@ import type tslib from 'typescript/lib/tsserverlibrary'
 import { findChildContainingPosition, findChildContainingPositionMaxDepth } from './utils'
 
 export const isGoodPositionBuiltinMethodCompletion = (ts: typeof tslib, sourceFile: tslib.SourceFile, position: number) => {
-    const importClauseCandidate = findChildContainingPositionMaxDepth(ts, sourceFile, position, 2)
-    console.log(sourceFile.getFullText().slice(0, position))
-    if (importClauseCandidate?.kind === 266) return false
-    const currentNode = findChildContainingPosition(ts, sourceFile, position)
-    // const obj = { method() {}, arrow: () => {} }
-    // type A = typeof obj["|"]
-    if (currentNode && ts.isStringLiteralLike(currentNode)) return false
+    const importClauseCandidate = findChildContainingPositionMaxDepth(ts, sourceFile, position, 3)
+    if (importClauseCandidate && ts.isImportClause(importClauseCandidate)) return false
+    let currentNode = findChildContainingPosition(ts, sourceFile, position)
+    if (currentNode) {
+        // const obj = { method() {}, arrow: () => {} }
+        // type A = typeof obj["|"]
+        if (ts.isStringLiteralLike(currentNode)) return false
+        if (ts.isIdentifier(currentNode)) currentNode = currentNode.parent
+        if (ts.isShorthandPropertyAssignment(currentNode)) currentNode = currentNode.parent
+        if (ts.isObjectBindingPattern(currentNode) || ts.isObjectLiteralExpression(currentNode)) return false
+    }
     return true
 }