microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-11 16:38:46 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #10766 from Microsoft/fix10741_emitCommentOnlyOnce

Browse Source 
Fix 10741: Only emit comment only once in module declaration with identifier pat…
This commit is contained in:
Yui
2016-09-16 16:30:40 -07:00
committed by GitHub
parent 599d2b0efe b193426c7b
commit 02547fe664
5 changed files with 72 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/compiler/transformers/ts.ts
View File

@@ -2861,7 +2861,6 @@ namespace ts {
const moduleBlock = <ModuleBlock>getInnerMostModuleDeclarationFromDottedModule(node).body;
statementsLocation = moveRangePos(moduleBlock.statements, -1);
}
addRange(statements, endLexicalEnvironment());
currentNamespaceContainerName = savedCurrentNamespaceContainerName;
@@ -2874,6 +2873,30 @@ namespace ts {
/*location*/ blockLocation,
/*multiLine*/ true
);
// namespace hello.hi.world {
// function foo() {}
//
// // TODO, blah
// }
//
// should be emitted as
//
// var hello;
// (function (hello) {
// var hi;
// (function (hi) {
// var world;
// (function (world) {
// function foo() { }
// // TODO, blah
// })(world = hi.world || (hi.world = {}));
// })(hi = hello.hi || (hello.hi = {}));
// })(hello || (hello = {}));
// We only want to emit comment on the namespace which contains block body itself, not the containing namespaces.
if (body.kind !== SyntaxKind.ModuleBlock) {
setNodeEmitFlags(block, block.emitFlags | NodeEmitFlags.NoComments);
}
return block;
}

20
tests/baselines/reference/commentInNamespaceDeclarationWithIdentifierPathName.js Normal file
View File

@@ -0,0 +1,20 @@
//// [commentInNamespaceDeclarationWithIdentifierPathName.ts]
namespace hello.hi.world
{
function foo() {}
// TODO, blah
}
//// [commentInNamespaceDeclarationWithIdentifierPathName.js]
var hello;
(function (hello) {
var hi;
(function (hi) {
var world;
(function (world) {
function foo() { }
// TODO, blah
})(world = hi.world || (hi.world = {}));
})(hi = hello.hi || (hello.hi = {}));
})(hello || (hello = {}));

11
tests/baselines/reference/commentInNamespaceDeclarationWithIdentifierPathName.symbols Normal file
View File

@@ -0,0 +1,11 @@
=== tests/cases/compiler/commentInNamespaceDeclarationWithIdentifierPathName.ts ===
namespace hello.hi.world
>hello : Symbol(hello, Decl(commentInNamespaceDeclarationWithIdentifierPathName.ts, 0, 0))
>hi : Symbol(hi, Decl(commentInNamespaceDeclarationWithIdentifierPathName.ts, 0, 16))
>world : Symbol(world, Decl(commentInNamespaceDeclarationWithIdentifierPathName.ts, 0, 19))
{
function foo() {}
>foo : Symbol(foo, Decl(commentInNamespaceDeclarationWithIdentifierPathName.ts, 1, 1))
// TODO, blah
}

11
tests/baselines/reference/commentInNamespaceDeclarationWithIdentifierPathName.types Normal file
View File

@@ -0,0 +1,11 @@
=== tests/cases/compiler/commentInNamespaceDeclarationWithIdentifierPathName.ts ===
namespace hello.hi.world
>hello : typeof hello
>hi : typeof hi
>world : typeof world
{
function foo() {}
>foo : () => void
// TODO, blah
}

6
tests/cases/compiler/commentInNamespaceDeclarationWithIdentifierPathName.ts Normal file
View File

@@ -0,0 +1,6 @@
namespace hello.hi.world
{
function foo() {}
// TODO, blah
}