Skip to content

Commit 6c934aa

Browse files
committed
Merge pull request microsoft#3030 from Microsoft/lineEndings
Harness now reports a difference in line endings when comparing baselines
2 parents e62db55 + ed7df81 commit 6c934aa

10 files changed

+82
-90
lines changed

src/harness/harness.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1610,7 +1610,6 @@ module Harness {
16101610
export module Baseline {
16111611

16121612
export interface BaselineOptions {
1613-
LineEndingSensitive?: boolean;
16141613
Subfolder?: string;
16151614
Baselinefolder?: string;
16161615
}
@@ -1702,13 +1701,6 @@ module Harness {
17021701
expected = IO.readFile(refFileName);
17031702
}
17041703

1705-
var lineEndingSensitive = opts && opts.LineEndingSensitive;
1706-
1707-
if (!lineEndingSensitive) {
1708-
expected = expected.replace(/\r\n?/g, '\n');
1709-
actual = actual.replace(/\r\n?/g, '\n');
1710-
}
1711-
17121704
return { expected, actual };
17131705
}
17141706

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
//// [newLineFlagWithCRLF.ts]
1+
//// [newLineFlagWithCRLF.ts]
22
var x=1;
33
x=2;
44

5-
6-
7-
//// [newLineFlagWithCRLF.js]
8-
var x = 1;
9-
x = 2;
5+
6+
7+
//// [newLineFlagWithCRLF.js]
8+
var x = 1;
9+
x = 2;
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
=== tests/cases/compiler/newLineFlagWithCRLF.ts ===
2-
var x=1;
3-
>x : Symbol(x, Decl(newLineFlagWithCRLF.ts, 0, 3))
4-
5-
x=2;
6-
>x : Symbol(x, Decl(newLineFlagWithCRLF.ts, 0, 3))
7-
8-
1+
=== tests/cases/compiler/newLineFlagWithCRLF.ts ===
2+
var x=1;
3+
>x : Symbol(x, Decl(newLineFlagWithCRLF.ts, 0, 3))
4+
5+
x=2;
6+
>x : Symbol(x, Decl(newLineFlagWithCRLF.ts, 0, 3))
7+
8+
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
=== tests/cases/compiler/newLineFlagWithCRLF.ts ===
2-
var x=1;
3-
>x : number
4-
>1 : number
5-
6-
x=2;
7-
>x=2 : number
8-
>x : number
9-
>2 : number
10-
11-
1+
=== tests/cases/compiler/newLineFlagWithCRLF.ts ===
2+
var x=1;
3+
>x : number
4+
>1 : number
5+
6+
x=2;
7+
>x=2 : number
8+
>x : number
9+
>2 : number
10+
11+
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
//// [newLineFlagWithLF.ts]
1+
//// [newLineFlagWithLF.ts]
22
var x=1;
33
x=2;
44

5-
6-
7-
//// [newLineFlagWithLF.js]
5+
6+
7+
//// [newLineFlagWithLF.js]
88
var x = 1;
99
x = 2;
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
=== tests/cases/compiler/newLineFlagWithLF.ts ===
2-
var x=1;
3-
>x : Symbol(x, Decl(newLineFlagWithLF.ts, 0, 3))
4-
5-
x=2;
6-
>x : Symbol(x, Decl(newLineFlagWithLF.ts, 0, 3))
7-
8-
1+
=== tests/cases/compiler/newLineFlagWithLF.ts ===
2+
var x=1;
3+
>x : Symbol(x, Decl(newLineFlagWithLF.ts, 0, 3))
4+
5+
x=2;
6+
>x : Symbol(x, Decl(newLineFlagWithLF.ts, 0, 3))
7+
8+
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
=== tests/cases/compiler/newLineFlagWithLF.ts ===
2-
var x=1;
3-
>x : number
4-
>1 : number
5-
6-
x=2;
7-
>x=2 : number
8-
>x : number
9-
>2 : number
10-
11-
1+
=== tests/cases/compiler/newLineFlagWithLF.ts ===
2+
var x=1;
3+
>x : number
4+
>1 : number
5+
6+
x=2;
7+
>x=2 : number
8+
>x : number
9+
>2 : number
10+
11+
Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
//// [noEmitHelpers.ts]
1+
//// [noEmitHelpers.ts]
22

33
class A { }
44
class B extends A { }
5-
6-
7-
//// [noEmitHelpers.js]
8-
var A = (function () {
9-
function A() {
10-
}
11-
return A;
12-
})();
13-
var B = (function (_super) {
14-
__extends(B, _super);
15-
function B() {
16-
_super.apply(this, arguments);
17-
}
18-
return B;
19-
})(A);
5+
6+
7+
//// [noEmitHelpers.js]
8+
var A = (function () {
9+
function A() {
10+
}
11+
return A;
12+
})();
13+
var B = (function (_super) {
14+
__extends(B, _super);
15+
function B() {
16+
_super.apply(this, arguments);
17+
}
18+
return B;
19+
})(A);
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
=== tests/cases/compiler/noEmitHelpers.ts ===
2-
3-
class A { }
4-
>A : Symbol(A, Decl(noEmitHelpers.ts, 0, 0))
5-
6-
class B extends A { }
7-
>B : Symbol(B, Decl(noEmitHelpers.ts, 1, 11))
8-
>A : Symbol(A, Decl(noEmitHelpers.ts, 0, 0))
9-
1+
=== tests/cases/compiler/noEmitHelpers.ts ===
2+
3+
class A { }
4+
>A : Symbol(A, Decl(noEmitHelpers.ts, 0, 0))
5+
6+
class B extends A { }
7+
>B : Symbol(B, Decl(noEmitHelpers.ts, 1, 11))
8+
>A : Symbol(A, Decl(noEmitHelpers.ts, 0, 0))
9+
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
=== tests/cases/compiler/noEmitHelpers.ts ===
2-
3-
class A { }
4-
>A : A
5-
6-
class B extends A { }
7-
>B : B
8-
>A : A
9-
1+
=== tests/cases/compiler/noEmitHelpers.ts ===
2+
3+
class A { }
4+
>A : A
5+
6+
class B extends A { }
7+
>B : B
8+
>A : A
9+

0 commit comments

Comments
 (0)