Merge branch 'master' into optimizeParser

ahejlsberg · ahejlsberg · commit 0bda420a7356 · 2017-11-14T10:09:31.000-08:00
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -2434,10 +2434,8 @@ namespace ts {
     }
 
     export function isIntrinsicJsxName(name: __String | string) {
-        // An escaped identifier had a leading underscore prior to being escaped, which would return true
-        // The escape adds an extra underscore which does not change the result
-        const ch = (name as string).substr(0, 1);
-        return ch.toLowerCase() === ch;
+        const ch = (name as string).charCodeAt(0);
+        return (ch >= CharacterCodes.a && ch <= CharacterCodes.z) || (name as string).indexOf("-") > -1;
     }
 
     function get16BitUnicodeEscapeSequence(charCode: number): string {
diff --git a/tests/baselines/reference/doubleUnderscoreReactNamespace.js b/tests/baselines/reference/doubleUnderscoreReactNamespace.js
@@ -1,19 +1,16 @@
 //// [index.tsx]
 declare global {
-    namespace JSX {
-        interface IntrinsicElements {
-            __foot: any;
-        }
-    }
     function __make (params: object): any;
 }
 
+declare var __foot: any;
 
-const thing = <__foot></__foot>;
+const thing = <__foot />;
 
-export {}
+export {}
+
 
 //// [index.js]
 "use strict";
 exports.__esModule = true;
-var thing = __make("__foot", null);
+var thing = __make(__foot, null);
diff --git a/tests/baselines/reference/doubleUnderscoreReactNamespace.symbols b/tests/baselines/reference/doubleUnderscoreReactNamespace.symbols
@@ -2,25 +2,17 @@
 declare global {
 >global : Symbol(global, Decl(index.tsx, 0, 0))
 
-    namespace JSX {
->JSX : Symbol(JSX, Decl(index.tsx, 0, 16))
-
-        interface IntrinsicElements {
->IntrinsicElements : Symbol(IntrinsicElements, Decl(index.tsx, 1, 19))
-
-            __foot: any;
->__foot : Symbol(IntrinsicElements.__foot, Decl(index.tsx, 2, 37))
-        }
-    }
     function __make (params: object): any;
->__make : Symbol(__make, Decl(index.tsx, 5, 5))
->params : Symbol(params, Decl(index.tsx, 6, 21))
+>__make : Symbol(__make, Decl(index.tsx, 0, 16))
+>params : Symbol(params, Decl(index.tsx, 1, 21))
 }
 
+declare var __foot: any;
+>__foot : Symbol(__foot, Decl(index.tsx, 4, 11))
 
-const thing = <__foot></__foot>;
->thing : Symbol(thing, Decl(index.tsx, 10, 5))
->__foot : Symbol(JSX.IntrinsicElements.__foot, Decl(index.tsx, 2, 37))
->__foot : Symbol(JSX.IntrinsicElements.__foot, Decl(index.tsx, 2, 37))
+const thing = <__foot />;
+>thing : Symbol(thing, Decl(index.tsx, 6, 5))
+>__foot : Symbol(__foot, Decl(index.tsx, 4, 11))
 
 export {}
+
diff --git a/tests/baselines/reference/doubleUnderscoreReactNamespace.types b/tests/baselines/reference/doubleUnderscoreReactNamespace.types
@@ -2,26 +2,18 @@
 declare global {
 >global : typeof global
 
-    namespace JSX {
->JSX : any
-
-        interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
-            __foot: any;
->__foot : any
-        }
-    }
     function __make (params: object): any;
 >__make : (params: object) => any
 >params : object
 }
 
+declare var __foot: any;
+>__foot : any
 
-const thing = <__foot></__foot>;
+const thing = <__foot />;
 >thing : any
-><__foot></__foot> : any
->__foot : any
+><__foot /> : any
 >__foot : any
 
 export {}
+
diff --git a/tests/baselines/reference/jsxEsprimaFbTestSuite.symbols b/tests/baselines/reference/jsxEsprimaFbTestSuite.symbols
@@ -47,8 +47,8 @@ declare var props;
 />;
 
 <日本語></日本語>;
