Merge pull request microsoft#6562 from RyanCavanaugh/jsIsJsx

RyanCavanaugh · RyanCavanaugh · commit 6febe3b503eb · 2016-01-25T16:15:52.000-08:00
Treat .js as JSX
diff --git 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) {
diff --git 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.
+!!! error TS17008: JSX element 'string' has no corresponding closing tag.
+                              
+!!! error TS1005: '</' expected.
diff --git a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts

Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,7 @@ namespace ts {`
`546`	`546`
`547`	`547`	`function getLanguageVariant(fileName: string) {`
`548`	`548`	`// .tsx and .jsx files are treated as jsx language variant.`
`549`		`- return fileExtensionIs(fileName, ".tsx") \|\| fileExtensionIs(fileName, ".jsx") ? LanguageVariant.JSX : LanguageVariant.Standard;`
	`549`	`+ return fileExtensionIs(fileName, ".tsx") \|\| fileExtensionIs(fileName, ".jsx") \|\| fileExtensionIs(fileName, ".js") ? LanguageVariant.JSX : LanguageVariant.Standard;`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`function initializeState(fileName: string, _sourceText: string, languageVersion: ScriptTarget, isJavaScriptFile: boolean, _syntaxCursor: IncrementalParser.SyntaxCursor) {`