Fixed reference searches related to JsxNamespacedName

src/services/findAllReferences.ts

@@ -74,6 +74,7 @@ import {
     getDeclarationFromName,
     getDeclarationOfKind,
     getEffectiveModifierFlags,
+    getEscapedTextOfIdentifierOrLiteral,
     getLocalSymbolForExportDefault,
     getMeaningFromDeclaration,
     getMeaningFromLocation,
@@ -149,6 +150,7 @@ import {
     isJsxClosingElement,
     isJsxElement,
     isJsxFragment,
+    isJsxNamespacedName,
     isJsxOpeningElement,
     isJsxSelfClosingElement,
     isJumpStatementTarget,
@@ -202,6 +204,7 @@ import {
     isVoidExpression,
     isWriteAccess,
     JSDocPropertyLikeTag,
+    JsxNamespacedName,
     length,
     map,
     mapDefined,
@@ -325,7 +328,7 @@ export interface SpanEntry {
 function nodeEntry(node: Node, kind: NodeEntryKind = EntryKind.Node): NodeEntry {
     return {
         kind,
-        node: (node as NamedDeclaration).name || node,
+        node: isJsxNamespacedName(node) ? node : ((node as NamedDeclaration).name || node),
         context: getContextNodeForNodeEntry(node),
     };
 }
@@ -1052,11 +1055,14 @@ export namespace Core {
     }
 
     export function getAdjustedNode(node: Node, options: Options): Node {
+        if (isIdentifier(node) && isJsxNamespacedName(node.parent)) {
+            node = node.parent;
+        }
         if (options.use === FindReferencesUse.References) {
-            node = getAdjustedReferenceLocation(node);
+            return getAdjustedReferenceLocation(node);
         }
-        else if (options.use === FindReferencesUse.Rename) {
-            node = getAdjustedRenameLocation(node);
+        if (options.use === FindReferencesUse.Rename) {
+            return getAdjustedRenameLocation(node);
         }
         return node;
     }
@@ -1835,6 +1841,8 @@ export namespace Core {
                 // falls through I guess
             case SyntaxKind.Identifier:
                 return (node as PrivateIdentifier | Identifier).text.length === searchSymbolName.length;
+            case SyntaxKind.JsxNamespacedName:
+                return (getEscapedTextOfIdentifierOrLiteral(node as JsxNamespacedName) as string).length === searchSymbolName.length;
             case SyntaxKind.NoSubstitutionTemplateLiteral:
             case SyntaxKind.StringLiteral: {
                 const str = node as StringLiteralLike;

src/services/rename.ts

@@ -235,6 +235,7 @@ export function nodeIsEligibleForRename(node: Node): boolean {
         case SyntaxKind.StringLiteral:
         case SyntaxKind.NoSubstitutionTemplateLiteral:
         case SyntaxKind.ThisKeyword:
+        case SyntaxKind.JsxNamespacedName:
             return true;
         case SyntaxKind.NumericLiteral:
             return isLiteralNameOfPropertyDeclarationOrIndexAccess(node as NumericLiteral);

src/services/services.ts

@@ -3497,7 +3497,7 @@ export function getNameTable(sourceFile: SourceFile): Map<__String, number> {
 function initializeNameTable(sourceFile: SourceFile): void {
     const nameTable = sourceFile.nameTable = new Map();
     sourceFile.forEachChild(function walk(node) {
-        if (isIdentifier(node) && !isTagName(node) && node.escapedText || isStringOrNumericLiteralLike(node) && literalIsName(node)) {
+        if (isIdentifier(node) && !isTagName(node) && node.escapedText || isStringOrNumericLiteralLike(node) && literalIsName(node) || isJsxNamespacedName(node)) {
             const text = getEscapedTextOfIdentifierOrLiteral(node);
             nameTable.set(text, nameTable.get(text) === undefined ? node.pos : -1);
         }

src/services/utilities.ts

@@ -203,6 +203,7 @@ import {
     isJSDocTypeAlias,
     isJsxElement,
     isJsxExpression,
+    isJsxNamespacedName,
     isJsxOpeningLikeElement,
     isJsxText,
     isKeyword,
@@ -1322,6 +1323,9 @@ function getAdjustedLocationForHeritageClause(node: HeritageClause) {
 }
 
 function getAdjustedLocation(node: Node, forRename: boolean): Node {
+    if (isIdentifier(node) && isJsxNamespacedName(node.parent)) {
+        node = node.parent;
+    }
     const { parent } = node;
     // /**/<modifier> [|name|] ...
     // /**/<modifier> <class|interface|type|enum|module|namespace|function|get|set> [|name|] ...
@@ -1547,7 +1551,8 @@ export function getAdjustedRenameLocation(node: Node): Node {
  * @internal
  */
 export function getTouchingPropertyName(sourceFile: SourceFile, position: number): Node {
-    return getTouchingToken(sourceFile, position, n => isPropertyNameLiteral(n) || isKeyword(n.kind) || isPrivateIdentifier(n));
+    const token = getTouchingToken(sourceFile, position, n => isPropertyNameLiteral(n) || isKeyword(n.kind) || isPrivateIdentifier(n));
+    return isIdentifier(token) && isJsxNamespacedName(token.parent) ? token.parent : token;
 }
 
 /**

tests/baselines/reference/findAllReferencesOnJsxNamespacedName1.baseline.jsonc

@@ -0,0 +1,204 @@
+// === findAllReferences ===
+// === /types.d.ts ===
+// declare namespace JSX {
+//   interface IntrinsicElements {
+//     'my-el': {
+//       <|'[|{| isWriteAccess: true |}prop:foo|]': string;|>
+//     };
+//   }
+// }
+
+// === /a.tsx ===
+// <my-el /*FIND ALL REFS*/<|[|prop:foo|]="bar"|> />
+
+  // === Definitions ===
+  // === /types.d.ts ===
+  // declare namespace JSX {
+  //   interface IntrinsicElements {
+  //     'my-el': {
+  //       <|'[|prop:foo|]': string;|>
+  //     };
+  //   }
+  // }
+
+  // === Details ===
+  [
+   {
+    "containerKind": "",
+    "containerName": "",
+    "kind": "property",
+    "name": "(property) 'prop:foo': string",
+    "displayParts": [
+     {
+      "text": "(",
+      "kind": "punctuation"
+     },
+     {
+      "text": "property",
+      "kind": "text"
+     },
+     {
+      "text": ")",
+      "kind": "punctuation"
+     },
+     {
+      "text": " ",
+      "kind": "space"
+     },
+     {
+      "text": "'prop:foo'",
+      "kind": "propertyName"
+     },
+     {
+      "text": ":",
+      "kind": "punctuation"
+     },
+     {
+      "text": " ",
+      "kind": "space"
+     },
+     {
+      "text": "string",
+      "kind": "keyword"
+     }
+    ]
+   }
+  ]
+
+
+
+// === findAllReferences ===
+// === /types.d.ts ===
+// declare namespace JSX {
+//   interface IntrinsicElements {
+//     'my-el': {
+//       <|'[|{| isWriteAccess: true |}prop:foo|]': string;|>
+//     };
+//   }
+// }
+
+// === /a.tsx ===
+// <my-el <|[|prop:/*FIND ALL REFS*/foo|]="bar"|> />
+
+  // === Definitions ===
+  // === /types.d.ts ===
+  // declare namespace JSX {
+  //   interface IntrinsicElements {
+  //     'my-el': {
+  //       <|'[|prop:foo|]': string;|>
+  //     };
+  //   }
+  // }
+
+  // === Details ===
+  [
+   {
+    "containerKind": "",
+    "containerName": "",
+    "kind": "property",
+    "name": "(property) 'prop:foo': string",
+    "displayParts": [
+     {
+      "text": "(",
+      "kind": "punctuation"
+     },
+     {
+      "text": "property",
+      "kind": "text"
+     },
+     {
+      "text": ")",
+      "kind": "punctuation"
+     },
+     {
+      "text": " ",
+      "kind": "space"
+     },
+     {
+      "text": "'prop:foo'",
+      "kind": "propertyName"
+     },
+     {
+      "text": ":",
+      "kind": "punctuation"
+     },
+     {
+      "text": " ",
+      "kind": "space"
+     },
+     {
+      "text": "string",
+      "kind": "keyword"
+     }
+    ]
+   }
+  ]
+
+
+
+// === findAllReferences ===
+// === /types.d.ts ===
+// declare namespace JSX {
+//   interface IntrinsicElements {
+//     'my-el': {
+//       <|'/*FIND ALL REFS*/[|{| isWriteAccess: true, isDefinition: true |}prop:foo|]': string;|>
+//     };
+//   }
+// }
+
+// === /a.tsx ===
+// <my-el <|[|prop:foo|]="bar"|> />
+
+  // === Definitions ===
+  // === /types.d.ts ===
+  // declare namespace JSX {
+  //   interface IntrinsicElements {
+  //     'my-el': {
+  //       <|'/*FIND ALL REFS*/[|prop:foo|]': string;|>
+  //     };
+  //   }
+  // }
+
+  // === Details ===
+  [
+   {
+    "containerKind": "",
+    "containerName": "",
+    "kind": "property",
+    "name": "(property) 'prop:foo': string",
+    "displayParts": [
+     {
+      "text": "(",
+      "kind": "punctuation"
+     },
+     {
+      "text": "property",
+      "kind": "text"
+     },
+     {
+      "text": ")",
+      "kind": "punctuation"
+     },
+     {
+      "text": " ",
+      "kind": "space"
+     },
+     {
+      "text": "'prop:foo'",
+      "kind": "propertyName"
+     },
+     {
+      "text": ":",
+      "kind": "punctuation"
+     },
+     {
+      "text": " ",
+      "kind": "space"
+     },
+     {
+      "text": "string",
+      "kind": "keyword"
+     }
+    ]
+   }
+  ]

tests/baselines/reference/renameOnJsxNamespacedName1.baseline.jsonc

@@ -0,0 +1,42 @@
+// === findRenameLocations ===
+// === /types.d.ts ===
+// declare namespace JSX {
+//   interface IntrinsicElements {
+//     'my-el': {
+//       <|'[|prop:fooRENAME|]': string;|>
+//     };
+//   }
+// }
+
+// === /a.tsx ===
+// <my-el /*RENAME*/<|[|prop:fooRENAME|]="bar"|> />
+
+
+
+// === findRenameLocations ===
+// === /types.d.ts ===
+// declare namespace JSX {
+//   interface IntrinsicElements {
+//     'my-el': {
+//       <|'[|prop:fooRENAME|]': string;|>
+//     };
+//   }
+// }
+
+// === /a.tsx ===
+// <my-el <|[|prop:/*RENAME*/fooRENAME|]="bar"|> />
+
+
+
+// === findRenameLocations ===
+// === /types.d.ts ===
+// declare namespace JSX {
+//   interface IntrinsicElements {
+//     'my-el': {
+//       <|'[|prop:fooRENAME|]/*RENAME*/': string;|>
+//     };
+//   }
+// }
+
+// === /a.tsx ===
+// <my-el <|[|prop:fooRENAME|]="bar"|> />

tests/cases/fourslash/findAllReferencesOnJsxNamespacedName1.ts

@@ -0,0 +1,19 @@
+/// <reference path="fourslash.ts" />
+
+// @jsx: react
+
+// https://github.com/microsoft/TypeScript/issues/61820
+
+// @Filename: /types.d.ts
+//// declare namespace JSX {
+////   interface IntrinsicElements {
+////     'my-el': {
+////       '/*3*/prop:foo': string;
+////     };
+////   }
+//// }
+
+// @filename: /a.tsx
+//// <my-el /*1*/prop:/*2*/foo="bar" />
+
+verify.baselineFindAllReferences("1", "2", "3");

tests/cases/fourslash/renameOnJsxNamespacedName1.ts

@@ -0,0 +1,21 @@
+/// <reference path="fourslash.ts" />
+
+// @jsx: react
+
+// https://github.com/microsoft/TypeScript/issues/61820
+
+// @Filename: /types.d.ts
+//// declare namespace JSX {
+////   interface IntrinsicElements {
+////     'my-el': {
+////       'prop:foo/*3*/': string;
+////     };
+////   }
+//// }
+
+// @filename: /a.tsx
+//// <my-el /*1*/prop:/*2*/foo="bar" />
+
+verify.baselineRename("1");
+verify.baselineRename("2");
+verify.baselineRename("3");