8000 Merge pull request #7731 from Myste/master · icssjs/TypeScript@0556b15 · GitHub
[go: up one dir, main page]
Skip to content 8000

Commit 0556b15

Browse files
mhegazymhegazy
committed
Merge pull request microsoft#7731 from Myste/master
Fix microsoft#7101
2 parents 25f8ef3 + 7ce43d4 commit 0556b15

File tree

5 files changed

+66
-1
lines changed

5 files changed

+66
-1
lines changed

‎src/compiler/emitter.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4609,7 +4609,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
46094609
}
46104610

46114611
emitEnd(node);
4612-
if (kind !== SyntaxKind.MethodDeclaration && kind !== SyntaxKind.MethodSignature) {
4612+
if (kind !== SyntaxKind.MethodDeclaration &&
4613+
kind !== SyntaxKind.MethodSignature &&
4614+
kind !== SyntaxKind.ArrowFunction) {
46134615
emitTrailingComments(node);
46144616
}
46154617
}

‎tests/baselines/reference/commentsAfterFunctionExpression1.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//// [commentsAfterFunctionExpression1.ts]
2+
var v = {
3+
f: a => 0 /*t1*/,
4+
g: (a => 0) /*t2*/,
5+
h: (a => 0 /*t3*/)
6+
}
7+
8+
9+
//// [commentsAfterFunctionExpression1.js]
10+
var v = {
11+
f: function (a) { return 0; } /*t1*/,
12+
g: (function (a) { return 0; }) /*t2*/,
13+
h: (function (a) { return 0; } /*t3*/)
14+
};

‎tests/baselines/reference/commentsAfterFunctionExpression1.symbols

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
=== tests/cases/compiler/commentsAfterFunctionExpression1.ts ===
2+
var v = {
3+
>v : Symbol(v, Decl(commentsAfterFunctionExpression1.ts, 0, 3))
4+
5+
f: a => 0 /*t1*/,
6+
>f : Symbol(f, Decl(commentsAfterFunctionExpression1.ts, 0, 9))
7+
>a : Symbol(a, Decl(commentsAfterFunctionExpression1.ts, 1, 6))
8+
9+
g: (a => 0) /*t2*/,
10+
>g : Symbol(g, Decl(commentsAfterFunctionExpression1.ts, 1, 21))
11+
>a : Symbol(a, Decl(commentsAfterFunctionExpression1.ts, 2, 8))
12+
13+
h: (a => 0 /*t3*/)
14+
>h : Symbol(h, Decl(commentsAfterFunctionExpression1.ts, 2, 23))
15+
>a : Symbol(a, Decl(commentsAfterFunctionExpression1.ts, 3, 8))
16+
}
17+

‎tests/baselines/reference/commentsAfterFunctionExpression1.types

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
=== tests/cases/compiler/commentsAfterFunctionExpression1.ts ===
2+
var v = {
3+
>v : { f: (a: any) => number; g: (a: any) => number; h: (a: any) => number; }
4+
>{ f: a => 0 /*t1*/, g: (a => 0) /*t2*/, h: (a => 0 /*t3*/)} : { f: (a: any) => number; g: (a: any) => number; h: (a: any) => number; }
5+
6+
f: a => 0 /*t1*/,
7+
>f : (a: any) => number
8+
>a => 0 : (a: any) => number
9+
>a : any
10+
>0 : number
11+
12+
g: (a => 0) /*t2*/,
13+
>g : (a: any) => number
14+
>(a => 0) : (a: any) => number
15+
>a => 0 : (a: any) => number
16+
>a : any
17+
>0 : number
18+
19+
h: (a => 0 /*t3*/)
20+
>h : (a: any) => number
21+
>(a => 0 /*t3*/) : (a: any) => number
22+
>a => 0 : (a: any) => number
23+
>a : any
24+
>0 : number
25+
}
26+

‎tests/cases/compiler/commentsAfterFunctionExpression1.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// @removeComments: false
2+
var v = {
3+
f: a => 0 /*t1*/,
4+
g: (a => 0) /*t2*/,
5+
h: (a => 0 /*t3*/)
6+
}

0 commit comments

Comments
 (0)
0