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 with master

Browse Source
This commit is contained in:
Vladimir Matveev
2015-12-08 13:28:55 -08:00
parent 268e7c0d09
commit f3e4befc3e
12 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/checker.ts
+2
View File
@@ -15025,6 +15025,8 @@ namespace ts {
}
const hasExportAssignment = getExportAssignmentSymbol(moduleSymbol) !== undefined;
// if module has export assignment then 'resolveExternalModuleSymbol' will return resolved symbol for export assignment
// otherwise it will return moduleSymbol itself
moduleSymbol = resolveExternalModuleSymbol(moduleSymbol);
const symbolLinks = getSymbolLinks(moduleSymbol);
tests/baselines/reference/exportStarForValues.js
+2
View File
@@ -10,8 +10,10 @@ var x;
//// [file1.js]
define(["require", "exports"], function (require, exports) {
"use strict";
});
//// [file2.js]
define(["require", "exports"], function (require, exports) {
"use strict";
var x;
});
tests/baselines/reference/exportStarForValues10.js
+3
View File
@@ -14,6 +14,7 @@ var x = 1;
//// [file0.js]
System.register([], function(exports_1) {
"use strict";
var v;
return {
setters:[],
@@ -24,6 +25,7 @@ System.register([], function(exports_1) {
});
//// [file1.js]
System.register([], function(exports_1) {
"use strict";
return {
setters:[],
execute: function() {
@@ -32,6 +34,7 @@ System.register([], function(exports_1) {
});
//// [file2.js]
System.register(["file0"], function(exports_1) {
"use strict";
var x;
function exportStar_1(m) {
var exports = {};
tests/baselines/reference/exportStarForValues2.js
+3
View File
@@ -14,12 +14,15 @@ var x = 1;
//// [file1.js]
define(["require", "exports"], function (require, exports) {
"use strict";
});
//// [file2.js]
define(["require", "exports"], function (require, exports) {
"use strict";
var x = 1;
});
//// [file3.js]
define(["require", "exports"], function (require, exports) {
"use strict";
var x = 1;
});
tests/baselines/reference/exportStarForValues3.js
+5
View File
@@ -26,20 +26,25 @@ var x = 1;
//// [file1.js]
define(["require", "exports"], function (require, exports) {
"use strict";
});
//// [file2.js]
define(["require", "exports"], function (require, exports) {
"use strict";
var x = 1;
});
//// [file3.js]
define(["require", "exports"], function (require, exports) {
"use strict";
var x = 1;
});
//// [file4.js]
define(["require", "exports"], function (require, exports) {
"use strict";
var x = 1;
});
//// [file5.js]
define(["require", "exports"], function (require, exports) {
"use strict";
var x = 1;
});
tests/baselines/reference/exportStarForValues4.js
+3
View File
@@ -18,12 +18,15 @@ var x = 1;
//// [file1.js]
define(["require", "exports"], function (require, exports) {
"use strict";
});
//// [file3.js]
define(["require", "exports"], function (require, exports) {
"use strict";
var x = 1;
});
//// [file2.js]
define(["require", "exports"], function (require, exports) {
"use strict";
var x = 1;
});
tests/baselines/reference/exportStarForValues5.js
+2
View File
@@ -10,7 +10,9 @@ export var x;
//// [file1.js]
define(["require", "exports"], function (require, exports) {
"use strict";
});
//// [file2.js]
define(["require", "exports"], function (require, exports) {
"use strict";
});
tests/baselines/reference/exportStarForValues6.js
+2
View File
@@ -10,6 +10,7 @@ export var x = 1;
//// [file1.js]
System.register([], function(exports_1) {
"use strict";
return {
setters:[],
execute: function() {
@@ -18,6 +19,7 @@ System.register([], function(exports_1) {
});
//// [file2.js]
System.register([], function(exports_1) {
"use strict";
var x;
return {
setters:[],
tests/baselines/reference/exportStarForValues7.js
+3
View File
@@ -14,13 +14,16 @@ export var x = 1;
//// [file1.js]
define(["require", "exports"], function (require, exports) {
"use strict";
});
//// [file2.js]
define(["require", "exports"], function (require, exports) {
"use strict";
exports.x = 1;
});
//// [file3.js]
define(["require", "exports", "file2"], function (require, exports, file2_1) {
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
}
tests/baselines/reference/exportStarForValues8.js
+5
View File
@@ -26,17 +26,21 @@ export var x = 1;
//// [file1.js]
define(["require", "exports"], function (require, exports) {
"use strict";
});
//// [file2.js]
define(["require", "exports"], function (require, exports) {
"use strict";
exports.x = 1;
});
//// [file3.js]
define(["require", "exports"], function (require, exports) {
"use strict";
exports.x = 1;
});
//// [file4.js]
define(["require", "exports", "file2", "file3"], function (require, exports, file2_1, file3_1) {
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
}
@@ -46,6 +50,7 @@ define(["require", "exports", "file2", "file3"], function (require, exports, fil
});
//// [file5.js]
define(["require", "exports", "file4"], function (require, exports, file4_1) {
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
}
tests/baselines/reference/exportStarForValues9.js
+3
View File
@@ -18,9 +18,11 @@ export var x = 1;
//// [file1.js]
define(["require", "exports"], function (require, exports) {
"use strict";
});
//// [file3.js]
define(["require", "exports", "file2"], function (require, exports, file2_1) {
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
}
@@ -29,6 +31,7 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) {
});
//// [file2.js]
define(["require", "exports", "file3"], function (require, exports, file3_1) {
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
}
tests/baselines/reference/exportStarForValuesInSystem.js
+2
View File
@@ -10,6 +10,7 @@ var x = 1;
//// [file1.js]
System.register([], function(exports_1) {
"use strict";
return {
setters:[],
execute: function() {
@@ -18,6 +19,7 @@ System.register([], function(exports_1) {
});
//// [file2.js]
System.register([], function(exports_1) {
"use strict";
var x;
return {
setters:[],