From 2653a8da461eb9c43e0f6fdb47c29c0a95b9741e Mon Sep 17 00:00:00 2001
From: Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com>
Date: Thu, 21 Jan 2016 12:27:11 -0800
Subject: [PATCH 1/3] Treat .js as JSX

---
 src/compiler/parser.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index e391408b419..16196e277dc 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -546,7 +546,7 @@ namespace ts {
 
         function getLanguageVariant(fileName: string) {
             // .tsx and .jsx files are treated as jsx language variant.
-            return fileExtensionIs(fileName, ".tsx") || fileExtensionIs(fileName, ".jsx") ?  LanguageVariant.JSX  : LanguageVariant.Standard;
+            return fileExtensionIs(fileName, ".tsx") || fileExtensionIs(fileName, ".jsx") || fileExtensionIs(fileName, '.js') ?  LanguageVariant.JSX  : LanguageVariant.Standard;
         }
 
         function initializeState(fileName: string, _sourceText: string, languageVersion: ScriptTarget, isJavaScriptFile: boolean, _syntaxCursor: IncrementalParser.SyntaxCursor) {

From bfd6ca04af5fb79815cf9c76a69fb1256a37183e Mon Sep 17 00:00:00 2001
From: Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com>
Date: Mon, 25 Jan 2016 13:25:22 -0800
Subject: [PATCH 2/3] baseline-accept

---
 .../jsFileCompilationTypeAssertions.errors.txt   |  9 ++++++---
 .../getJavaScriptSemanticDiagnostics20.ts        | 16 ----------------
 2 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts

diff --git a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt
index e73ee46fb89..662eea4d405 100644
--- a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt
@@ -1,9 +1,12 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
-tests/cases/compiler/a.js(1,10): error TS8016: 'type assertion expressions' can only be used in a .ts file.
+tests/cases/compiler/a.js(1,10): error TS17008: JSX element 'string' has no corresponding closing tag.
+tests/cases/compiler/a.js(1,27): error TS1005: '</' expected.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
-==== tests/cases/compiler/a.js (1 errors) ====
+==== tests/cases/compiler/a.js (2 errors) ====
     var v = <string>undefined;
              ~~~~~~
-!!! error TS8016: 'type assertion expressions' can only be used in a .ts file.
\ No newline at end of file
+!!! error TS17008: JSX element 'string' has no corresponding closing tag.
+                              
+!!! error TS1005: '</' expected.
\ No newline at end of file
diff --git a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts
deleted file mode 100644
index c34f860b5fe..00000000000
--- a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-// @allowJs: true
-// @Filename: a.js
-//// var v = <string>undefined;
-
-verify.getSyntacticDiagnostics(`[]`);
-verify.getSemanticDiagnostics(`[
-  {
-    "message": "'type assertion expressions' can only be used in a .ts file.",
-    "start": 9,
-    "length": 6,
-    "category": "error",
-    "code": 8016
-  }
-]`);
\ No newline at end of file

From c38021ffb8db7fdd081823d603cdf5af8da606e7 Mon Sep 17 00:00:00 2001
From: Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com>
Date: Mon, 25 Jan 2016 13:38:00 -0800
Subject: [PATCH 3/3] Lint

---
 src/compiler/parser.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 16196e277dc..09df49d748c 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -546,7 +546,7 @@ namespace ts {
 
         function getLanguageVariant(fileName: string) {
             // .tsx and .jsx files are treated as jsx language variant.
-            return fileExtensionIs(fileName, ".tsx") || fileExtensionIs(fileName, ".jsx") || fileExtensionIs(fileName, '.js') ?  LanguageVariant.JSX  : LanguageVariant.Standard;
+            return fileExtensionIs(fileName, ".tsx") || fileExtensionIs(fileName, ".jsx") || fileExtensionIs(fileName, ".js") ?  LanguageVariant.JSX  : LanguageVariant.Standard;
         }
 
         function initializeState(fileName: string, _sourceText: string, languageVersion: ScriptTarget, isJavaScriptFile: boolean, _syntaxCursor: IncrementalParser.SyntaxCursor) {