Skip to content

Remove excess comment ranges from initialized and property parameter emit #22152

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.

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

Merged
merged 1 commit into from
Feb 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 10 additions & 7 deletions src/compiler/transformers/es2015.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1311,24 +1311,27 @@ namespace ts {
setTextRange(
createBlock([
createStatement(
setTextRange(
createAssignment(
setEmitFlags(getMutableClone(name), EmitFlags.NoSourceMap),
setEmitFlags(initializer, EmitFlags.NoSourceMap | getEmitFlags(initializer))
setEmitFlags(
setTextRange(
createAssignment(
setEmitFlags(getMutableClone(name), EmitFlags.NoSourceMap),
setEmitFlags(initializer, EmitFlags.NoSourceMap | getEmitFlags(initializer) | EmitFlags.NoComments)
),
parameter
),
parameter
EmitFlags.NoComments
)
)
]),
parameter
),
EmitFlags.SingleLine | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTokenSourceMaps
EmitFlags.SingleLine | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTokenSourceMaps | EmitFlags.NoComments
)
);

startOnNewLine(statement);
setTextRange(statement, parameter);
setEmitFlags(statement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.CustomPrologue);
setEmitFlags(statement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.CustomPrologue | EmitFlags.NoComments);
statements.push(statement);
}

Expand Down
27 changes: 15 additions & 12 deletions src/compiler/transformers/ts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1147,20 +1147,23 @@ namespace ts {
setEmitFlags(localName, EmitFlags.NoComments);

return startOnNewLine(
setTextRange(
createStatement(
createAssignment(
setTextRange(
createPropertyAccess(
createThis(),
propertyName
setEmitFlags(
setTextRange(
createStatement(
createAssignment(
setTextRange(
createPropertyAccess(
createThis(),
propertyName
),
node.name
),
node.name
),
localName
)
localName
)
),
moveRangePos(node, -1)
),
moveRangePos(node, -1)
EmitFlags.NoComments
)
);
}
Expand Down
17 changes: 17 additions & 0 deletions tests/baselines/reference/defaultParameterTrailingComments.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//// [defaultParameterTrailingComments.ts]
class C {
constructor(defaultParam: boolean = false /* Emit only once*/) {}
}

function foo(defaultParam = 10 /*emit only once*/) {}

//// [defaultParameterTrailingComments.js]
var C = /** @class */ (function () {
function C(defaultParam /* Emit only once*/) {
if (defaultParam === void 0) { defaultParam = false; }
}
return C;
}());
function foo(defaultParam /*emit only once*/) {
if (defaultParam === void 0) { defaultParam = 10; }
}
12 changes: 12 additions & 0 deletions tests/baselines/reference/defaultParameterTrailingComments.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
=== tests/cases/compiler/defaultParameterTrailingComments.ts ===
class C {
>C : Symbol(C, Decl(defaultParameterTrailingComments.ts, 0, 0))

constructor(defaultParam: boolean = false /* Emit only once*/) {}
>defaultParam : Symbol(defaultParam, Decl(defaultParameterTrailingComments.ts, 1, 16))
}

function foo(defaultParam = 10 /*emit only once*/) {}
>foo : Symbol(foo, Decl(defaultParameterTrailingComments.ts, 2, 1))
>defaultParam : Symbol(defaultParam, Decl(defaultParameterTrailingComments.ts, 4, 13))

14 changes: 14 additions & 0 deletions tests/baselines/reference/defaultParameterTrailingComments.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
=== tests/cases/compiler/defaultParameterTrailingComments.ts ===
class C {
>C : C

constructor(defaultParam: boolean = false /* Emit only once*/) {}
>defaultParam : boolean
>false : false
}

function foo(defaultParam = 10 /*emit only once*/) {}
>foo : (defaultParam?: number) => void
>defaultParam : number
>10 : 10

4 changes: 2 additions & 2 deletions tests/baselines/reference/parameterReferenceInInitializer1.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ function fn(y, set) {
var C = /** @class */ (function () {
function C(y, x // expected to work, but actually doesn't
) {
if (x === void 0) { x = fn(y, function (y, x) { return y.x = x; }); } // expected to work, but actually doesn't
this.x = x; // expected to work, but actually doesn't
if (x === void 0) { x = fn(y, function (y, x) { return y.x = x; }); }
this.x = x;
}
return C;
}());
5 changes: 5 additions & 0 deletions tests/cases/compiler/defaultParameterTrailingComments.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class C {
constructor(defaultParam: boolean = false /* Emit only once*/) {}
}

function foo(defaultParam = 10 /*emit only once*/) {}