->日本語 : Symbol(unknown)
->日本語 : Symbol(unknown)
+>日本語 : Symbol(日本語, Decl(jsxEsprimaFbTestSuite.tsx, 1, 11))
+>日本語 : Symbol(日本語, Decl(jsxEsprimaFbTestSuite.tsx, 1, 11))
 
 <AbC_def
 >AbC_def : Symbol(AbC_def, Decl(jsxEsprimaFbTestSuite.tsx, 2, 11))
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.symbols b/tests/baselines/reference/jsxFactoryIdentifier.symbols
@@ -122,3 +122,4 @@ class A {
 		];
 	}
 }
+
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.types b/tests/baselines/reference/jsxFactoryIdentifier.types
@@ -137,3 +137,4 @@ class A {
 		];
 	}
 }
+
diff --git a/tests/baselines/reference/reactNamespaceJSXEmit.js b/tests/baselines/reference/reactNamespaceJSXEmit.js
@@ -2,13 +2,15 @@
 declare var myReactLib: any;
 declare var foo: any;
 declare var Bar: any;
+declare var _Bar: any;
 declare var x: any;
 
 <foo data/>;
 <Bar x={x} />;
 <x-component />;
 <Bar {...x} />;
 <Bar { ...x } y={2} />;
+<_Bar { ...x } />;
 
 
 //// [reactNamespaceJSXEmit.js]
@@ -25,3 +27,4 @@ myReactLib.createElement(Bar, { x: x });
 myReactLib.createElement("x-component", null);
 myReactLib.createElement(Bar, __assign({}, x));
 myReactLib.createElement(Bar, __assign({}, x, { y: 2 }));
+myReactLib.createElement(_Bar, __assign({}, x));
diff --git a/tests/baselines/reference/reactNamespaceJSXEmit.symbols b/tests/baselines/reference/reactNamespaceJSXEmit.symbols
@@ -8,27 +8,34 @@ declare var foo: any;
 declare var Bar: any;
 >Bar : Symbol(Bar, Decl(reactNamespaceJSXEmit.tsx, 2, 11))
 
+declare var _Bar: any;
+>_Bar : Symbol(_Bar, Decl(reactNamespaceJSXEmit.tsx, 3, 11))
+
 declare var x: any;
->x : Symbol(x, Decl(reactNamespaceJSXEmit.tsx, 3, 11))
+>x : Symbol(x, Decl(reactNamespaceJSXEmit.tsx, 4, 11))
 
 <foo data/>;
 >foo : Symbol(unknown)
->data : Symbol(data, Decl(reactNamespaceJSXEmit.tsx, 5, 4))
+>data : Symbol(data, Decl(reactNamespaceJSXEmit.tsx, 6, 4))
 
 <Bar x={x} />;
 >Bar : Symbol(Bar, Decl(reactNamespaceJSXEmit.tsx, 2, 11))
->x : Symbol(x, Decl(reactNamespaceJSXEmit.tsx, 6, 4))
->x : Symbol(x, Decl(reactNamespaceJSXEmit.tsx, 3, 11))
+>x : Symbol(x, Decl(reactNamespaceJSXEmit.tsx, 7, 4))
+>x : Symbol(x, Decl(reactNamespaceJSXEmit.tsx, 4, 11))
 
 <x-component />;
 >x-component : Symbol(unknown)
 
 <Bar {...x} />;
 >Bar : Symbol(Bar, Decl(reactNamespaceJSXEmit.tsx, 2, 11))
->x : Symbol(x, Decl(reactNamespaceJSXEmit.tsx, 3, 11))
+>x : Symbol(x, Decl(reactNamespaceJSXEmit.tsx, 4, 11))
 
 <Bar { ...x } y={2} />;
 >Bar : Symbol(Bar, Decl(reactNamespaceJSXEmit.tsx, 2, 11))
->x : Symbol(x, Decl(reactNamespaceJSXEmit.tsx, 3, 11))
->y : Symbol(y, Decl(reactNamespaceJSXEmit.tsx, 9, 13))
+>x : Symbol(x, Decl(reactNamespaceJSXEmit.tsx, 4, 11))
+>y : Symbol(y, Decl(reactNamespaceJSXEmit.tsx, 10, 13))
+
+<_Bar { ...x } />;
+>_Bar : Symbol(_Bar, Decl(reactNamespaceJSXEmit.tsx, 3, 11))
+>x : Symbol(x, Decl(reactNamespaceJSXEmit.tsx, 4, 11))
 
