Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into optimizeParser

Browse Source
This commit is contained in:
Anders Hejlsberg
2017-11-14 10:09:31 -08:00
parent 787c323990 36ce7eac5a
commit 0bda420a73
14 changed files with 68 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/utilities.ts
+2 -4
View File
@@ -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 {
tests/baselines/reference/doubleUnderscoreReactNamespace.js
+5 -8
View File
@@ -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);
tests/baselines/reference/doubleUnderscoreReactNamespace.symbols
+8 -16
View File
@@ -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 {}
tests/baselines/reference/doubleUnderscoreReactNamespace.types
+6 -14
View File
@@ -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
}
const thing = <__foot></__foot>;
>thing : any
><__foot></__foot> : any
declare var __foot: any;
>__foot : any
const thing = <__foot />;
>thing : any
><__foot /> : any
>__foot : any
export {}
tests/baselines/reference/jsxEsprimaFbTestSuite.symbols
+2 -2
View File
@@ -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))
tests/baselines/reference/jsxFactoryIdentifier.js
+2 -1
View File
@@ -47,7 +47,8 @@ class A {
<meta content={c.a!.b}></meta>
];
}
}
}
//// [Element.js]
"use strict";
tests/baselines/reference/jsxFactoryIdentifier.symbols
+1
View File
@@ -122,3 +122,4 @@ class A {
];
}
}
tests/baselines/reference/jsxFactoryIdentifier.types
+1
View File
@@ -137,3 +137,4 @@ class A {
];
}
}
tests/baselines/reference/reactNamespaceJSXEmit.js
+3
View File
@@ -2,6 +2,7 @@
declare var myReactLib: any;
declare var foo: any;
declare var Bar: any;
declare var _Bar: any;
declare var x: any;
<foo data/>;
@@ -9,6 +10,7 @@ declare var x: any;
<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));
tests/baselines/reference/reactNamespaceJSXEmit.symbols
+14 -7
View File
@@ -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))
tests/baselines/reference/reactNamespaceJSXEmit.types
+8
View File
@@ -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
tests/cases/compiler/doubleUnderscoreReactNamespace.ts
+3 -7
View File
@@ -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 {}
tests/cases/compiler/jsxFactoryIdentifier.ts
+11 -11
View File
@@ -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>
];
}
}
}
tests/cases/compiler/reactNamespaceJSXEmit.tsx
+2
View File
@@ -4,6 +4,7 @@
declare var myReactLib: any;
declare var foo: any;
declare var Bar: any;
declare var _Bar: any;
declare var x: any;
<foo data/>;
@@ -11,3 +12,4 @@ declare var x: any;
<x-component />;
<Bar {...x} />;
<Bar { ...x } y={2} />;
<_Bar { ...x } />;