isDeclarationName: support ComputedPropertyName

src/compiler/checker.ts

@@ -23094,7 +23094,7 @@ namespace ts {
                         const rootChain = () => chainDiagnosticMessages(
                             /*details*/ undefined,
                             Diagnostics.Property_0_in_type_1_is_not_assignable_to_the_same_property_in_base_type_2,
-                            unescapeLeadingUnderscores(declaredProp.escapedName),
+                            symbolToString(declaredProp),
                             typeToString(typeWithThis),
                             typeToString(baseWithThis)
                         );

src/compiler/utilities.ts

@@ -1860,16 +1860,9 @@ namespace ts {
         return false;
     }
 
-    // True if the given identifier, string literal, or number literal is the name of a declaration node
+    // True if `name` is the name of a declaration node
     export function isDeclarationName(name: Node): boolean {
-        switch (name.kind) {
-            case SyntaxKind.Identifier:
-            case SyntaxKind.StringLiteral:
-            case SyntaxKind.NumericLiteral:
-                return isDeclaration(name.parent) && name.parent.name === name;
-            default:
-                return false;
-        }
+        return !isSourceFile(name) && !isBindingPattern(name) && isDeclaration(name.parent) && name.parent.name === name;
     }
 
     // See GH#16030

src/harness/harness.ts

@@ -1532,7 +1532,7 @@ namespace Harness {
             }
 
             if (typesError && symbolsError) {
-                throw new Error(typesError.message + Harness.IO.newLine() + symbolsError.message);
+                throw new Error(typesError.stack + Harness.IO.newLine() + symbolsError.stack);
             }
 
             if (typesError) {

tests/baselines/reference/ES5For-ofTypeCheck10.symbols

@@ -16,6 +16,8 @@ class StringIterator {
         };
     }
     [Symbol.iterator]() {
+>[Symbol.iterator] : Symbol(StringIterator[Symbol.iterator], Decl(ES5For-ofTypeCheck10.ts, 7, 5))
+
         return this;
 >this : Symbol(StringIterator, Decl(ES5For-ofTypeCheck10.ts, 0, 0))
     }

tests/baselines/reference/ES5For-ofTypeCheck10.types

@@ -20,6 +20,7 @@ class StringIterator {
         };
     }
     [Symbol.iterator]() {
+>[Symbol.iterator] : () => this
 >Symbol.iterator : any
 >Symbol : any
 >iterator : any

tests/baselines/reference/ES5SymbolProperty1.symbols

@@ -13,6 +13,7 @@ var obj = {
 >obj : Symbol(obj, Decl(ES5SymbolProperty1.ts, 5, 3))
 
     [Symbol.foo]: 0
+>[Symbol.foo] : Symbol([Symbol.foo], Decl(ES5SymbolProperty1.ts, 5, 11))
 >Symbol.foo : Symbol(SymbolConstructor.foo, Decl(ES5SymbolProperty1.ts, 0, 29))
 >Symbol : Symbol(Symbol, Decl(ES5SymbolProperty1.ts, 3, 3))
 >foo : Symbol(SymbolConstructor.foo, Decl(ES5SymbolProperty1.ts, 0, 29))

tests/baselines/reference/ES5SymbolProperty1.types

@@ -14,6 +14,7 @@ var obj = {
 >{    [Symbol.foo]: 0} : { [Symbol.foo]: number; }
 
     [Symbol.foo]: 0
+>[Symbol.foo] : number
 >Symbol.foo : string
 >Symbol : SymbolConstructor
 >foo : string

tests/baselines/reference/ES5SymbolProperty2.symbols

@@ -9,6 +9,7 @@ module M {
 >C : Symbol(C, Decl(ES5SymbolProperty2.ts, 1, 20))
 
         [Symbol.iterator]() { }
+>[Symbol.iterator] : Symbol(C[Symbol.iterator], Decl(ES5SymbolProperty2.ts, 3, 20))
 >Symbol : Symbol(Symbol, Decl(ES5SymbolProperty2.ts, 1, 7))
     }
     (new C)[Symbol.iterator];

tests/baselines/reference/ES5SymbolProperty2.types

@@ -9,6 +9,7 @@ module M {
 >C : C
 
         [Symbol.iterator]() { }
+>[Symbol.iterator] : () => void
 >Symbol.iterator : any
 >Symbol : any
 >iterator : any

tests/baselines/reference/ES5SymbolProperty3.symbols

@@ -6,6 +6,7 @@ class C {
 >C : Symbol(C, Decl(ES5SymbolProperty3.ts, 0, 16))
 
     [Symbol.iterator]() { }
+>[Symbol.iterator] : Symbol(C[Symbol.iterator], Decl(ES5SymbolProperty3.ts, 2, 9))
 >Symbol : Symbol(Symbol, Decl(ES5SymbolProperty3.ts, 0, 3))
 }
 

tests/baselines/reference/ES5SymbolProperty3.types

@@ -6,6 +6,7 @@ class C {
 >C : C
 
     [Symbol.iterator]() { }
+>[Symbol.iterator] : () => void
 >Symbol.iterator : any
 >Symbol : any
 >iterator : any

tests/baselines/reference/ES5SymbolProperty4.symbols

@@ -7,6 +7,7 @@ class C {
 >C : Symbol(C, Decl(ES5SymbolProperty4.ts, 0, 33))
 
     [Symbol.iterator]() { }
+>[Symbol.iterator] : Symbol(C[Symbol.iterator], Decl(ES5SymbolProperty4.ts, 2, 9))
 >Symbol.iterator : Symbol(iterator, Decl(ES5SymbolProperty4.ts, 0, 13))
 >Symbol : Symbol(Symbol, Decl(ES5SymbolProperty4.ts, 0, 3))
 >iterator : Symbol(iterator, Decl(ES5SymbolProperty4.ts, 0, 13))

tests/baselines/reference/ES5SymbolProperty4.types

@@ -7,6 +7,7 @@ class C {
 >C : C
 
     [Symbol.iterator]() { }
+>[Symbol.iterator] : () => void
 >Symbol.iterator : string
 >Symbol : { iterator: string; }
 >iterator : string

tests/baselines/reference/ES5SymbolProperty5.symbols

@@ -7,6 +7,7 @@ class C {
 >C : Symbol(C, Decl(ES5SymbolProperty5.ts, 0, 33))
 
     [Symbol.iterator]() { }
+>[Symbol.iterator] : Symbol(C[Symbol.iterator], Decl(ES5SymbolProperty5.ts, 2, 9))
 >Symbol.iterator : Symbol(iterator, Decl(ES5SymbolProperty5.ts, 0, 13))
 >Symbol : Symbol(Symbol, Decl(ES5SymbolProperty5.ts, 0, 3))
 >iterator : Symbol(iterator, Decl(ES5SymbolProperty5.ts, 0, 13))

tests/baselines/reference/ES5SymbolProperty5.types

@@ -7,6 +7,7 @@ class C {
 >C : C
 
     [Symbol.iterator]() { }
+>[Symbol.iterator] : () => void
 >Symbol.iterator : symbol
 >Symbol : { iterator: symbol; }
 >iterator : symbol

tests/baselines/reference/ES5SymbolProperty6.symbols

@@ -3,6 +3,7 @@ class C {
 >C : Symbol(C, Decl(ES5SymbolProperty6.ts, 0, 0))
 
     [Symbol.iterator]() { }
+>[Symbol.iterator] : Symbol(C[Symbol.iterator], Decl(ES5SymbolProperty6.ts, 0, 9))
 }
 
 (new C)[Symbol.iterator]

tests/baselines/reference/ES5SymbolProperty6.types

@@ -3,6 +3,7 @@ class C {
 >C : C
 
     [Symbol.iterator]() { }
+>[Symbol.iterator] : () => void
 >Symbol.iterator : any
 >Symbol : any
 >iterator : any

tests/baselines/reference/ES5SymbolProperty7.symbols

@@ -7,6 +7,7 @@ class C {
 >C : Symbol(C, Decl(ES5SymbolProperty7.ts, 0, 30))
 
     [Symbol.iterator]() { }
+>[Symbol.iterator] : Symbol(C[Symbol.iterator], Decl(ES5SymbolProperty7.ts, 2, 9))
 >Symbol.iterator : Symbol(iterator, Decl(ES5SymbolProperty7.ts, 0, 13))
 >Symbol : Symbol(Symbol, Decl(ES5SymbolProperty7.ts, 0, 3))
 >iterator : Symbol(iterator, Decl(ES5SymbolProperty7.ts, 0, 13))

tests/baselines/reference/ES5SymbolProperty7.types

@@ -7,6 +7,7 @@ class C {
 >C : C
 
     [Symbol.iterator]() { }
+>[Symbol.iterator] : () => void
 >Symbol.iterator : any
 >Symbol : { iterator: any; }
 >iterator : any

tests/baselines/reference/FunctionDeclaration8_es6.symbols

@@ -1,4 +1,5 @@
 === tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts ===
 var v = { [yield]: foo }
 >v : Symbol(v, Decl(FunctionDeclaration8_es6.ts, 0, 3))
+>[yield] : Symbol([yield], Decl(FunctionDeclaration8_es6.ts, 0, 9))
 

tests/baselines/reference/FunctionDeclaration8_es6.types

@@ -2,6 +2,7 @@
 var v = { [yield]: foo }
 >v : { [x: number]: any; }
 >{ [yield]: foo } : { [x: number]: any; }
+>[yield] : any
 >yield : any
 >foo : any
 

tests/baselines/reference/FunctionDeclaration9_es6.symbols

@@ -4,5 +4,6 @@ function * foo() {
 
   var v = { [yield]: foo }
 >v : Symbol(v, Decl(FunctionDeclaration9_es6.ts, 1, 5))
+>[yield] : Symbol([yield], Decl(FunctionDeclaration9_es6.ts, 1, 11))
 >foo : Symbol(foo, Decl(FunctionDeclaration9_es6.ts, 0, 0))
 }

tests/baselines/reference/FunctionDeclaration9_es6.types

@@ -5,6 +5,7 @@ function * foo() {
   var v = { [yield]: foo }
 >v : { [x: number]: () => IterableIterator<any>; }
 >{ [yield]: foo } : { [x: number]: () => IterableIterator<any>; }
+>[yield] : () => IterableIterator<any>
 >yield : any
 >foo : () => IterableIterator<any>
 }

tests/baselines/reference/FunctionPropertyAssignments5_es6.symbols

@@ -1,4 +1,5 @@
 === tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts ===
 var v = { *[foo()]() { } }
 >v : Symbol(v, Decl(FunctionPropertyAssignments5_es6.ts, 0, 3))
+>[foo()] : Symbol([foo()], Decl(FunctionPropertyAssignments5_es6.ts, 0, 9))
 

tests/baselines/reference/FunctionPropertyAssignments5_es6.types

@@ -2,6 +2,7 @@
 var v = { *[foo()]() { } }
 >v : { [x: number]: () => IterableIterator<any>; }
 >{ *[foo()]() { } } : { [x: number]: () => IterableIterator<any>; }
+>[foo()] : () => IterableIterator<any>
 >foo() : any
 >foo : any
 

tests/baselines/reference/MemberFunctionDeclaration3_es6.symbols

@@ -3,4 +3,5 @@ class C {
 >C : Symbol(C, Decl(MemberFunctionDeclaration3_es6.ts, 0, 0))
 
    *[foo]() { }
+>[foo] : Symbol(C[foo], Decl(MemberFunctionDeclaration3_es6.ts, 0, 9))
 }

tests/baselines/reference/MemberFunctionDeclaration3_es6.types

@@ -3,5 +3,6 @@ class C {
 >C : C
 
    *[foo]() { }
+>[foo] : () => IterableIterator<any>
 >foo : any
 }

tests/baselines/reference/asyncArrowFunction8_es2017.symbols

@@ -5,5 +5,6 @@ var foo = async (): Promise<void> => {
 
   var v = { [await]: foo }
 >v : Symbol(v, Decl(asyncArrowFunction8_es2017.ts, 1, 5))
+>[await] : Symbol([await], Decl(asyncArrowFunction8_es2017.ts, 1, 11))
 >foo : Symbol(foo, Decl(asyncArrowFunction8_es2017.ts, 0, 3))
 }

tests/baselines/reference/asyncArrowFunction8_es2017.types

@@ -7,6 +7,7 @@ var foo = async (): Promise<void> => {
   var v = { [await]: foo }
 >v : { [x: number]: () => Promise<void>; }
 >{ [await]: foo } : { [x: number]: () => Promise<void>; }
+>[await] : () => Promise<void>
 >await : any
 > : any
 >foo : () => Promise<void>

tests/baselines/reference/asyncArrowFunction8_es5.symbols

@@ -5,5 +5,6 @@ var foo = async (): Promise<void> => {
 
   var v = { [await]: foo }
 >v : Symbol(v, Decl(asyncArrowFunction8_es5.ts, 1, 5))
+>[await] : Symbol([await], Decl(asyncArrowFunction8_es5.ts, 1, 11))
 >foo : Symbol(foo, Decl(asyncArrowFunction8_es5.ts, 0, 3))
 }

tests/baselines/reference/asyncArrowFunction8_es5.types

@@ -7,6 +7,7 @@ var foo = async (): Promise<void> => {
   var v = { [await]: foo }
 >v : { [x: number]: () => Promise<void>; }
 >{ [await]: foo } : { [x: number]: () => Promise<void>; }
+>[await] : () => Promise<void>
 >await : any
 > : any
 >foo : () => Promise<void>

tests/baselines/reference/asyncArrowFunction8_es6.symbols

@@ -5,5 +5,6 @@ var foo = async (): Promise<void> => {
 
   var v = { [await]: foo }
 >v : Symbol(v, Decl(asyncArrowFunction8_es6.ts, 1, 5))
+>[await] : Symbol([await], Decl(asyncArrowFunction8_es6.ts, 1, 11))
 >foo : Symbol(foo, Decl(asyncArrowFunction8_es6.ts, 0, 3))
 }

tests/baselines/reference/asyncArrowFunction8_es6.types

@@ -7,6 +7,7 @@ var foo = async (): Promise<void> => {
   var v = { [await]: foo }
 >v : { [x: number]: () => Promise<void>; }
 >{ [await]: foo } : { [x: number]: () => Promise<void>; }
+>[await] : () => Promise<void>
 >await : any
 > : any
 >foo : () => Promise<void>

tests/baselines/reference/asyncFunctionDeclaration8_es2017.symbols

@@ -1,4 +1,5 @@
 === tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration8_es2017.ts ===
 var v = { [await]: foo }
 >v : Symbol(v, Decl(asyncFunctionDeclaration8_es2017.ts, 0, 3))
+>[await] : Symbol([await], Decl(asyncFunctionDeclaration8_es2017.ts, 0, 9))
 

tests/baselines/reference/asyncFunctionDeclaration8_es2017.types

@@ -2,6 +2,7 @@
 var v = { [await]: foo }
 >v : { [x: number]: any; }
 >{ [await]: foo } : { [x: number]: any; }
+>[await] : any
 >await : any
 >foo : any
 

tests/baselines/reference/asyncFunctionDeclaration8_es5.symbols

@@ -1,4 +1,5 @@
 === tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration8_es5.ts ===
 var v = { [await]: foo }
 >v : Symbol(v, Decl(asyncFunctionDeclaration8_es5.ts, 0, 3))
+>[await] : Symbol([await], Decl(asyncFunctionDeclaration8_es5.ts, 0, 9))
 

tests/baselines/reference/asyncFunctionDeclaration8_es5.types

@@ -2,6 +2,7 @@
 var v = { [await]: foo }
 >v : { [x: number]: any; }
 >{ [await]: foo } : { [x: number]: any; }
+>[await] : any
 >await : any
 >foo : any
 

tests/baselines/reference/asyncFunctionDeclaration8_es6.symbols

@@ -1,4 +1,5 @@
 === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration8_es6.ts ===
 var v = { [await]: foo }
 >v : Symbol(v, Decl(asyncFunctionDeclaration8_es6.ts, 0, 3))
+>[await] : Symbol([await], Decl(asyncFunctionDeclaration8_es6.ts, 0, 9))
 

tests/baselines/reference/asyncFunctionDeclaration8_es6.types

@@ -2,6 +2,7 @@
 var v = { [await]: foo }
 >v : { [x: number]: any; }
 >{ [await]: foo } : { [x: number]: any; }
+>[await] : any
 >await : any
 >foo : any
 

tests/baselines/reference/asyncFunctionDeclaration9_es2017.symbols

@@ -5,5 +5,6 @@ async function foo(): Promise<void> {
 
   var v = { [await]: foo }
 >v : Symbol(v, Decl(asyncFunctionDeclaration9_es2017.ts, 1, 5))
+>[await] : Symbol([await], Decl(asyncFunctionDeclaration9_es2017.ts, 1, 11))
 >foo : Symbol(foo, Decl(asyncFunctionDeclaration9_es2017.ts, 0, 0))
 }

tests/baselines/reference/asyncFunctionDeclaration9_es2017.types

@@ -6,6 +6,7 @@ async function foo(): Promise<void> {
   var v = { [await]: foo }
 >v : { [x: number]: () => Promise<void>; }
 >{ [await]: foo } : { [x: number]: () => Promise<void>; }
+>[await] : () => Promise<void>
 >await : any
 > : any
 >foo : () => Promise<void>

tests/baselines/reference/asyncFunctionDeclaration9_es5.symbols

@@ -5,5 +5,6 @@ async function foo(): Promise<void> {
 
   var v = { [await]: foo }
 >v : Symbol(v, Decl(asyncFunctionDeclaration9_es5.ts, 1, 5))
+>[await] : Symbol([await], Decl(asyncFunctionDeclaration9_es5.ts, 1, 11))
 >foo : Symbol(foo, Decl(asyncFunctionDeclaration9_es5.ts, 0, 0))
 }

tests/baselines/reference/asyncFunctionDeclaration9_es5.types

@@ -6,6 +6,7 @@ async function foo(): Promise<void> {
   var v = { [await]: foo }
 >v : { [x: number]: () => Promise<void>; }
 >{ [await]: foo } : { [x: number]: () => Promise<void>; }
+>[await] : () => Promise<void>
 >await : any
 > : any
 >foo : () => Promise<void>

tests/baselines/reference/asyncFunctionDeclaration9_es6.symbols

@@ -5,5 +5,6 @@ async function foo(): Promise<void> {
 
   var v = { [await]: foo }
 >v : Symbol(v, Decl(asyncFunctionDeclaration9_es6.ts, 1, 5))
+>[await] : Symbol([await], Decl(asyncFunctionDeclaration9_es6.ts, 1, 11))
 >foo : Symbol(foo, Decl(asyncFunctionDeclaration9_es6.ts, 0, 0))
 }

tests/baselines/reference/asyncFunctionDeclaration9_es6.types

@@ -6,6 +6,7 @@ async function foo(): Promise<void> {
   var v = { [await]: foo }
 >v : { [x: number]: () => Promise<void>; }
 >{ [await]: foo } : { [x: number]: () => Promise<void>; }
+>[await] : () => Promise<void>
 >await : any
 > : any
 >foo : () => Promise<void>

tests/baselines/reference/capturedLetConstInLoop13.symbols

@@ -23,6 +23,7 @@ class Main {
 >bar : Symbol(Main.bar, Decl(capturedLetConstInLoop13.ts, 13, 5))
 
                 [name + ".a"]: () => { this.foo(name); },
+>[name + ".a"] : Symbol([name + ".a"], Decl(capturedLetConstInLoop13.ts, 9, 22))
 >name : Symbol(name, Decl(capturedLetConstInLoop13.ts, 7, 16))
 >this.foo : Symbol(Main.foo, Decl(capturedLetConstInLoop13.ts, 15, 33))
 >this : Symbol(Main, Decl(capturedLetConstInLoop13.ts, 0, 0))

tests/baselines/reference/capturedLetConstInLoop13.types

@@ -29,6 +29,7 @@ class Main {
 >{                [name + ".a"]: () => { this.foo(name); },            } : { [x: string]: () => void; }
 
                 [name + ".a"]: () => { this.foo(name); },
+>[name + ".a"] : () => void
 >name + ".a" : string
 >name : string
 >".a" : ".a"

tests/baselines/reference/capturedParametersInInitializers2.symbols

@@ -14,6 +14,7 @@ function foo(y = class {static c = x}, x = 1) {
 function foo2(y = class {[x] = x}, x = 1) {
 >foo2 : Symbol(foo2, Decl(capturedParametersInInitializers2.ts, 2, 1))
 >y : Symbol(y, Decl(capturedParametersInInitializers2.ts, 3, 14))
+>[x] : Symbol((Anonymous class)[x], Decl(capturedParametersInInitializers2.ts, 3, 25))
 >x : Symbol(x, Decl(capturedParametersInInitializers2.ts, 3, 34))
 >x : Symbol(x, Decl(capturedParametersInInitializers2.ts, 3, 34))
 >x : Symbol(x, Decl(capturedParametersInInitializers2.ts, 3, 34))

tests/baselines/reference/capturedParametersInInitializers2.types

@@ -17,6 +17,7 @@ function foo2(y = class {[x] = x}, x = 1) {
 >foo2 : (y?: typeof (Anonymous class), x?: number) => void
 >y : typeof (Anonymous class)
 >class {[x] = x} : typeof (Anonymous class)
+>[x] : number
 >x : number
 >x : number
 >x : number

tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.symbols

@@ -30,6 +30,8 @@ const obj = {
 
   /** @type {number} */
   ['b' + 'ar1']: 42,
+>['b' + 'ar1'] : Symbol(['b' + 'ar1'], Decl(0.js, 12, 6))
+
   /** @type {function(number): number} */
   arrowFunc: (num) => num + 42
 >arrowFunc : Symbol(arrowFunc, Decl(0.js, 14, 20))