fix: don't expand builtin and our method snippets at jsx tag positions!

fix: allow to expand builtin method snippets in property assignment

Author: zardoy

README.MD

@@ -10,6 +10,10 @@ Add JSX elements to outline. It also makes sticky scroll works with your tags!
 
 Super recommended for react. Fragments are not rendered.
 
+## **Completions Built Different**
+
+90% work done in this extension highly improves completions experience!
+
 ### Method Snippets
 
 (*enabled by default*)

typescript/src/completionsAtPosition.ts

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

typescript/src/isGoodPositionMethodCompletion.ts

@@ -11,6 +11,7 @@ export const isGoodPositionBuiltinMethodCompletion = (ts: typeof tslib, sourceFi
         // type A = typeof obj["|"]
         if (ts.isStringLiteralLike(currentNode)) return false
         if (ts.isIdentifier(currentNode)) currentNode = currentNode.parent
+        if (ts.isJsxSelfClosingElement(currentNode) || ts.isJsxOpeningElement(currentNode)) return false
         if (ts.isShorthandPropertyAssignment(currentNode)) currentNode = currentNode.parent
         if (ts.isObjectBindingPattern(currentNode) || ts.isObjectLiteralExpression(currentNode)) return false
     }

typescript/test/completions.spec.ts

@@ -20,8 +20,7 @@ const newFileContents = (contents: string, fileName = entrypoint) => {
     const cursorPositions: number[] = []
     const replacement = '/*|*/'
     let cursorIndex
-    while ((cursorIndex = contents.indexOf(replacement))) {
-        if (cursorIndex === -1) break
+    while ((cursorIndex = contents.indexOf(replacement)) !== -1) {
         contents = contents.slice(0, cursorIndex) + contents.slice(cursorIndex + replacement.length)
         cursorPositions.push(cursorIndex)
     }
@@ -58,13 +57,15 @@ test('Banned positions', () => {
 })
 
 test('Builtin method snippet banned positions', () => {
-    const cursorPositions = newFileContents(/* ts */ `
-      import {/*|*/} from 'test'
-      const obj = { m$1e$2thod() {}, arrow: () => {} }
-      type A = typeof obj["/*|*/"];
-      const test = () => ({ method() {} })
-      const {/*|*/} = test()
-      const {something, met/*|*/} = test()
+    const cursorPositions = newFileContents(/* tsx */ `
+        import {/*|*/} from 'test'
+        const obj = { m$1e$2thod() {}, arrow: () => {} }
+        type A = typeof obj["/*|*/"];
+        const test = () => ({ method() {} })
+        const {/*|*/} = test()
+        const {something, met/*|*/} = test()
+        ;<Test/*|*/ />
+        ;<Test/*|*/></Test>
     `)
     for (const [i, pos] of cursorPositions.entries()) {
         const result = isGoodPositionBuiltinMethodCompletion(ts, getSourceFile(), pos)
@@ -75,17 +76,19 @@ test('Builtin method snippet banned positions', () => {
 })
 
 test('Additional banned positions for our method snippets', () => {
-    const cursorPositions = newFileContents(/* ts */ `
+    const cursorPositions = newFileContents(/* tsx */ `
         const test = () => ({ method() {} })
         test({
             method/*|*/
         })
         test({
             /*|*/
         })
+        ;<Test/*|*/ />
+        ;<Test/*|*/></Test>
     `)
     for (const [i, pos] of cursorPositions.entries()) {
-        const result = isGoodPositionMethodCompletion(ts, entrypoint, getSourceFile(), pos, languageService)
+        const result = isGoodPositionMethodCompletion(ts, entrypoint, getSourceFile(), pos - 1, languageService)
         expect(result, i.toString()).toBeFalsy()
     }
 })
@@ -97,6 +100,9 @@ test('Not banned positions for our method snippets', () => {
         test({
             method: /*|*/
         })
+        test({
+            method: setTimeout/*|*/
+        })
         test2/*|*/
     `)
     for (const [i, pos] of cursorPositions.entries()) {