File tree Expand file tree Collapse file tree 4 files changed +67
-2
lines changed Expand file tree Collapse file tree 4 files changed +67
-2
lines changed Original file line number Diff line number Diff line change @@ -2077,6 +2077,11 @@ namespace ts {
2077
2077
2078
2078
// Push all text changes.
2079
2079
for ( let i = firstLine ; i <= lastLine ; i ++ ) {
2080
+ // If the range is multiline and ends on a beginning of a line, don't comment/uncomment.
2081
+ if ( firstLine !== lastLine && lineStarts [ i ] === textRange . end ) {
2082
+ continue ;
2083
+ }
2084
+
2080
2085
const lineTextStart = lineTextStarts . get ( i . toString ( ) ) ;
2081
2086
2082
2087
// If the line is not an empty line; otherwise no-op.
Original file line number Diff line number Diff line change
1
+ // When textRange contain multiple lines and ends on a beginning of a line, don't comment/uncomment the last line.
2
+
3
+ //@Filename : file.tsx
4
+ //// [|const a = 0;
5
+ //// const b = 1;
6
+ //// |]const c = 2;
7
+ ////
8
+ //// const d = <div>
9
+ //// [|<div>
10
+ //// SomeText
11
+ //// |] </div>
12
+ //// </div>;
13
+ ////
14
+ //// [|//const e = 0;
15
+ //// //const f = 1;
16
+ //// |]//const g = 2;
17
+ ////
18
+ //// const h = <div>
19
+ //// [|{/*<div>*/}
20
+ //// {/* SomeText*/}
21
+ //// |]{/*</div>*/}
22
+ //// </div>;
23
+
24
+
25
+ verify . toggleLineComment (
26
+ `//const a = 0;
27
+ //const b = 1;
28
+ const c = 2;
29
+
30
+ const d = <div>
31
+ {/*<div>*/}
32
+ {/* SomeText*/}
33
+ </div>
34
+ </div>;
35
+
36
+ const e = 0;
37
+ const f = 1;
38
+ //const g = 2;
39
+
40
+ const h = <div>
41
+ <div>
42
+ SomeText
43
+ {/*</div>*/}
44
+ </div>;` ) ;
Original file line number Diff line number Diff line change 13
13
//// let var9 = 3;*/|]
14
14
////
15
15
//// let var10[||] = 10;
16
+ ////
17
+ //// [|let var11 = 11;
18
+ //// let var12 = 12;
19
+ //// |]let var13 = 13;
16
20
17
21
verify . toggleMultilineComment (
18
22
`let var1/* = 1;
@@ -27,4 +31,8 @@ let var7 = 1;
27
31
let var8 = 2;
28
32
let var9 = 3;
29
33
30
- let var10/**/ = 10;` ) ;
34
+ let var10/**/ = 10;
35
+
36
+ /*let var11 = 11;
37
+ let var12 = 12;
38
+ */let var13 = 13;` ) ;
Original file line number Diff line number Diff line change 19
19
//// let var13 */= 3;
20
20
////
21
21
//// ////let var14 [||]= 14;
22
+ ////
23
+ //// [|//let var15 = 15;
24
+ //// //let var16 = 16;
25
+ //// |]//let var17 = 17;
22
26
23
27
verify . uncommentSelection (
24
28
`let var1 = 1;
@@ -39,4 +43,8 @@ let var11 = 1;
39
43
let var12 = 2;
40
44
let var13 = 3;
41
45
42
- //let var14 = 14;` ) ;
46
+ //let var14 = 14;
47
+
48
+ let var15 = 15;
49
+ let var16 = 16;
50
+ //let var17 = 17;` ) ;
You can’t perform that action at this time.
0 commit comments