From 7dcdb827b6c8fba4f2cef111a2574c9db0729b68 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Mon, 29 Feb 2016 19:21:20 -0800 Subject: [PATCH 1/3] Add JavaScriptFile to ContextFlags (cherry picked from commit 6253c9b5cd6a8fa5e08bf88ddabdf0283ccf7007) --- src/compiler/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/types.ts b/src/compiler/types.ts index c065478a20a..af5984847f7 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -411,7 +411,7 @@ namespace ts { EmitHelperFlags = HasClassExtends | HasDecorators | HasParamDecorators | HasAsyncFunctions, // Parsing context flags - ContextFlags = DisallowInContext | YieldContext | DecoratorContext | AwaitContext, + ContextFlags = DisallowInContext | YieldContext | DecoratorContext | AwaitContext | JavaScriptFile, // Exclude these flags when parsing a Type TypeExcludesFlags = YieldContext | AwaitContext, From 086fb0ee0a1ff7e65c9ded318dced54137d73a7c Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Mon, 29 Feb 2016 22:37:42 -0800 Subject: [PATCH 2/3] Fix failing JSDocParser tests (cherry picked from commit ae27b8984730879de63749023cc68d0e777f0fe6) --- tests/cases/unittests/jsDocParsing.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/cases/unittests/jsDocParsing.ts b/tests/cases/unittests/jsDocParsing.ts index 9988383b467..e2941f7fc19 100644 --- a/tests/cases/unittests/jsDocParsing.ts +++ b/tests/cases/unittests/jsDocParsing.ts @@ -11,6 +11,9 @@ module ts { assert.isTrue(typeAndDiagnostics && typeAndDiagnostics.diagnostics.length === 0); let result = Utils.sourceFileToJSON(typeAndDiagnostics.jsDocTypeExpression.type); + + // Remove the parserContextFlags from the comparison + result = result.replace(/\,\n\s+\"parserContextFlags\": \"JavaScriptFile\"/g, ""); assert.equal(result, expected); } @@ -998,7 +1001,10 @@ module ts { ? JSON.parse(Utils.sourceFileToJSON(v)) : v; }, 4); - + + // Remove the parserContextFlags from the comparison + result = result.replace(/\,\n\s+\"parserContextFlags\": \"JavaScriptFile\"/g, ""); + if (result !== expected) { // Turn on a human-readable diff if (typeof require !== 'undefined') { From cbd73369141f2ee1f45cb079ffa4497afc11d9d7 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Tue, 1 Mar 2016 10:36:37 -0800 Subject: [PATCH 3/3] Changed how parserContextFlags are handled in tests (cherry picked from commit b5da80202f41e6f293153a2df945063d584b022a) --- tests/cases/unittests/jsDocParsing.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/cases/unittests/jsDocParsing.ts b/tests/cases/unittests/jsDocParsing.ts index e2941f7fc19..9c68cea3297 100644 --- a/tests/cases/unittests/jsDocParsing.ts +++ b/tests/cases/unittests/jsDocParsing.ts @@ -12,8 +12,6 @@ module ts { let result = Utils.sourceFileToJSON(typeAndDiagnostics.jsDocTypeExpression.type); - // Remove the parserContextFlags from the comparison - result = result.replace(/\,\n\s+\"parserContextFlags\": \"JavaScriptFile\"/g, ""); assert.equal(result, expected); } @@ -1002,9 +1000,6 @@ module ts { : v; }, 4); - // Remove the parserContextFlags from the comparison - result = result.replace(/\,\n\s+\"parserContextFlags\": \"JavaScriptFile\"/g, ""); - if (result !== expected) { // Turn on a human-readable diff if (typeof require !== 'undefined') {