Fix re-exporting variables with __ prefix.

Reviewers: vikerman, evmar

Reviewed By: vikerman, evmar

Subscribers: typescript-eng

Differential Revision: https://reviews.angular.io/D130

Author: vikerman

src/tsickle.ts

@@ -342,7 +342,7 @@ class Annotator extends Rewriter {
         typeChecker.getExportsOfModule(typeChecker.getSymbolAtLocation(exportDecl.moduleSpecifier));
     let reexports: {[name: string]: boolean} = {};
     for (let sym of exports) {
-      let name = sym.name;
+      let name = unescapeName(sym.name);
       if (localSet.hasOwnProperty(name)) {
         // This name is shadowed by a local definition, such as:
         // - export var foo ...

test_files/underscore/export_underscore.js

@@ -0,0 +1,2 @@
+goog.module('tsickle_test.underscore.export_underscore');
+exports.__test = 1;

test_files/underscore/export_underscore.ts

@@ -0,0 +1,2 @@
+export var __test = 1;
+

test_files/underscore/export_underscore.tsickle.ts

@@ -0,0 +1,2 @@
+export var /** @type {number} */ __test = 1;
+

test_files/underscore/underscore.js

@@ -1,6 +1,8 @@
 goog.module('tsickle_test.underscore.underscore');// Verify that double-underscored names in various places don't get corrupted.
 // See getIdentifierText() in tsickle.ts.
 
+var export_underscore_1 = goog.require('tsickle_test.underscore.export_underscore');
+exports.__test = export_underscore_1.__test;
 let /** @type {number} */ __foo = 3;
 exports.__bar = __foo;
 class __Class {

test_files/underscore/underscore.ts

@@ -1,6 +1,8 @@
 // Verify that double-underscored names in various places don't get corrupted.
 // See getIdentifierText() in tsickle.ts.
 
+export * from './export_underscore';
+
 let __foo = 3;
 export {__foo as __bar};
 class __Class {

test_files/underscore/underscore.tsickle.ts

@@ -1,6 +1,8 @@
 // Verify that double-underscored names in various places don't get corrupted.
 // See getIdentifierText() in tsickle.ts.
 
+export {__test} from './export_underscore';
+
 let /** @type {number} */ __foo = 3;
 export {__foo as __bar};
 class __Class {