Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 10741: Only emit comment only once in module declaration with identifier pat… #10766

Merged
merged 2 commits into from
Sep 16, 2016
Merged

Fix 10741: Only emit comment only once in module declaration with identifier pat… #10766

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a49ce91
Only emit comment only once in module declaration with identifier pat…
Sep 7, 2016
b193426
Address PR: Update comment
Sep 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion src/compiler/transformers/ts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2859,7 +2859,6 @@ namespace ts {
const moduleBlock = <ModuleBlock>getInnerMostModuleDeclarationFromDottedModule(node).body;
statementsLocation = moveRangePos(moduleBlock.statements, -1);
}

addRange(statements, endLexicalEnvironment());

currentNamespaceContainerName = savedCurrentNamespaceContainerName;
Expand All @@ -2872,6 +2871,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 = {}));
// so if the block is a transformed module declaration, turn off the comment emit
Copy link
Member

@DanielRosenwasser DanielRosenwasser Sep 8, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think what you mean to clarify is that you only want to emit on the namespace block body itself, not the containing namespaces.

if (body.kind !== SyntaxKind.ModuleBlock) {
setNodeEmitFlags(block, block.emitFlags | NodeEmitFlags.NoComments);
}
return block;
}

Expand Down
20 changes: 20 additions & 0 deletions tests/baselines/reference/commentInNamespaceDeclarationWithIdentifierPathName.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 11 additions & 0 deletions tests/baselines/reference/commentInNamespaceDeclarationWithIdentifierPathName.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 11 additions & 0 deletions tests/baselines/reference/commentInNamespaceDeclarationWithIdentifierPathName.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 6 additions & 0 deletions tests/cases/compiler/commentInNamespaceDeclarationWithIdentifierPathName.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
namespace hello.hi.world
{
function foo() {}

// TODO, blah
}