Skip to content

Commit

Permalink
Update LKG.
Browse files Browse the repository at this point in the history
  • Loading branch information
@DanielRosenwasser
DanielRosenwasser committed Oct 11, 2018
1 parent 86d53d2 commit 45387b8
Show file tree
Hide file tree
Showing 10 changed files with 215 additions and 177 deletions.
16 changes: 10 additions & 6 deletions lib/protocol.d.ts
View file
Expand Up @@ -827,20 +827,17 @@ declare namespace ts.server.protocol {
/**
* Information about the item to be renamed.
*/
interface RenameInfo {
type RenameInfo = RenameInfoSuccess | RenameInfoFailure;
interface RenameInfoSuccess {
/**
* True if item can be renamed.
*/
canRename: boolean;
canRename: true;
/**
* File or directory to rename.
* If set, `getEditsForFileRename` should be called instead of `findRenameLocations`.
*/
fileToRename?: string;
/**
* Error message if item can not be renamed.
*/
localizedErrorMessage?: string;
/**
* Display name of the item to be renamed.
*/
Expand All @@ -860,6 +857,13 @@ declare namespace ts.server.protocol {
/** Span of text to rename. */
triggerSpan: TextSpan;
}
interface RenameInfoFailure {
canRename: false;
/**
* Error message if item can not be renamed.
*/
localizedErrorMessage: string;
}
/**
* A group of text spans, all in 'file'.
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/tsc.js
View file
Expand Up @@ -60,7 +60,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
var ts;
(function (ts) {
ts.versionMajorMinor = "3.1";
ts.version = ts.versionMajorMinor + ".2";
ts.version = ts.versionMajorMinor + ".3";
})(ts || (ts = {}));
(function (ts) {
ts.emptyArray = [];
Expand Down
87 changes: 47 additions & 40 deletions lib/tsserver.js
View file

Large diffs are not rendered by default.

26 changes: 17 additions & 9 deletions lib/tsserverlibrary.d.ts
View file
Expand Up @@ -5111,20 +5111,24 @@ declare namespace ts {
documentation?: SymbolDisplayPart[];
tags?: JSDocTagInfo[];
}
interface RenameInfo {
canRename: boolean;
type RenameInfo = RenameInfoSuccess | RenameInfoFailure;
interface RenameInfoSuccess {
canRename: true;
/**
* File or directory to rename.
* If set, `getEditsForFileRename` should be called instead of `findRenameLocations`.
*/
fileToRename?: string;
localizedErrorMessage?: string;
displayName: string;
fullDisplayName: string;
kind: ScriptElementKind;
kindModifiers: string;
triggerSpan: TextSpan;
}
interface RenameInfoFailure {
canRename: false;
localizedErrorMessage: string;
}
interface SignatureHelpParameter {
name: string;
documentation: SymbolDisplayPart[];
Expand Down Expand Up @@ -6434,20 +6438,17 @@ declare namespace ts.server.protocol {
/**
* Information about the item to be renamed.
*/
interface RenameInfo {
type RenameInfo = RenameInfoSuccess | RenameInfoFailure;
interface RenameInfoSuccess {
/**
* True if item can be renamed.
*/
canRename: boolean;
canRename: true;
/**
* File or directory to rename.
* If set, `getEditsForFileRename` should be called instead of `findRenameLocations`.
*/
fileToRename?: string;
/**
* Error message if item can not be renamed.
*/
localizedErrorMessage?: string;
/**
* Display name of the item to be renamed.
*/
Expand All @@ -6467,6 +6468,13 @@ declare namespace ts.server.protocol {
/** Span of text to rename. */
triggerSpan: TextSpan;
}
interface RenameInfoFailure {
canRename: false;
/**
* Error message if item can not be renamed.
*/
localizedErrorMessage: string;
}
/**
* A group of text spans, all in 'file'.
*/
Expand Down
87 changes: 47 additions & 40 deletions lib/tsserverlibrary.js
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions lib/typescript.d.ts
View file
Expand Up @@ -5111,20 +5111,24 @@ declare namespace ts {
documentation?: SymbolDisplayPart[];
tags?: JSDocTagInfo[];
}
interface RenameInfo {
canRename: boolean;
type RenameInfo = RenameInfoSuccess | RenameInfoFailure;
interface RenameInfoSuccess {
canRename: true;
/**
* File or directory to rename.
* If set, `getEditsForFileRename` should be called instead of `findRenameLocations`.
*/
fileToRename?: string;
localizedErrorMessage?: string;
displayName: string;
fullDisplayName: string;
kind: ScriptElementKind;
kindModifiers: string;
triggerSpan: TextSpan;
}
interface RenameInfoFailure {
canRename: false;
localizedErrorMessage: string;
}
interface SignatureHelpParameter {
name: string;
documentation: SymbolDisplayPart[];
Expand Down
76 changes: 39 additions & 37 deletions lib/typescript.js
View file
Expand Up @@ -75,7 +75,7 @@ var ts;
// If changing the text in this section, be sure to test `configureNightly` too.
ts.versionMajorMinor = "3.1";
/** The version of the TypeScript compiler release */
ts.version = ts.versionMajorMinor + ".2";
ts.version = ts.versionMajorMinor + ".3";
})(ts || (ts = {}));
(function (ts) {
/* @internal */
Expand Down Expand Up @@ -94984,7 +94984,7 @@ var ts;
if (resolvedModuleSymbol !== moduleSymbol &&
// Don't add another completion for `export =` of a symbol that's already global.
// So in `declare namespace foo {} declare module "foo" { export = foo; }`, there will just be the global completion for `foo`.
resolvedModuleSymbol.declarations.some(function (d) { return !!d.getSourceFile().externalModuleIndicator; })) {
ts.some(resolvedModuleSymbol.declarations, function (d) { return !!d.getSourceFile().externalModuleIndicator; })) {
symbols.push(resolvedModuleSymbol);
symbolToOriginInfoMap[ts.getSymbolId(resolvedModuleSymbol)] = { kind: 3 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: false };
}
Expand Down Expand Up @@ -101398,7 +101398,6 @@ var ts;
fileToRename: name,
kind: kind,
displayName: name,
localizedErrorMessage: undefined,
fullDisplayName: name,
kindModifiers: "" /* none */,
triggerSpan: triggerSpan,
Expand All @@ -101410,23 +101409,13 @@ var ts;
fileToRename: undefined,
kind: kind,
displayName: displayName,
localizedErrorMessage: undefined,
fullDisplayName: fullDisplayName,
kindModifiers: kindModifiers,
triggerSpan: createTriggerSpanForNode(node, sourceFile)
};
}
function getRenameInfoError(diagnostic) {
// TODO: GH#18217
return {
canRename: false,
localizedErrorMessage: ts.getLocaleSpecificMessage(diagnostic),
displayName: undefined,
fullDisplayName: undefined,
kind: undefined,
kindModifiers: undefined,
triggerSpan: undefined
};
return { canRename: false, localizedErrorMessage: ts.getLocaleSpecificMessage(diagnostic) };
}
function createTriggerSpanForNode(node, sourceFile) {
var start = node.getStart(sourceFile);
Expand Down Expand Up @@ -105838,6 +105827,14 @@ var ts;
var pos = before.getStart(sourceFile);
this.replaceRange(sourceFile, { pos: pos, end: pos }, ts.createToken(modifier), { suffix: " " });
};
ChangeTracker.prototype.insertLastModifierBefore = function (sourceFile, modifier, before) {
if (!before.modifiers) {
this.insertModifierBefore(sourceFile, modifier, before);
return;
}
var pos = before.modifiers.end;
this.replaceRange(sourceFile, { pos: pos, end: pos }, ts.createToken(modifier), { prefix: " " });
};
ChangeTracker.prototype.insertCommentBeforeLine = function (sourceFile, lineNumber, position, commentText) {
var lineStartPosition = ts.getStartPositionOfLine(lineNumber, sourceFile);
var startPosition = ts.getFirstNonSpaceCharacterPosition(sourceFile.text, lineStartPosition);
Expand Down Expand Up @@ -107170,7 +107167,7 @@ var ts;
return;
}
// add the async keyword
changes.insertModifierBefore(sourceFile, 120 /* AsyncKeyword */, functionToConvert);
changes.insertLastModifierBefore(sourceFile, 120 /* AsyncKeyword */, functionToConvert);
function startTransformation(node, nodeToReplace) {
var newNodes = transformExpression(node, transformer, node);
changes.replaceNodeWithNodes(sourceFile, nodeToReplace, newNodes);
Expand Down Expand Up @@ -107330,7 +107327,7 @@ var ts;
}
}
function getNewNameIfConflict(name, originalNames) {
var numVarsSameName = (originalNames.get(name.text) || []).length;
var numVarsSameName = (originalNames.get(name.text) || ts.emptyArray).length;
var numberOfAssignmentsOriginal = 0;
var identifier = numVarsSameName === 0 ? name : ts.createIdentifier(name.text + "_" + numVarsSameName);
return { identifier: identifier, types: [], numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
Expand All @@ -107339,7 +107336,7 @@ var ts;
// should be kept up to date with isFixablePromiseHandler in suggestionDiagnostics.ts
function transformExpression(node, transformer, outermostParent, prevArgName) {
if (!node) {
return [];
return ts.emptyArray;
}
var originalType = ts.isIdentifier(node) && transformer.originalTypeMap.get(ts.getNodeId(node).toString());
var nodeType = originalType || transformer.checker.getTypeAtLocation(node);
Expand All @@ -107356,7 +107353,7 @@ var ts;
return transformPromiseCall(node, transformer, prevArgName);
}
codeActionSucceeded = false;
return [];
return ts.emptyArray;
}
function transformCatch(node, transformer, prevArgName) {
var func = node.arguments[0];
Expand Down Expand Up @@ -107439,13 +107436,13 @@ var ts;
function createTransformedStatement(prevArgName, rightHandSide, transformer) {
if (!prevArgName || prevArgName.identifier.text.length === 0) {
// if there's no argName to assign to, there still might be side effects
return ts.createNodeArray([ts.createStatement(rightHandSide)]);
return [ts.createStatement(rightHandSide)];
}
if (prevArgName.types.length < prevArgName.numberOfAssignmentsOriginal) {
// if the variable has already been declared, we don't need "let" or "const"
return ts.createNodeArray([ts.createStatement(ts.createAssignment(ts.getSynthesizedDeepClone(prevArgName.identifier), rightHandSide))]);
return [ts.createStatement(ts.createAssignment(ts.getSynthesizedDeepClone(prevArgName.identifier), rightHandSide))];
}
return ts.createNodeArray([ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.identifier), /*type*/ undefined, rightHandSide)], getFlagOfIdentifier(prevArgName.identifier, transformer.constIdentifiers))))]);
return [ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.identifier), /*type*/ undefined, rightHandSide)], getFlagOfIdentifier(prevArgName.identifier, transformer.constIdentifiers))))];
}
// should be kept up to date with isFixablePromiseArgument in suggestionDiagnostics.ts
function getTransformationBody(func, prevArgName, argName, parent, transformer) {
Expand All @@ -107459,9 +107456,9 @@ var ts;
// undefined was argument passed to promise handler
break;
}
var synthCall = ts.createCall(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, argName ? [argName.identifier] : []);
var synthCall = ts.createCall(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, argName ? [argName.identifier] : ts.emptyArray);
if (shouldReturn) {
return ts.createNodeArray([ts.createReturn(synthCall)]);
return [ts.createReturn(synthCall)];
}
var type = transformer.originalTypeMap.get(ts.getNodeId(func).toString()) || transformer.checker.getTypeAtLocation(func);
var callSignatures = transformer.checker.getSignaturesOfType(type, 0 /* Call */);
Expand Down Expand Up @@ -107495,14 +107492,14 @@ var ts;
refactoredStmts.push(statement);
}
}
return shouldReturn ? ts.getSynthesizedDeepClones(ts.createNodeArray(refactoredStmts)) :
removeReturns(ts.createNodeArray(refactoredStmts), prevArgName.identifier, transformer, seenReturnStatement);
return shouldReturn ? refactoredStmts.map(function (s) { return ts.getSynthesizedDeepClone(s); }) :
removeReturns(refactoredStmts, prevArgName === undefined ? undefined : prevArgName.identifier, transformer, seenReturnStatement);
}
else {
var innerRetStmts = ts.getReturnStatementsWithPromiseHandlers(ts.createReturn(funcBody));
var innerCbBody = getInnerTransformationBody(transformer, innerRetStmts, prevArgName);
if (innerCbBody.length > 0) {
return ts.createNodeArray(innerCbBody);
return innerCbBody;
}
if (!shouldReturn) {
var type_6 = transformer.checker.getTypeAtLocation(func);
Expand All @@ -107516,7 +107513,7 @@ var ts;
return transformedStatement;
}
else {
return ts.createNodeArray([ts.createReturn(ts.getSynthesizedDeepClone(funcBody))]);
return [ts.createReturn(ts.getSynthesizedDeepClone(funcBody))];
}
}
}
Expand All @@ -107525,7 +107522,7 @@ var ts;
codeActionSucceeded = false;
break;
}
return ts.createNodeArray([]);
return ts.emptyArray;
}
function getLastCallSignature(type, checker) {
var callSignatures = checker.getSignaturesOfType(type, 0 /* Call */);
Expand All @@ -107538,18 +107535,23 @@ var ts;
if (ts.isReturnStatement(stmt)) {
if (stmt.expression) {
var possiblyAwaitedExpression = isPromiseReturningExpression(stmt.expression, transformer.checker) ? ts.createAwait(stmt.expression) : stmt.expression;
ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, possiblyAwaitedExpression)], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
if (prevArgName === undefined) {
ret.push(ts.createExpressionStatement(possiblyAwaitedExpression));
}
else {
ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, possiblyAwaitedExpression)], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
}
}
}
else {
ret.push(ts.getSynthesizedDeepClone(stmt));
}
}
// if block has no return statement, need to define prevArgName as undefined to prevent undeclared variables
if (!seenReturnStatement) {
if (!seenReturnStatement && prevArgName !== undefined) {
ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, ts.createIdentifier("undefined"))], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
}
return ts.createNodeArray(ret);
return ret;
}
function getInnerTransformationBody(transformer, innerRetStmts, prevArgName) {
var innerCbBody = [];
Expand Down Expand Up @@ -108290,19 +108292,19 @@ var ts;
}
var defaultInfo = getDefaultLikeExportInfo(moduleSymbol, checker, compilerOptions);
if (defaultInfo && defaultInfo.name === symbolName && ts.skipAlias(defaultInfo.symbol, checker) === exportedSymbol) {
result.push({ moduleSymbol: moduleSymbol, importKind: defaultInfo.kind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(defaultInfo.symbol) });
result.push({ moduleSymbol: moduleSymbol, importKind: defaultInfo.kind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(defaultInfo.symbol, checker) });
}
for (var _i = 0, _a = checker.getExportsOfModule(moduleSymbol); _i < _a.length; _i++) {
var exported = _a[_i];
if (exported.name === symbolName && ts.skipAlias(exported, checker) === exportedSymbol) {
result.push({ moduleSymbol: moduleSymbol, importKind: 0 /* Named */, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exported) });
result.push({ moduleSymbol: moduleSymbol, importKind: 0 /* Named */, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exported, checker) });
}
}
});
return result;
}
function isTypeOnlySymbol(s) {
return !(s.flags & 67220415 /* Value */);
function isTypeOnlySymbol(s, checker) {
return !(ts.skipAlias(s, checker).flags & 67220415 /* Value */);
}
function getFixForImport(exportInfos, symbolName, position, program, sourceFile, host, preferences) {
var checker = program.getTypeChecker();
Expand Down Expand Up @@ -108470,7 +108472,7 @@ var ts;
// Maps symbol id to info for modules providing that symbol (original export + re-exports).
var originalSymbolToExportInfos = ts.createMultiMap();
function addSymbol(moduleSymbol, exportedSymbol, importKind) {
originalSymbolToExportInfos.add(ts.getUniqueSymbolId(exportedSymbol, checker).toString(), { moduleSymbol: moduleSymbol, importKind: importKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exportedSymbol) });
originalSymbolToExportInfos.add(ts.getUniqueSymbolId(exportedSymbol, checker).toString(), { moduleSymbol: moduleSymbol, importKind: importKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exportedSymbol, checker) });
}
forEachExternalModuleToImportFrom(checker, sourceFile, program.getSourceFiles(), function (moduleSymbol) {
cancellationToken.throwIfCancellationRequested();
Expand All @@ -108492,7 +108494,7 @@ var ts;
return undefined;
var symbol = exported.symbol, kind = exported.kind;
var info = getDefaultExportInfoWorker(symbol, moduleSymbol, checker, compilerOptions);
return info && { symbol: symbol, symbolForMeaning: info.symbolForMeaning, name: info.name, kind: kind };
return info && __assign({ symbol: symbol, kind: kind }, info);
}
function getDefaultLikeExportWorker(moduleSymbol, checker) {
var defaultExport = checker.tryGetMemberInModuleExports("default" /* Default */, moduleSymbol);
Expand Down

0 comments on commit 45387b8

Please sign in to comment.