Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle module specifiers

Browse Source
This commit is contained in:
Sheetal Nandi
2019-06-06 12:51:26 -07:00
parent a120c59015
commit a67b375d0e
15 changed files with 62 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/findAllReferences.ts
+23 -10
View File
@@ -51,16 +51,6 @@ namespace ts.FindAllReferences {
if (!node.parent) return undefined;
if (!isDeclaration(node.parent) && !isExportAssignment(node.parent)) {
// Jsx Tags
if (isJsxOpeningElement(node.parent) || isJsxClosingElement(node.parent)) {
return node.parent.parent;
}
else if (isJsxSelfClosingElement(node.parent) ||
isLabeledStatement(node.parent) ||
isBreakOrContinueStatement(node.parent)) {
return node.parent;
}
// Special property assignment in javascript
if (isInJSFile(node)) {
const binaryExpression = isBinaryExpression(node.parent) ?
@@ -75,6 +65,29 @@ namespace ts.FindAllReferences {
}
}
// Jsx Tags
if (isJsxOpeningElement(node.parent) || isJsxClosingElement(node.parent)) {
return node.parent.parent;
}
else if (isJsxSelfClosingElement(node.parent) ||
isLabeledStatement(node.parent) ||
isBreakOrContinueStatement(node.parent)) {
return node.parent;
}
else if (isStringLiteralLike(node)) {
const validImport = tryGetImportFromModuleSpecifier(node);
if (validImport) {
const declOrStatement = findAncestor(validImport, node =>
isDeclaration(node) ||
isStatement(node) ||
isJSDocTag(node)
)! as NamedDeclaration | Statement | JSDocTag;
return isDeclaration(declOrStatement) ?
getDeclarationForDeclarationSpan(declOrStatement) :
declOrStatement;
}
}
// Handle computed property name
const propertyName = findAncestor(node, isComputedPropertyName);
return propertyName ?
src/testRunner/unittests/tsserver/rename.ts
+6 -3
View File
@@ -19,7 +19,8 @@ namespace ts.projectSystem {
locs: [
protocolRenameSpanFromSubstring({
fileText: bTs.content,
text: "./a"
text: "./a",
declarationText: bTs.content
})
]
}],
@@ -43,7 +44,8 @@ namespace ts.projectSystem {
locs: [
protocolRenameSpanFromSubstring({
fileText: bTs.content,
text: "./a"
text: "./a",
declarationText: bTs.content
})
]
}],
@@ -68,7 +70,8 @@ namespace ts.projectSystem {
locs: [
protocolRenameSpanFromSubstring({
fileText: bTs.content,
text: "./a"
text: "./a",
declarationText: bTs.content
})
]
}],