Merge pull request microsoft#3769 from Microsoft/bindingAnonymouseWithName

yuit · yuit · commit 42168e39ec02 · 2015-07-07T13:28:38.000-07:00
Binding anonymous with name for functionExpression and classExpression
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -892,7 +892,8 @@ namespace ts {
                 case SyntaxKind.FunctionExpression:
                 case SyntaxKind.ArrowFunction:
                     checkStrictModeFunctionName(<FunctionExpression>node);
-                    return bindAnonymousDeclaration(<FunctionExpression>node, SymbolFlags.Function, "__function");
+                    let bindingName = (<FunctionExpression>node).name ? (<FunctionExpression>node).name.text : "__function";
+                    return bindAnonymousDeclaration(<FunctionExpression>node, SymbolFlags.Function, bindingName);
                 case SyntaxKind.ClassExpression:
                 case SyntaxKind.ClassDeclaration:
                     return bindClassLikeDeclaration(<ClassLikeDeclaration>node);
@@ -964,7 +965,8 @@ namespace ts {
                 bindBlockScopedDeclaration(node, SymbolFlags.Class, SymbolFlags.ClassExcludes);
             }
             else {
-                bindAnonymousDeclaration(node, SymbolFlags.Class, "__class");
+                let bindingName = node.name ? node.name.text : "__class";
+                bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
             }
 
             let symbol = node.symbol;
diff --git a/tests/baselines/reference/classExpressionTest2.types b/tests/baselines/reference/classExpressionTest2.types
@@ -28,13 +28,13 @@ function M() {
     }
 
     var v = new m<number>();
->v : <number>
->new m<number>() : <number>
+>v : C<number>
+>new m<number>() : C<number>
 >m : typeof C
 
     return v.f<string>();
 >v.f<string>() : { t: string; x: number; }
 >v.f : <T>() => { t: T; x: number; }
->v : <number>
+>v : C<number>
 >f : <T>() => { t: T; x: number; }
 }
diff --git a/tests/cases/fourslash/renameLocationsForClassExpression01.ts b/tests/cases/fourslash/renameLocationsForClassExpression01.ts
@@ -3,13 +3,13 @@
 ////class Foo {
 ////}
 ////
-////var x = class /**/Foo {
+////var x = class [|Foo|] {
 ////    doIt() {
-////        return Foo;
+////        return [|Foo|];
 ////    }
 ////
 ////    static doItStatically() {
-////        return Foo;
+////        return [|Foo|];
 ////    }
 ////} 
 ////
@@ -23,12 +23,10 @@
 // TODO (yuit): Fix up this test when class expressions are supported.
 //              Just uncomment the below, remove the marker, and add the
 //              appropriate ranges in the test itself.
-goTo.marker();
-verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
 
-////let ranges = test.ranges()
-////for (let range of ranges) {
-////    goTo.position(range.start);
-////
-////    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
-////}
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
