Skip to content

Commit 8d6e48a

Browse files
committed
Change the meaning of useNonAdjustedStartPosition
Old: getFullStart New: getStart Impact: only used in tests Reason: symmetry with useNonAdjustedEndPosition - both now effectively mean "exclude trivia from range"
1 parent 6435d26 commit 8d6e48a

File tree

10 files changed

+33
-9
lines changed

10 files changed

+33
-9
lines changed

src/services/textChanges.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ namespace ts.textChanges {
2828
}
2929

3030
export interface ConfigurableStart {
31+
/** True to use getStart() (NB, not getFullStart()) without adjustment. */
3132
useNonAdjustedStartPosition?: boolean;
3233
}
3334
export interface ConfigurableEnd {
35+
/** True to use getEnd() without adjustment. */
3436
useNonAdjustedEndPosition?: boolean;
3537
}
3638

@@ -132,7 +134,7 @@ namespace ts.textChanges {
132134

133135
export function getAdjustedStartPosition(sourceFile: SourceFile, node: Node, options: ConfigurableStart, position: Position) {
134136
if (options.useNonAdjustedStartPosition) {
135-
return node.getFullStart();
137+
return node.getStart();
136138
}
137139
const fullStart = node.getFullStart();
138140
const start = node.getStart(sourceFile);

tests/baselines/reference/textChanges/deleteNode2.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ var z = 3; // comment 4
99

1010
===MODIFIED===
1111

12-
var x = 1;var z = 3; // comment 4
12+
var x = 1; // some comment - 1
13+
/**
14+
* comment 2
15+
*/
16+
var z = 3; // comment 4

tests/baselines/reference/textChanges/deleteNode4.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,9 @@ var z = 3; // comment 4
99

1010
===MODIFIED===
1111

12-
var x = 1; // comment 3
12+
var x = 1; // some comment - 1
13+
/**
14+
* comment 2
15+
*/
16+
// comment 3
1317
var z = 3; // comment 4

tests/baselines/reference/textChanges/deleteNodeRange2.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@ var a = 4; // comment 7
1111
===MODIFIED===
1212

1313
// comment 1
14-
var x = 1;// comment 6
14+
var x = 1; // comment 2
15+
// comment 3
16+
// comment 6
1517
var a = 4; // comment 7

tests/baselines/reference/textChanges/deleteNodeRange4.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ var a = 4; // comment 7
1111
===MODIFIED===
1212

1313
// comment 1
14-
var x = 1; // comment 5
14+
var x = 1; // comment 2
15+
// comment 3
16+
// comment 5
1517
// comment 6
1618
var a = 4; // comment 7

tests/baselines/reference/textChanges/replaceNode2.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ var a = 4; // comment 7
1010
===MODIFIED===
1111

1212
// comment 1
13-
var x = 1;
13+
var x = 1; // comment 2
14+
// comment 3
15+
1416
public class class1 implements interface1
1517
{
1618
property1: boolean;

tests/baselines/reference/textChanges/replaceNode4.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ var a = 4; // comment 7
1010
===MODIFIED===
1111

1212
// comment 1
13-
var x = 1;public class class1 implements interface1
13+
var x = 1; // comment 2
14+
// comment 3
15+
public class class1 implements interface1
1416
{
1517
property1: boolean;
1618
} // comment 4

tests/baselines/reference/textChanges/replaceNode5.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ var z = 3; // comment 5
88
// comment 6
99
var a = 4; // comment 7
1010
===MODIFIED===
11+
12+
// comment 1
1113
public class class1 implements interface1
1214
{
1315
property1: boolean;

tests/baselines/reference/textChanges/replaceNodeRange2.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ var a = 4; // comment 7
1010
===MODIFIED===
1111

1212
// comment 1
13-
var x = 1;
13+
var x = 1; // comment 2
14+
// comment 3
15+
1416
public class class1 implements interface1
1517
{
1618
property1: boolean;

tests/baselines/reference/textChanges/replaceNodeRange4.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ var a = 4; // comment 7
1010
===MODIFIED===
1111

1212
// comment 1
13-
var x = 1;public class class1 implements interface1
13+
var x = 1; // comment 2
14+
// comment 3
15+
public class class1 implements interface1
1416
{
1517
property1: boolean;
1618
} // comment 5

0 commit comments

Comments
 (0)