maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Emit unqiue symbols with typeof if possible before issuing an error (#21403)

Browse source
This commit is contained in:
Wesley Wigham 2018-02-28 15:44:12 -08:00 committed by GitHub
parent 7a31192ecb
commit 62185673fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 79 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/compiler/checker.ts
View file

@ -2898,6 +2898,9 @@ namespace ts {
}
if (type.flags & TypeFlags.UniqueESSymbol) {
if (!(context.flags & NodeBuilderFlags.AllowUniqueESSymbolType)) {
if (isValueSymbolAccessible(type.symbol, context.enclosingDeclaration)) {
return createTypeQueryNode(symbolToName(type.symbol, context, SymbolFlags.Value, /*expectsIdentifier*/ false));
}
if (context.tracker.reportInaccessibleUniqueSymbolError) {
context.tracker.reportInaccessibleUniqueSymbolError();
}

2
src/harness/typeWriter.ts
View file

@ -79,7 +79,7 @@ class TypeWriterWalker {
// Workaround to ensure we output 'C' instead of 'typeof C' for base class expressions
// let type = this.checker.getTypeAtLocation(node);
const type = node.parent && ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent) && this.checker.getTypeAtLocation(node.parent) || this.checker.getTypeAtLocation(node);
const typeString = type ? this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.NoTruncation) : "No type information available!";
const typeString = type ? this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.NoTruncation | ts.TypeFormatFlags.AllowUniqueESSymbolType) : "No type information available!";
return {
line: lineAndCharacter.line,
syntaxKind: node.kind,

23
tests/baselines/reference/indirectUniqueSymbolDeclarationEmit.js Normal file
View file

@ -0,0 +1,23 @@
//// [indirectUniqueSymbolDeclarationEmit.ts]
export const x = Symbol();
export const y = Symbol();
declare function rand(): boolean;
export function f() {
return rand() ? x : y;
}
//// [indirectUniqueSymbolDeclarationEmit.js]
"use strict";
exports.__esModule = true;
exports.x = Symbol();
exports.y = Symbol();
function f() {
return rand() ? exports.x : exports.y;
}
exports.f = f;
//// [indirectUniqueSymbolDeclarationEmit.d.ts]
export declare const x: unique symbol;
export declare const y: unique symbol;
export declare function f(): typeof x | typeof y;

20
tests/baselines/reference/indirectUniqueSymbolDeclarationEmit.symbols Normal file
View file

@ -0,0 +1,20 @@
=== tests/cases/compiler/indirectUniqueSymbolDeclarationEmit.ts ===
export const x = Symbol();
>x : Symbol(x, Decl(indirectUniqueSymbolDeclarationEmit.ts, 0, 12))
>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
export const y = Symbol();
>y : Symbol(y, Decl(indirectUniqueSymbolDeclarationEmit.ts, 1, 12))
>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
declare function rand(): boolean;
>rand : Symbol(rand, Decl(indirectUniqueSymbolDeclarationEmit.ts, 1, 26))
export function f() {
>f : Symbol(f, Decl(indirectUniqueSymbolDeclarationEmit.ts, 2, 33))
return rand() ? x : y;
>rand : Symbol(rand, Decl(indirectUniqueSymbolDeclarationEmit.ts, 1, 26))
>x : Symbol(x, Decl(indirectUniqueSymbolDeclarationEmit.ts, 0, 12))
>y : Symbol(y, Decl(indirectUniqueSymbolDeclarationEmit.ts, 1, 12))
}

24
tests/baselines/reference/indirectUniqueSymbolDeclarationEmit.types Normal file
View file

@ -0,0 +1,24 @@
=== tests/cases/compiler/indirectUniqueSymbolDeclarationEmit.ts ===
export const x = Symbol();
>x : unique symbol
>Symbol() : unique symbol
>Symbol : SymbolConstructor
export const y = Symbol();
>y : unique symbol
>Symbol() : unique symbol
>Symbol : SymbolConstructor
declare function rand(): boolean;
>rand : () => boolean
export function f() {
>f : () => unique symbol | unique symbol
return rand() ? x : y;
>rand() ? x : y : unique symbol | unique symbol
>rand() : boolean
>rand : () => boolean
>x : unique symbol
>y : unique symbol
}

8
tests/cases/compiler/indirectUniqueSymbolDeclarationEmit.ts Normal file
View file

@ -0,0 +1,8 @@
// @lib: es6
// @declaration: true
export const x = Symbol();
export const y = Symbol();
declare function rand(): boolean;
export function f() {
return rand() ? x : y;
}