microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-28 09:22:42 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Revert to using spread instead of mutating value later

Browse Source
This commit is contained in:
Sheetal Nandi
2019-06-12 14:29:43 -07:00
parent a84ed93f72
commit da2aa9781e
8 changed files with 115 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/testRunner/unittests/tsserver/declarationFileMaps.ts
View File

@@ -7,12 +7,12 @@ namespace ts.projectSystem {
declarationOptions?: SpanFromSubstringOptions;
}
function documentSpanFromSubstring({ file, text, declarationText, options, declarationOptions }: DocumentSpanFromSubstring): DocumentSpan {
const result: DocumentSpan = { fileName: file.path, textSpan: textSpanFromSubstring(file.content, text, options) };
if (declarationText) {
const declarationSpan = documentSpanFromSubstring({ file, text: declarationText, options: declarationOptions });
result.declarationSpan = declarationSpan.textSpan;
}
return result;
const declarationSpan = declarationText !== undefined ? documentSpanFromSubstring({ file, text: declarationText, options: declarationOptions }) : undefined;
return {
fileName: file.path,
textSpan: textSpanFromSubstring(file.content, text, options),
...declarationSpan && { declarationSpan: declarationSpan.textSpan }
};
}
function renameLocation(input: DocumentSpanFromSubstring): RenameLocation {

32
src/testRunner/unittests/tsserver/helpers.ts
View File

@@ -523,13 +523,16 @@ namespace ts.projectSystem {
}
export function protocolDeclarationFileSpanFromSubstring({ declarationText, declarationOptions, ...rest }: DeclarationFileSpanFromSubString): protocol.DeclarationFileSpan {
const result = protocolFileSpanFromSubstring(rest);
if (!declarationText) return result;
const declarationSpan = protocolFileSpanFromSubstring({ file: rest.file, text: declarationText, options: declarationOptions });
return {
...result,
declarationStart: declarationSpan.start,
declarationEnd: declarationSpan.end
};
const declarationSpan = declarationText !== undefined ?
protocolFileSpanFromSubstring({ file: rest.file, text: declarationText, options: declarationOptions }) :
undefined;
return declarationSpan ?
{
...result,
declarationStart: declarationSpan.start,
declarationEnd: declarationSpan.end
} :
result;
}
export interface ProtocolDeclarationTextSpanFromString {
@@ -542,16 +545,15 @@ namespace ts.projectSystem {
export function protocolDeclarationTextSpanFromSubstring({ fileText, text, options, declarationText, declarationOptions }: ProtocolDeclarationTextSpanFromString): protocol.DeclarationTextSpan {
const span = textSpanFromSubstring(fileText, text, options);
const toLocation = protocolToLocation(fileText);
const result: protocol.DeclarationTextSpan = {
const declarationSpan = declarationText !== undefined ? textSpanFromSubstring(fileText, declarationText, declarationOptions) : undefined;
return {
start: toLocation(span.start),
end: toLocation(textSpanEnd(span))
end: toLocation(textSpanEnd(span)),
...declarationSpan && {
declarationStart: toLocation(declarationSpan.start),
declarationEnd: toLocation(textSpanEnd(declarationSpan))
}
};
if (declarationText) {
const span = textSpanFromSubstring(fileText, declarationText, declarationOptions);
result.declarationStart = toLocation(span.start);
result.declarationEnd = toLocation(textSpanEnd(span));
}
return result;
}
export interface ProtocolRenameSpanFromSubstring extends ProtocolDeclarationTextSpanFromString {