Merge pull request #172 from zardoy/develop

Author: zardoy

typescript/src/codeActions/extended/declareMissingProperties.ts

@@ -6,13 +6,13 @@ export default {
     kind: 'quickfix',
     title: 'Declare missing property',
     tryToApply({ sourceFile, node }) {
-        const param = matchParents(node, ['Identifier', 'ObjectBindingPattern', 'Parameter'])
+        const param = matchParents(node, ['Identifier', 'BindingElement', 'ObjectBindingPattern', 'Parameter'])
         if (param) {
             // special react pattern
             if (ts.isArrowFunction(param.parent) && ts.isVariableDeclaration(param.parent.parent)) {
                 const variableDecl = param.parent.parent
                 if (variableDecl.type?.getText().match(/(React\.)?FC/)) {
-                    // handle interface
+                    // todo handle interface
                 }
             }
             // general patterns
@@ -24,21 +24,12 @@ export default {
                 if (insertComma) insertText = `, ${insertText}`
                 // alternatively only one snippetEdit could be used with tsFull.escapeSnippetText(insertText) + $0
                 return {
-                    edits: [
-                        {
-                            newText: insertText,
-                            span: {
-                                length: 0,
-                                start: insertPos,
-                            },
-                        },
-                    ],
                     snippetEdits: [
                         {
-                            newText: '$0',
+                            newText: `${tsFull.escapeSnippetText(insertText)}$0`,
                             span: {
                                 length: 0,
-                                start: insertPos + insertText.length - 1,
+                                start: insertPos,
                             },
                         },
                     ],
@@ -48,3 +39,16 @@ export default {
         return
     },
 } as ExtendedCodeAction
+
+const testCode = () => {
+    const tester = (code: string) => {
+        // ^ - problem location in which quickfix needs to be tested (applied)
+        // | - cursor position after quickfix is applied
+        // [[...]] - applied part of the code
+        /* TODO */
+    }
+
+    tester(/* ts */ `
+        const b = ({ b, ^a }: { b[[, a/*|*/]] }) => {}
+    `)
+}

typescript/src/completions/staticHintSuggestions.ts

@@ -28,7 +28,7 @@ const letterKeys = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
 )
 const someOtherKeys = [
     'Space',
-    'Esc',
+    'Escape',
     'Tab',
     'Enter',
     'Equal',

typescript/src/constructMethodSnippet.ts

@@ -28,7 +28,7 @@ export default (
     const isNewExpression =
         ts.isNewExpression(containerNode) &&
         ts.textSpanIntersectsWithPosition(ts.createTextSpanFromBounds(containerNode.expression.pos, containerNode.expression.end), position)
-    if (!isNewExpression && (type.getProperties().length > 0 || type.getStringIndexType() || type.getNumberIndexType())) {
+    if (!isNewExpression && (getNonFunctionProperties(type).length > 0 || type.getStringIndexType() || type.getNumberIndexType())) {
         resolveData.isAmbiguous = true
     }
 
@@ -152,3 +152,8 @@ function getPromiseLikeTypeArgument(type: ts.Type | undefined, checker: ts.TypeC
 function hasPrivateOrProtectedModifier(modifiers: ts.NodeArray<ts.ModifierLike> | ts.NodeArray<ts.Modifier> | undefined) {
     return modifiers?.some(modifier => oneOf(modifier.kind, ts.SyntaxKind.PrivateKeyword, ts.SyntaxKind.ProtectedKeyword))
 }
+
+function getNonFunctionProperties(type: ts.Type) {
+    const customSpecialFunctionProperties = ['__promisify__']
+    return type.getProperties().filter(x => !customSpecialFunctionProperties.includes(x.name))
+}

typescript/src/references.ts

@@ -1,18 +1,34 @@
 import { GetConfig } from './types'
-import { findChildContainingPositionMaxDepth, approveCast } from './utils'
+import { findChildContainingPositionMaxDepth, approveCast, findChildContainingExactPosition, matchParents } from './utils'
 
 export default (proxy: ts.LanguageService, languageService: ts.LanguageService, c: GetConfig) => {
     proxy.findReferences = (fileName, position) => {
         let prior = languageService.findReferences(fileName, position)
         if (!prior) return
+        const program = languageService.getProgram()!
         if (c('removeDefinitionFromReferences')) {
-            prior = prior.map(({ references, ...other }) => ({
-                ...other,
-                references: references.filter(({ isDefinition }) => !isDefinition),
-            }))
+            const sourceFile = program.getSourceFile(fileName)
+            const node = findChildContainingExactPosition(sourceFile!, position)
+            let filterDefs = true
+            if (
+                node &&
+                node.flags & ts.NodeFlags.JavaScriptFile &&
+                matchParents(node, ['Identifier', 'PropertyAccessExpression'])?.expression.kind === ts.SyntaxKind.ThisKeyword
+            ) {
+                // https://github.com/zardoy/typescript-vscode-plugins/issues/165
+                filterDefs = false
+            }
+
+            if (filterDefs) {
+                prior = prior.map(({ references, ...other }) => ({
+                    ...other,
+                    references: references.filter(({ isDefinition, textSpan, fileName }) => {
+                        return !isDefinition
+                    }),
+                }))
+            }
         }
         if (c('removeImportsFromReferences')) {
-            const program = languageService.getProgram()!
             const refCountPerFileName: Record<
                 string,
                 {

typescript/src/utils.ts

@@ -303,12 +303,12 @@ export const matchParents: MatchParentsType = (node, treeToCompare) => {
     for (const toCompare of treeToCompare) {
         if (!first) {
             node = node?.parent
-            first = false
         }
         if (!node) return
         if (!(ts[`is${toCompare}` as keyof typeof ts] as (node) => boolean)(node)) {
             return
         }
+        first = false
     }
     return node as any
 }