jsxCompletionsMap fixes

Author: zardoy

typescript/src/completions/jsxAttributes.ts

@@ -11,8 +11,16 @@ export default (
     sourceFile: tslib.SourceFile,
     jsxCompletionsMap: Configuration['jsxCompletionsMap'],
 ): tslib.CompletionEntry[] => {
-    // TODO refactor to findNodeAtPosition
+    // ++ patch with jsxCompletionsMap
+    // -- don't
+    // <div| - identifier, not attribute --
+    // <div | - not identifier, not attribute ++
+    // <div t| - identifier -> attribute ++
+    // <div a={} t={} - in attributes ++
+    // <div t={|} - isn't attribute, so doesn't matter --
+    let jsxAttributeCandidate = !ts.isIdentifier(node)
     if (ts.isIdentifier(node)) node = node.parent
+    // fix builtin jsx attribute completion
     if (ts.isJsxAttribute(node) && node.initializer) {
         entries = entries.map(entry => {
             return {
@@ -21,9 +29,15 @@ export default (
             }
         })
     }
-    if (ts.isJsxAttribute(node)) node = node.parent
-    if (ts.isJsxAttributes(node)) node = node.parent
-    if (Object.keys(jsxCompletionsMap).length && (ts.isJsxOpeningElement(node) || ts.isJsxSelfClosingElement(node))) {
+    if (ts.isJsxAttribute(node)) {
+        jsxAttributeCandidate = true
+        node = node.parent
+    }
+    if (ts.isJsxAttributes(node)) {
+        jsxAttributeCandidate = true
+        node = node.parent
+    }
+    if (jsxAttributeCandidate && Object.keys(jsxCompletionsMap).length && (ts.isJsxOpeningElement(node) || ts.isJsxSelfClosingElement(node))) {
         const tagName = node.tagName.getText()
         // TODO use the same perf optimization for replaceSuggestions
         const patchEntries: Record<number, Configuration['jsxCompletionsMap'][string]> = {}
@@ -34,7 +48,7 @@ export default (
             if (comparingTagName && comparingTagName !== tagName) continue
             const comparingName = key.slice(splitTagNameIdx + 1)
             if (comparingName.includes('*')) {
-                const regexMatch = new RegExp(escapeStringRegexp(comparingName).replaceAll('\\*', '.*'))
+                const regexMatch = new RegExp(`^${escapeStringRegexp(comparingName).replaceAll('\\*', '.*')}$`)
                 entries.forEach(({ name, kind }, index) => {
                     if (kind === ts.ScriptElementKind.memberVariableElement && regexMatch.test(name)) {
                         patchEntries[index] = patchMethod

typescript/src/completionsAtPosition.ts

@@ -32,17 +32,14 @@ export const getCompletionsAtPosition = (
     if (!program || !sourceFile) return
     if (!scriptSnapshot || isInBannedPosition(position, scriptSnapshot, sourceFile)) return
     let prior = languageService.getCompletionsAtPosition(fileName, position, options)
-    // console.log(
-    //     'raw prior',
-    //     prior?.entries.map(entry => entry.name),
-    // )
     const ensurePrior = () => {
         if (!prior) prior = { entries: [], isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false }
         return true
     }
     const node = findChildContainingPosition(ts, sourceFile, position)
+    const leftNode = findChildContainingPosition(ts, sourceFile, position - 1)
     if (['.jsx', '.tsx'].some(ext => fileName.endsWith(ext))) {
-        // JSX Features
+        // #region JSX tag improvements
         if (node) {
             const { SyntaxKind } = ts
             const emmetSyntaxKinds = [SyntaxKind.JsxFragment, SyntaxKind.JsxElement, SyntaxKind.JsxText]
@@ -61,6 +58,7 @@ export const getCompletionsAtPosition = (
                         entry => isStartingWithUpperCase(entry.name) && ![ts.ScriptElementKind.enumElement].includes(entry.kind),
                     )
             }
+            // #endregion
 
             if (
                 c('jsxEmmet.type') !== 'disabled' &&
@@ -210,7 +208,7 @@ export const getCompletionsAtPosition = (
         })
     }
 
-    if (c('improveJsxCompletions') && node) prior.entries = improveJsxCompletions(ts, prior.entries, node, position, sourceFile, c('jsxCompletionsMap'))
+    if (c('improveJsxCompletions') && leftNode) prior.entries = improveJsxCompletions(ts, prior.entries, leftNode, position, sourceFile, c('jsxCompletionsMap'))
 
     for (const rule of c('replaceSuggestions')) {
         let foundIndex: number
@@ -240,7 +238,7 @@ export const getCompletionsAtPosition = (
 
     if (c('correctSorting.enable')) prior.entries = prior.entries.map((entry, index) => ({ ...entry, sortText: `${entry.sortText ?? ''}${index}` }))
 
-    console.log('signatureHelp', JSON.stringify(languageService.getSignatureHelpItems(fileName, position, {})))
+    // console.log('signatureHelp', JSON.stringify(languageService.getSignatureHelpItems(fileName, position, {})))
     return {
         completions: prior,
         prevCompletionsMap,