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

Rename declarationRange to declarationRangeIndex

Browse Source
This commit is contained in:
Sheetal Nandi
2019-05-30 12:45:11 -07:00
parent 6a961b5bc5
commit 8948fe415f
10 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/harness/fourslash.ts
+6 -6
View File
@@ -955,7 +955,7 @@ namespace FourSlash {
const fullExpected = ts.map<FourSlashInterface.ReferenceGroup, ReferenceGroupJson>(parts, ({ definition, ranges }) => ({
definition: typeof definition === "string" ? definition : { ...definition, range: ts.createTextSpanFromRange(definition.range) },
references: ranges.map<ts.ReferenceEntry>(r => {
const { isWriteAccess = false, isDefinition = false, isInString, declarationRange } = (r.marker && r.marker.data || {}) as { isWriteAccess?: boolean, isDefinition?: boolean, isInString?: true, declarationRange?: number };
const { isWriteAccess = false, isDefinition = false, isInString, declarationRangeIndex } = (r.marker && r.marker.data || {}) as { isWriteAccess?: boolean, isDefinition?: boolean, isInString?: true, declarationRangeIndex?: number };
const result: ts.ReferenceEntry = {
fileName: r.fileName,
textSpan: ts.createTextSpanFromRange(r),
@@ -963,8 +963,8 @@ namespace FourSlash {
isDefinition,
...(isInString ? { isInString: true } : undefined),
};
if (declarationRange !== undefined) {
result.declarationSpan = ts.createTextSpanFromRange(this.getRanges()[declarationRange]);
if (declarationRangeIndex !== undefined) {
result.declarationSpan = ts.createTextSpanFromRange(this.getRanges()[declarationRangeIndex]);
}
return result;
}),
@@ -1194,9 +1194,9 @@ Actual: ${stringify(fullActual)}`);
assert.deepEqual(sort(references), sort(ranges.map(rangeOrOptions => {
const { range, ...prefixSuffixText } = "range" in rangeOrOptions ? rangeOrOptions : { range: rangeOrOptions };
const result: ts.RenameLocation = { fileName: range.fileName, textSpan: ts.createTextSpanFromRange(range), ...prefixSuffixText };
const { declarationRange } = (range.marker && range.marker.data || {}) as { declarationRange?: number; };
if (declarationRange !== undefined) {
result.declarationSpan = ts.createTextSpanFromRange(this.getRanges()[declarationRange]);
const { declarationRangeIndex } = (range.marker && range.marker.data || {}) as { declarationRangeIndex?: number; };
if (declarationRangeIndex !== undefined) {
result.declarationSpan = ts.createTextSpanFromRange(this.getRanges()[declarationRangeIndex]);
}
return result;
})));