Skip to content

Commit e063bb0

Browse files
rbucktonrbuckton
committed
Merge branch 'transforms' into transforms-commentsPerf
2 parents 49f3bbf + 0f8341f commit e063bb0

19 files changed

Lines changed: 19 additions & 17 deletions

File tree

‎src/compiler/binder.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2789,6 +2789,7 @@ namespace ts {
27892789

27902790
case SyntaxKind.AnyKeyword:
27912791
case SyntaxKind.NumberKeyword:
2792+
case SyntaxKind.NeverKeyword:
27922793
case SyntaxKind.StringKeyword:
27932794
case SyntaxKind.BooleanKeyword:
27942795
case SyntaxKind.SymbolKeyword:

‎src/compiler/transformers/ts.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ namespace ts {
256256
case SyntaxKind.BooleanKeyword:
257257
case SyntaxKind.StringKeyword:
258258
case SyntaxKind.NumberKeyword:
259+
case SyntaxKind.NeverKeyword:
259260
case SyntaxKind.VoidKeyword:
260261
case SyntaxKind.SymbolKeyword:
261262
case SyntaxKind.ConstructorType:

‎src/harness/harness.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1464,7 +1464,7 @@ namespace Harness {
14641464
}
14651465

14661466
public getSourceMapRecord() {
1467-
if (this.sourceMapData.length > 0) {
1467+
if (this.sourceMapData && this.sourceMapData.length > 0) {
14681468
return Harness.SourceMapRecorder.getSourceMapRecord(this.sourceMapData, this.program, this.files);
14691469
}
14701470
}

‎tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)