fixes #2174 : [js] Salsa - JS ReactNative - use the TypeScriptReact grammar for JS

extensions/javascript/OSSREADME.json

@@ -5,7 +5,7 @@
 	"version": "0.0.1",
 	"license": "Apache2",
 	"repositoryURL": "https://github.com/Microsoft/TypeScript-TmLanguage",
-	"description": "The files syntaxes/JavaScriptReact.tmLanguage & syntaxes/JavaScript.tmLanguage were derived from TypeScript-TmLanguage https://github.com/Microsoft/TypeScript-TmLanguage.",
+	"description": "The file syntaxes/JavaScript.tmLanguage was derived from TypeScriptReact.tmLanguage in https://github.com/Microsoft/TypeScript-TmLanguage.",
 	"licenseDetail": [
 		// Reason: LICENSE file does not include Copyright statement
 		"Copyright (c) Microsoft Corporation.  All rights reserved.",

extensions/javascript/package.json

@@ -41,8 +41,8 @@
 		"grammars": [
 			{
 				"language": "javascriptreact",
-				"scopeName": "source.jsx",
-				"path": "./syntaxes/JavaScriptReact.tmLanguage"
+				"scopeName": "source.js",
+				"path": "./syntaxes/JavaScript.tmLanguage"
 			},
 			{
 				"language": "javascript",
@@ -50,7 +50,6 @@
 				"path": "./syntaxes/JavaScript.tmLanguage"
 			},
 			{
-				// referenced by other grammars
 				"scopeName": "source.js.regexp",
 				"path": "./syntaxes/Regular Expressions (JavaScript).tmLanguage"
 			}

extensions/javascript/syntaxes/Readme.md

@@ -1,12 +1,6 @@
-The JavaScriptReact.tmLanguage bundle is derived from the TypeScriptReact.tmLanguage.
+The JavaScript.tmLanguage bundle is derived from the TypeScriptReact.tmLanguage.
 
 Changes:
-- fileTypes -> .jsx
-- scopeName -> scope.jsx
-
-The JavaScript-ts.tmLanguage bundle is derived from the TypeScriptReact.tmLanguage.
-
-Changes:
-- all occurences of .ts -> .js
-- fileTypes -> .js
-- scopeName -> scope.js
+- fileTypes .tsx -> .js
+- scopeName scopr.tsx -> scope.js
+- update language name and file types

extensions/theme-colorful-defaults/themes/dark_plus.tmTheme

@@ -24,8 +24,7 @@
 			<string>meta.parameter.type, name.class, storage.type, meta.return.type, meta.object.type, return-type, meta.cast,
 				new.storage.type.ts, cast.storage.type.ts, heritage.storage.type.ts, annotation.storage.type.ts, var.annotation.type.ts, field.storage.type.ts,
 				new.storage.type.js, cast.storage.type.js, heritage.storage.type.js, annotation.storage.type.js, var.annotation.type.js, field.storage.type.js,
-				new.storage.type.tsx, cast.storage.type.tsx, heritage.storage.type.tsx, annotation.storage.type.tsx, var.annotation.type.tsx, field.storage.type.tsx,
-				new.storage.type.jsx, cast.storage.type.jsx, heritage.storage.type.jsx, annotation.storage.type.jsx, var.annotation.type.jsx, field.storage.type.jsx
+				new.storage.type.tsx, cast.storage.type.tsx, heritage.storage.type.tsx, annotation.storage.type.tsx, var.annotation.type.tsx, field.storage.type.tsx
 			</string>
 			<key>settings</key>
 			<dict>
@@ -37,7 +36,7 @@
 			<key>name</key>
 			<string>TS storage type workaround</string>
 			<key>scope</key>
-			<string>storage.type.ts, storage.type.js, storage.type.tsx, storage.type.jsx</string>
+			<string>storage.type.ts, storage.type.js, storage.type.tsx</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>

extensions/theme-colorful-defaults/themes/light_plus.tmTheme

@@ -24,9 +24,7 @@
 			<string>meta.parameter.type, name.class, storage.type, meta.return.type, meta.object.type, return-type, meta.cast,
 				new.storage.type.ts, cast.storage.type.ts, heritage.storage.type.ts, annotation.storage.type.ts, var.annotation.type.ts, field.storage.type.ts,
 				new.storage.type.js, cast.storage.type.js, heritage.storage.type.js, annotation.storage.type.js, var.annotation.type.js, field.storage.type.js,
-				new.storage.type.tsx, cast.storage.type.tsx, heritage.storage.type.tsx, annotation.storage.type.tsx, var.annotation.type.tsx, field.storage.type.tsx,
-				new.storage.type.jsx, cast.storage.type.jsx, heritage.storage.type.jsx, annotation.storage.type.jsx, var.annotation.type.jsx, field.storage.type.jsx
-			</string>
+				new.storage.type.tsx, cast.storage.type.tsx, heritage.storage.type.tsx, annotation.storage.type.tsx, var.annotation.type.tsx, field.storage.type.tsx			</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
@@ -37,7 +35,7 @@
 			<key>name</key>
 			<string>TS storage type workaround</string>
 			<key>scope</key>
-			<string>storage.type.ts, storage.type.js, storage.type.tsx, storage.type.jsx</string>
+			<string>storage.type.ts, storage.type.js, storage.type.tsx</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>