diff --git a/tests/baselines/reference/reactNamespaceJSXEmit.types b/tests/baselines/reference/reactNamespaceJSXEmit.types
@@ -8,6 +8,9 @@ declare var foo: any;
 declare var Bar: any;
 >Bar : any
 
+declare var _Bar: any;
+>_Bar : any
+
 declare var x: any;
 >x : any
 
@@ -38,3 +41,8 @@ declare var x: any;
 >y : number
 >2 : 2
 
+<_Bar { ...x } />;
+><_Bar { ...x } /> : any
+>_Bar : any
+>x : any
+
diff --git a/tests/cases/compiler/doubleUnderscoreReactNamespace.ts b/tests/cases/compiler/doubleUnderscoreReactNamespace.ts
@@ -4,15 +4,11 @@
 // @filename: index.tsx
 
 declare global {
-    namespace JSX {
-        interface IntrinsicElements {
-            __foot: any;
-        }
-    }
     function __make (params: object): any;
 }
 
+declare var __foot: any;
 
-const thing = <__foot></__foot>;
+const thing = <__foot />;
 
-export {}
+export {}
diff --git a/tests/cases/compiler/jsxFactoryIdentifier.ts b/tests/cases/compiler/jsxFactoryIdentifier.ts
@@ -1,10 +1,10 @@
-//@jsx: react
-//@target: es6
-//@module: commonjs
-//@jsxFactory: createElement
-//@sourcemap: true
-
-// @filename: Element.ts
+//@jsx: react
+//@target: es6
+//@module: commonjs
+//@jsxFactory: createElement
+//@sourcemap: true
+
+// @filename: Element.ts
 declare namespace JSX {
     interface Element {
         name: string;
@@ -33,9 +33,9 @@ export let createElement = Element.createElement;
 
 function toCamelCase(text: string): string {
     return text[0].toLowerCase() + text.substring(1);
-}
-
-// @filename: test.tsx
+}
+
+// @filename: test.tsx
 import { Element} from './Element';
 let createElement = Element.createElement;
 let c: {
@@ -51,4 +51,4 @@ class A {
 			<meta content={c.a!.b}></meta>
 		];
 	}
-}
+}
diff --git a/tests/cases/compiler/reactNamespaceJSXEmit.tsx b/tests/cases/compiler/reactNamespaceJSXEmit.tsx
@@ -4,10 +4,12 @@
 declare var myReactLib: any;
 declare var foo: any;
 declare var Bar: any;
+declare var _Bar: any;
 declare var x: any;
 
 <foo data/>;
 <Bar x={x} />;
 <x-component />;
 <Bar {...x} />;
 <Bar { ...x } y={2} />;
+<_Bar { ...x } />;

Original file line number	Diff line number	Diff line change
`@@ -2434,10 +2434,8 @@ namespace ts {`
`2434`	`2434`	`}`
`2435`	`2435`
`2436`	`2436`	`export function isIntrinsicJsxName(name: __String \| string) {`
`2437`		`- // An escaped identifier had a leading underscore prior to being escaped, which would return true`
`2438`		`- // The escape adds an extra underscore which does not change the result`
`2439`		`- const ch = (name as string).substr(0, 1);`
`2440`		`- return ch.toLowerCase() === ch;`
	`2437`	`+ const ch = (name as string).charCodeAt(0);`
	`2438`	`+ return (ch >= CharacterCodes.a && ch <= CharacterCodes.z) \|\| (name as string).indexOf("-") > -1;`
`2441`	`2439`	`}`
`2442`	`2440`
`2443`	`2441`	`function get16BitUnicodeEscapeSequence(charCode: number): string {`
Original file line number	Diff line number	Diff line change
`@@ -122,3 +122,4 @@ class A {`
`122`	`122`	`];`
`123`	`123`	`}`
`124`	`124`	`}`
	`125`	`+`
Original file line number	Diff line number	Diff line change
`@@ -137,3 +137,4 @@ class A {`
`137`	`137`	`];`
`138`	`138`	`}`
`139`	`139`	`}`
	`140`	`+`