Skip to content

Commit 0caa1f6

Browse files
committed
Emit trailing comments
1 parent c949543 commit 0caa1f6

File tree

448 files changed

+1709
-1703
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

448 files changed

+1709
-1703
lines changed

src/compiler/emitter.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1930,6 +1930,7 @@ module ts {
19301930

19311931
function emitTrailingDeclarationComments(node: Declaration) {
19321932
var trailingComments = getTrailingComments(currentSourceFile.text, node.end);
1933+
emitComments(trailingComments, writer, writeComment);
19331934
}
19341935

19351936
if (compilerOptions.sourceMap) {

tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ var p = new A.Point(0, 0); // unexpected error here, bug 840000
2828
//// [test.js]
2929
var p;
3030
var p = A.Point.Origin;
31-
var p = new A.Point(0, 0);
31+
var p = new A.Point(0, 0);// unexpected error here, bug 840000

tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ var A;
3737
//// [test.js]
3838
var p;
3939
var p = A.Point.Origin;
40-
var p = new A.Point(0, 0);
40+
var p = new A.Point(0, 0);// unexpected error here, bug 840000

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ var Point = (function () {
3030
}
3131
Point.Origin = function () {
3232
return { x: 0, y: 0 };
33-
};
33+
};// unexpected error here bug 840246
3434
return Point;
3535
})();
3636
var Point;
3737
(function (Point) {
3838
function Origin() {
3939
return null;
4040
}
41-
Point.Origin = Origin;
41+
Point.Origin = Origin;//expected duplicate identifier error
4242
})(Point || (Point = {}));
4343
var A;
4444
(function (A) {
@@ -49,15 +49,15 @@ var A;
4949
}
5050
Point.Origin = function () {
5151
return { x: 0, y: 0 };
52-
};
52+
};// unexpected error here bug 840246
5353
return Point;
5454
})();
5555
A.Point = Point;
5656
(function (Point) {
5757
function Origin() {
5858
return "";
5959
}
60-
Point.Origin = Origin;
60+
Point.Origin = Origin;//expected duplicate identifier error
6161
})(A.Point || (A.Point = {}));
6262
var Point = A.Point;
6363
})(A || (A = {}));

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var Point;
3737
(function (Point) {
3838
function Origin() {
3939
return "";
40-
}
40+
}// not an error, since not exported
4141
})(Point || (Point = {}));
4242
var A;
4343
(function (A) {
@@ -55,7 +55,7 @@ var A;
5555
(function (Point) {
5656
function Origin() {
5757
return "";
58-
}
58+
}// not an error since not exported
5959
})(A.Point || (A.Point = {}));
6060
var Point = A.Point;
6161
})(A || (A = {}));

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ var Point = (function () {
3333
})();
3434
var Point;
3535
(function (Point) {
36-
Point.Origin = "";
36+
Point.Origin = "";//expected duplicate identifier error
3737
})(Point || (Point = {}));
3838
var A;
3939
(function (A) {
@@ -47,7 +47,7 @@ var A;
4747
})();
4848
A.Point = Point;
4949
(function (Point) {
50-
Point.Origin = "";
50+
Point.Origin = "";//expected duplicate identifier error
5151
})(A.Point || (A.Point = {}));
5252
var Point = A.Point;
5353
})(A || (A = {}));

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ var Point = (function () {
3333
})();
3434
var Point;
3535
(function (Point) {
36-
var Origin = "";
36+
var Origin = "";// not an error, since not exported
3737
})(Point || (Point = {}));
3838
var A;
3939
(function (A) {
@@ -47,7 +47,7 @@ var A;
4747
})();
4848
A.Point = Point;
4949
(function (Point) {
50-
var Origin = "";
50+
var Origin = "";// not an error since not exported
5151
})(A.Point || (A.Point = {}));
5252
var Point = A.Point;
5353
})(A || (A = {}));

tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ var X;
6969
//// [test.js]
7070
//var cl: { x: number; y: number; }
7171
var cl = new X.Y.Point(1, 1);
72-
var cl = X.Y.Point.Origin;
72+
var cl = X.Y.Point.Origin;// error not expected here same as bug 83996 ?
7373
//// [simple.js]
7474
var A = (function () {
7575
function A() {

tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ var fn;
6464
var fn = A.Point;
6565
var cl;
6666
var cl = A.Point();
67-
var cl = A.Point.Origin;
67+
var cl = A.Point.Origin;// not expected to be an error.
6868
//// [simple.js]
6969
var B;
7070
(function (B) {
@@ -78,7 +78,7 @@ var B;
7878
var Point = B.Point;
7979
})(B || (B = {}));
8080
var fn;
81-
var fn = B.Point;
81+
var fn = B.Point;// not expected to be an error. bug 840000: [corelang] Function of fundule not assignalbe as expected
8282
var cl;
8383
var cl = B.Point();
8484
var cl = B.Point.Origin;

tests/baselines/reference/InvalidNonInstantiatedModule.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ var x: typeof M; // Error only a namespace
99

1010

1111
//// [InvalidNonInstantiatedModule.js]
12-
var m = M;
13-
var x;
12+
var m = M;// Error, not instantiated can not be used as var
13+
var x;// Error only a namespace

tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var A;
5151
var fn;
5252
var fn = A.fn;
5353
var fng;
54-
var fng = A.fng;
54+
var fng = A.fng;// bug 838015
5555
// these should be errors since the functions are not exported
5656
var fn2 = A.fn2;
5757
var fng2 = A.fng2;

tests/baselines/reference/ParameterList7.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ class C1 {
99
var C1 = (function () {
1010
function C1(p3) {
1111
this.p3 = p3;
12-
}
12+
}// OK
1313
return C1;
1414
})();

tests/baselines/reference/additionOperatorWithInvalidOperands.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ var r2 = a + b;
7070
var r3 = a + c;
7171
// number + every type except any and string
7272
var r4 = b + a;
73-
var r5 = b + b;
73+
var r5 = b + b;// number + number is valid
7474
var r6 = b + c;
7575
// object + every type except any and string
7676
var r7 = c + a;

tests/baselines/reference/additionOperatorWithTypeParameter.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ function foo(t, u) {
5454
var g;
5555
var f;
5656
// type parameter as left operand
57-
var r1 = t + a;
57+
var r1 = t + a;// ok, one operand is any
5858
var r2 = t + b;
5959
var r3 = t + c;
60-
var r4 = t + d;
60+
var r4 = t + d;// ok, one operand is string
6161
var r5 = t + e;
6262
var r6 = t + g;
6363
var r7 = t + f;
6464
// type parameter as right operand
65-
var r8 = a + t;
65+
var r8 = a + t;// ok, one operand is any
6666
var r9 = b + t;
6767
var r10 = c + t;
68-
var r11 = d + t;
68+
var r11 = d + t;// ok, one operand is string
6969
var r12 = e + t;
7070
var r13 = g + t;
7171
var r14 = f + t;

tests/baselines/reference/aliasBug.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ var provide = foo;
4646
var booz = foo.bar.baz;
4747
var p = new provide.Provide();
4848
function use() {
49-
var p1;
49+
var p1;// error here, but should be okay
5050
var p2;
5151
var p3;
5252
var p22 = new provide.Provide();

tests/baselines/reference/aliasOnMergedModuleInterface.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be err
2525
//// [aliasOnMergedModuleInterface_1.js]
2626
var z;
2727
z.bar("hello");
28-
var x = foo.bar("hello");
28+
var x = foo.bar("hello");// foo.A should be ok but foo.bar should be error

tests/baselines/reference/ambiguousOverloadResolution.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ var B = (function (_super) {
2828
return B;
2929
})(A);
3030
var x;
31-
var t = f(x, x);
31+
var t = f(x, x);// Not an error

tests/baselines/reference/anyAsConstructor.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ var a = new x();
1818
var b = new x('hello');
1919
var c = new x(x);
2020
// grammar allows this for constructors
21-
var d = new x(x);
21+
var d = new x(x);// no error

tests/baselines/reference/anyAssignabilityInInheritance.js

+17-17
Original file line numberDiff line numberDiff line change
@@ -90,40 +90,40 @@ var r3 = foo3(a); // any
9090

9191
//// [anyAssignabilityInInheritance.js]
9292
var a;
93-
var r3 = foo2(a);
94-
var r3 = foo3(a);
95-
var r3 = foo3(a);
96-
var r3 = foo3(a);
97-
var r3 = foo3(a);
98-
var r3 = foo3(a);
99-
var r3 = foo3(a);
100-
var r3 = foo3(a);
93+
var r3 = foo2(a);// any, not a subtype of number so it skips that overload, is a subtype of itself so it picks second (if truly ambiguous it would pick first overload)
94+
var r3 = foo3(a);// any
95+
var r3 = foo3(a);// any
96+
var r3 = foo3(a);// any
97+
var r3 = foo3(a);// any
98+
var r3 = foo3(a);// any
99+
var r3 = foo3(a);// any
100+
var r3 = foo3(a);// any
101101
var A = (function () {
102102
function A() {
103103
}
104104
return A;
105105
})();
106-
var r3 = foo3(a);
106+
var r3 = foo3(a);// any
107107
var A2 = (function () {
108108
function A2() {
109109
}
110110
return A2;
111111
})();
112-
var r3 = foo3(a);
113-
var r3 = foo3(a);
114-
var r3 = foo3(a);
112+
var r3 = foo3(a);// any
113+
var r3 = foo3(a);// any
114+
var r3 = foo3(a);// any
115115
var E;
116116
(function (E) {
117117
E[E["A"] = 0] = "A";
118118
})(E || (E = {}));
119-
var r3 = foo3(a);
119+
var r3 = foo3(a);// any
120120
function f() {
121121
}
122122
var f;
123123
(function (f) {
124124
f.bar = 1;
125125
})(f || (f = {}));
126-
var r3 = foo3(a);
126+
var r3 = foo3(a);// any
127127
var CC = (function () {
128128
function CC() {
129129
}
@@ -133,6 +133,6 @@ var CC;
133133
(function (CC) {
134134
CC.bar = 1;
135135
})(CC || (CC = {}));
136-
var r3 = foo3(a);
137-
var r3 = foo3(a);
138-
var r3 = foo3(a);
136+
var r3 = foo3(a);// any
137+
var r3 = foo3(a);// any
138+
var r3 = foo3(a);// any

0 commit comments

Comments
 (0)