microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-12 01:48:33 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Code review comments

Browse Source
This commit is contained in:
Mohamed Hegazy
2016-04-29 17:04:53 -07:00
parent 423503c883
commit 0cd0e0b5ea
3 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/services/services.ts
View File

@@ -6167,10 +6167,10 @@ namespace ts {
const references: ReferenceEntry[] = [];
forEach(sourceFiles, sourceFile => {
const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, type.text , sourceFile.getStart(), sourceFile.getEnd());
for (const sourceFile of sourceFiles) {
const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, type.text, sourceFile.getStart(), sourceFile.getEnd());
getReferencesForStringLiteralInFile(sourceFile, type, possiblePositions, references);
});
}
return [{
definition: {
@@ -6185,7 +6185,7 @@ namespace ts {
}];
function getReferencesForStringLiteralInFile(sourceFile: SourceFile, searchType: Type, possiblePositions: number[], references: ReferenceEntry[]): void {
forEach(possiblePositions, position => {
for (const position of possiblePositions) {
cancellationToken.throwIfCancellationRequested();
const node = getTouchingWord(sourceFile, position);
@@ -6197,7 +6197,7 @@ namespace ts {
if (type === searchType) {
references.push(getReferenceEntryFromNode(node));
}
});
}
}
}
@@ -7767,7 +7767,7 @@ namespace ts {
localizedErrorMessage: undefined,
fullDisplayName: typeChecker.getFullyQualifiedName(symbol),
kindModifiers: getSymbolModifiers(symbol),
triggerSpan: createTriggerSpanForNode(node)
triggerSpan: createTriggerSpanForNode(node, sourceFile)
};
}
}
@@ -7787,7 +7787,7 @@ namespace ts {
localizedErrorMessage: undefined,
fullDisplayName: displayName,
kindModifiers: ScriptElementKindModifier.none,
triggerSpan: createTriggerSpanForNode(node)
triggerSpan: createTriggerSpanForNode(node, sourceFile)
};
}
}
@@ -7820,9 +7820,9 @@ namespace ts {
return false;
}
function createTriggerSpanForNode(node: Node) {
let start = node.getStart();
let width = node.getWidth();
function createTriggerSpanForNode(node: Node, sourceFile: SourceFile) {
let start = node.getStart(sourceFile);
let width = node.getWidth(sourceFile);
if (node.kind === SyntaxKind.StringLiteral) {
// Exclude the quotes
start += 1;

10
tests/cases/fourslash/getOccurrencesStringLiterals.ts Normal file
View File

@@ -0,0 +1,10 @@
/// <reference path='fourslash.ts' />
////var x = "[|string|]";
////function f(a = "[|initial value|]") { }
const ranges = test.ranges();
for (let r of ranges) {
goTo.position(r.start);
verify.occurrencesAtPositionCount(0);
}

11
tests/cases/fourslash/renameStingLiterals.ts Normal file
View File

@@ -0,0 +1,11 @@
/// <reference path='fourslash.ts' />
////var x = "/*1*/string";
////function f(a = "/*2*/initial value") { }
goTo.marker("1");
verify.renameInfoFailed();
goTo.marker("2");
verify.renameInfoFailed();