Skip to content

Commit 8d77a8e

Browse files
mkubilaykmkubilayk
authored
fix duplicated trailing comments (#64)
1 parent 30805b7 commit 8d77a8e

13 files changed

+40
-46
lines changed

‎src/compiler/transformers/classFields.ts‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -352,31 +352,39 @@ namespace ts {
352352
}
353353

354354
function createPrivateIdentifierAccessHelper(info: PrivateIdentifierInfo, receiver: Expression): Expression {
355+
let getExpression: Expression;
356+
355357
switch(info.kind) {
356358
case PrivateIdentifierKind.Accessor:
357-
return context.getEmitHelperFactory().createClassPrivateFieldGetHelper(
359+
getExpression = context.getEmitHelperFactory().createClassPrivateFieldGetHelper(
358360
receiver,
359361
info.brandCheckIdentifier,
360362
info.kind,
361363
info.getterName
362364
);
365+
break;
363366
case PrivateIdentifierKind.Method:
364-
return context.getEmitHelperFactory().createClassPrivateFieldGetHelper(
367+
getExpression = context.getEmitHelperFactory().createClassPrivateFieldGetHelper(
365368
receiver,
366369
info.brandCheckIdentifier,
367370
info.kind,
368371
info.methodName
369372
);
373+
break;
370374
case PrivateIdentifierKind.Field:
371-
return context.getEmitHelperFactory().createClassPrivateFieldGetHelper(
375+
getExpression = context.getEmitHelperFactory().createClassPrivateFieldGetHelper(
372376
receiver,
373377
info.brandCheckIdentifier,
374378
info.kind,
375379
info.variableName
376380
);
381+
break;
377382
default:
378383
Debug.assertNever(info, "Unknown private element type");
379384
}
385+
386+
setCommentRange(receiver, getExpression);
387+
return getExpression;
380388
}
381389

382390
function visitPropertyAccessExpression(node: PropertyAccessExpression) {
@@ -555,7 +563,7 @@ namespace ts {
555563
return visitEachChild(node, visitor, context);
556564
}
557565

558-
function createPrivateIdentifierAssignment(info: PrivateIdentifierInfo, receiver: Expression, right: Expression, operator: AssignmentOperator) {
566+
function createPrivateIdentifierAssignment(info: PrivateIdentifierInfo, receiver: Expression, right: Expression, operator: AssignmentOperator): Expression {
559567
receiver = visitNode(receiver, visitor, isExpression);
560568
right = visitNode(right, visitor, isExpression);
561569

@@ -569,34 +577,42 @@ namespace ts {
569577
);
570578
}
571579

580+
let setExpression: Expression;
581+
572582
switch(info.kind) {
573583
case PrivateIdentifierKind.Accessor:
574-
return context.getEmitHelperFactory().createClassPrivateFieldSetHelper(
584+
setExpression = context.getEmitHelperFactory().createClassPrivateFieldSetHelper(
575585
receiver,
576586
info.brandCheckIdentifier,
577587
right,
578588
info.kind,
579589
info.setterName
580590
);
591+
break;
581592
case PrivateIdentifierKind.Method:
582-
return context.getEmitHelperFactory().createClassPrivateFieldSetHelper(
593+
setExpression = context.getEmitHelperFactory().createClassPrivateFieldSetHelper(
583594
receiver,
584595
info.brandCheckIdentifier,
585596
right,
586597
info.kind,
587598
/* f */ undefined
588599
);
600+
break;
589601
case PrivateIdentifierKind.Field:
590-
return context.getEmitHelperFactory().createClassPrivateFieldSetHelper(
602+
setExpression = context.getEmitHelperFactory().createClassPrivateFieldSetHelper(
591603
receiver,
592604
info.brandCheckIdentifier,
593605
right,
594606
info.kind,
595607
info.variableName
596608
);
609+
break;
597610
default:
598611
Debug.assertNever(info, "Unknown private element type");
599612
}
613+
614+
setCommentRange(receiver, setExpression);
615+
return setExpression;
600616
}
601617

602618
/**

‎tests/baselines/reference/privateNameAndAny.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,10 @@ class A {
4141
}
4242
method(thing) {
4343
__classPrivateFieldGet(thing, _A_foo, "f"); // OK
44-
__classPrivateFieldGet(// OK
45-
thing, _a, "m", _A_m).call(// OK
46-
thing);
44+
__classPrivateFieldGet(thing, _a, "m", _A_m).call(thing);
4745
__classPrivateFieldGet(thing, _a, "f", _A_baz);
4846
thing.; // Error
49-
__classPrivateFieldGet(// Error
50-
thing, _A_foo, "f").call(// Error
51-
thing);
47+
__classPrivateFieldGet(thing, _A_foo, "f").call(thing);
5248
}
5349
methodU(thing) {
5450
__classPrivateFieldGet(thing, _A_foo, "f");

‎tests/baselines/reference/privateNameMethod.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ class A1 {
2525
_A1_instances.add(this);
2626
__classPrivateFieldGet(this, _A1_instances, "m", _A1_method).call(this, "");
2727
__classPrivateFieldGet(this, _A1_instances, "m", _A1_method).call(this, 1); // Error
28-
__classPrivateFieldGet(// Error
29-
this, _A1_instances, "m", _A1_method).call(// Error
30-
this); // Error
28+
__classPrivateFieldGet(this, _A1_instances, "m", _A1_method).call(this); // Error
3129
}
3230
}
3331
_A1_instances = new WeakSet(), _A1_method = function _A1_method(param) {

‎tests/baselines/reference/privateNameMethodAssignment.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ class A3 {
3030
var _a, _b;
3131
_A3_instances.add(this);
3232
__classPrivateFieldSet(this, _A3_instances, () => { }, "m"); // Error, not writable
33-
__classPrivateFieldSet(// Error, not writable
34-
a, _A3_instances, () => { }, "m"); // Error, not writable
35-
__classPrivateFieldSet(// Error, not writable
36-
b, _A3_instances, () => { }, "m"); //Error, not writable
33+
__classPrivateFieldSet(a, _A3_instances, () => { }, "m"); // Error, not writable
34+
__classPrivateFieldSet(b, _A3_instances, () => { }, "m"); //Error, not writable
3735
(_a = this, { x: ({ set value(_b) { __classPrivateFieldSet(_a, _A3_instances, _b, "m"); } }).value } = { x: () => { } }); //Error, not writable
3836
let x = __classPrivateFieldGet(this, _A3_instances, "m", _A3_method);
3937
__classPrivateFieldSet(_b = b, _A3_instances, +__classPrivateFieldGet(_b, _A3_instances, "m", _A3_method) + 1, "m"); //Error, not writable

‎tests/baselines/reference/privateNameNestedMethodAccess.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ class C {
4343
_D_instances.add(this);
4444
__classPrivateFieldGet(new C(), _C_foo, "f");
4545
__classPrivateFieldGet(new C(), _D_instances, "m", _D_bar); // Error
46-
__classPrivateFieldGet(// Error
47-
new C(), _C_instances, "a", _C_baz_get);
46+
__classPrivateFieldGet(new C(), _C_instances, "a", _C_baz_get);
4847
__classPrivateFieldGet(new D(), _D_instances, "m", _D_bar);
4948
}
5049
n(x) {

‎tests/baselines/reference/privateNameStaticFieldDerivedClasses.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ var _a, _Base_prop, _b, _Derived_derivedProp;
3232
class Base {
3333
static method(x) {
3434
Derived.; // error
35-
__classPrivateFieldSet(// error
36-
Base, _a, 10, "f", _Base_prop);
35+
__classPrivateFieldSet(Base, _a, 10, "f", _Base_prop);
3736
}
3837
}
3938
_a = Base;

‎tests/baselines/reference/privateNameStaticMethod.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ class A1 {
2424
constructor() {
2525
__classPrivateFieldGet(A1, _a, "m", _A1_method).call(A1, "");
2626
__classPrivateFieldGet(A1, _a, "m", _A1_method).call(A1, 1); // Error
27-
__classPrivateFieldGet(// Error
28-
A1, _a, "m", _A1_method).call(// Error
29-
A1); // Error
27+
__classPrivateFieldGet(A1, _a, "m", _A1_method).call(A1); // Error
3028
}
3129
}
3230
_a = A1, _A1_method = function _A1_method(param) {

‎tests/baselines/reference/privateNameStaticMethodAssignment.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@ class A3 {
2929
constructor(a, b) {
3030
var _b;
3131
__classPrivateFieldSet(A3, _a, () => { }, "m"); // Error, not writable
32-
__classPrivateFieldSet(// Error, not writable
33-
a, _a, () => { }, "m"); // Error, not writable
34-
__classPrivateFieldSet(// Error, not writable
35-
b, _a, () => { }, "m"); //Error, not writable
32+
__classPrivateFieldSet(a, _a, () => { }, "m"); // Error, not writable
33+
__classPrivateFieldSet(b, _a, () => { }, "m"); //Error, not writable
3634
({ x: ({ set value(_b) { __classPrivateFieldSet(A3, _a, _b, "m"); } }).value } = { x: () => { } }); //Error, not writable
3735
let x = __classPrivateFieldGet(A3, _a, "m", _A3_method);
3836
__classPrivateFieldSet(_b = b, _a, +__classPrivateFieldGet(_b, _a, "m", _A3_method) + 1, "m"); //Error, not writable

‎tests/baselines/reference/privateNamesAndStaticFields.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ class A {
4040
constructor() {
4141
__classPrivateFieldSet(A, _a, 3, "f", _A_foo);
4242
__classPrivateFieldGet(B, _a, "f", _A_foo); // Error
43-
__classPrivateFieldGet(// Error
44-
B, _a, "f", _A_bar); // Error
43+
__classPrivateFieldGet(B, _a, "f", _A_bar); // Error
4544
}
4645
}
4746
_a = A;

‎tests/baselines/reference/privateNamesConstructorChain-1.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ class Parent {
2727
}
2828
accessChildProps() {
2929
__classPrivateFieldGet(new Child(), _Parent_foo, "f"); // OK (`#foo` was added when `Parent`'s constructor was called on `child`)
30-
__classPrivateFieldGet(// OK (`#foo` was added when `Parent`'s constructor was called on `child`)
31-
Child, _a, "f", _Parent_bar); // Error: not found
30+
__classPrivateFieldGet(Child, _a, "f", _Parent_bar); // Error: not found
3231
}
3332
}
3433
_a = Parent, _Parent_foo = new WeakMap();

0 commit comments

Comments
 (0)