microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 08:11:30 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fix crash in emitTokenWithComment (#36542)

Browse Source
This commit is contained in:
Ron Buckton 2020-01-31 10:41:09 -08:00 committed by GitHub
parent 80ad0de87e
commit 24d8f795b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/emitter.ts
View File

@ -2744,11 +2744,11 @@ namespace ts {
const node = getParseTreeNode(contextNode);
const isSimilarNode = node && node.kind === contextNode.kind;
const startPos = pos;
if (isSimilarNode) {
pos = skipTrivia(currentSourceFile!.text, pos);
if (isSimilarNode && currentSourceFile) {
pos = skipTrivia(currentSourceFile.text, pos);
}
if (emitLeadingCommentsOfPosition && isSimilarNode && contextNode.pos !== startPos) {
const needsIndent = indentLeading && !positionsAreOnSameLine(startPos, pos, currentSourceFile!);
const needsIndent = indentLeading && currentSourceFile && !positionsAreOnSameLine(startPos, pos, currentSourceFile);
if (needsIndent) {
increaseIndent();
}

14
tests/baselines/reference/crashInEmitTokenWithComment.errors.txt Normal file
View File

@ -0,0 +1,14 @@
tests/cases/compiler/crashInEmitTokenWithComment.ts(5,4): error TS2345: Argument of type '({ [foo.bar]: c }: {}) => any' is not assignable to parameter of type 'string'.
tests/cases/compiler/crashInEmitTokenWithComment.ts(5,7): error TS2537: Type '{}' has no matching index signature for type 'string'.
==== tests/cases/compiler/crashInEmitTokenWithComment.ts (2 errors) ====
// GH#32358
const fn = (param: string) => undefined;
const foo = {bar: 'a'};
fn(({[foo.bar]: c}) => undefined);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS2345: Argument of type '({ [foo.bar]: c }: {}) => any' is not assignable to parameter of type 'string'.
~~~~~~~
!!! error TS2537: Type '{}' has no matching index signature for type 'string'.

15
tests/baselines/reference/crashInEmitTokenWithComment.js Normal file
View File

@ -0,0 +1,15 @@
//// [crashInEmitTokenWithComment.ts]
// GH#32358
const fn = (param: string) => undefined;
const foo = {bar: 'a'};
fn(({[foo.bar]: c}) => undefined);
//// [crashInEmitTokenWithComment.js]
// GH#32358
var fn = function (param) { return undefined; };
var foo = { bar: 'a' };
fn(function (_a) {
var _b = foo.bar, c = _a[_b];
return undefined;
});

7
tests/cases/compiler/crashInEmitTokenWithComment.ts Normal file
View File

@ -0,0 +1,7 @@
// @noTypesAndSymbols: true
// GH#32358
const fn = (param: string) => undefined;
const foo = {bar: 'a'};
fn(({[foo.bar]: c}) => undefined);