Skip to content

Commit 257287b

Browse files
uhyouhyo
committed
accept baseline changes
1 parent 984d088 commit 257287b

6 files changed

+8
-44
lines changed

‎src/compiler/scanner.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace ts {
3636
reScanSlashToken(): SyntaxKind;
3737
reScanAsteriskEqualsToken(): SyntaxKind;
3838
reScanTemplateToken(isTaggedTemplate: boolean): SyntaxKind;
39-
reScanTemplateHeadOrNoSubstitutionTemplate(isTaggedTemplate: boolean): SyntaxKind;
39+
reScanTemplateHeadOrNoSubstitutionTemplate(isTaggedTemplate?: boolean): SyntaxKind;
4040
scanJsxIdentifier(): SyntaxKind;
4141
scanJsxAttributeValue(): SyntaxKind;
4242
reScanJsxAttributeValue(): SyntaxKind;
@@ -2211,9 +2211,9 @@ namespace ts {
22112211
return token = scanTemplateAndSetTokenValue(isTaggedTemplate, true);
22122212
}
22132213

2214-
function reScanTemplateHeadOrNoSubstitutionTemplate(isTaggedTemplate: boolean): SyntaxKind {
2214+
function reScanTemplateHeadOrNoSubstitutionTemplate(isTaggedTemplate?: boolean): SyntaxKind {
22152215
pos = tokenPos;
2216-
return token = scanTemplateAndSetTokenValue(isTaggedTemplate, true);
2216+
return token = scanTemplateAndSetTokenValue(isTaggedTemplate || false, true);
22172217
}
22182218

22192219
function reScanJsxToken(): JsxTokenSyntaxKind {

‎tests/baselines/reference/api/tsserverlibrary.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3954,7 +3954,7 @@ declare namespace ts {
39543954
reScanSlashToken(): SyntaxKind;
39553955
reScanAsteriskEqualsToken(): SyntaxKind;
39563956
reScanTemplateToken(isTaggedTemplate: boolean): SyntaxKind;
3957-
reScanTemplateHeadOrNoSubstitutionTemplate(): SyntaxKind;
3957+
reScanTemplateHeadOrNoSubstitutionTemplate(isTaggedTemplate: boolean): SyntaxKind;
39583958
scanJsxIdentifier(): SyntaxKind;
39593959
scanJsxAttributeValue(): SyntaxKind;
39603960
reScanJsxAttributeValue(): SyntaxKind;

‎tests/baselines/reference/api/typescript.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3954,7 +3954,7 @@ declare namespace ts {
39543954
reScanSlashToken(): SyntaxKind;
39553955
reScanAsteriskEqualsToken(): SyntaxKind;
39563956
reScanTemplateToken(isTaggedTemplate: boolean): SyntaxKind;
3957-
reScanTemplateHeadOrNoSubstitutionTemplate(): SyntaxKind;
3957+
reScanTemplateHeadOrNoSubstitutionTemplate(isTaggedTemplate: boolean): SyntaxKind;
39583958
scanJsxIdentifier(): SyntaxKind;
39593959
scanJsxAttributeValue(): SyntaxKind;
39603960
reScanJsxAttributeValue(): SyntaxKind;

‎tests/baselines/reference/invalidTaggedTemplateEscapeSequences(target=es2015).errors.txt

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
1-
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(7,18): error TS1125: Hexadecimal digit expected.
21
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(8,15): error TS1125: Hexadecimal digit expected.
32
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(8,33): error TS1125: Hexadecimal digit expected.
43
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(8,75): error TS1125: Hexadecimal digit expected.
5-
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(9,18): error TS1125: Hexadecimal digit expected.
6-
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(9,27): error TS1125: Hexadecimal digit expected.
7-
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(9,51): error TS1125: Hexadecimal digit expected.
84

95

10-
==== tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts (7 errors) ====
6+
==== tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts (3 errors) ====
117
function tag (str: any, ...args: any[]): any {
128
return str
139
}
1410

1511
const a = tag`123`
1612
const b = tag`123 ${100}`
1713
const x = tag`\u{hello} ${ 100 } \xtraordinary ${ 200 } wonderful ${ 300 } \uworld`;
18-
19-
!!! error TS1125: Hexadecimal digit expected.
2014
const y = `\u{hello} ${ 100 } \xtraordinary ${ 200 } wonderful ${ 300 } \uworld`; // should error with NoSubstitutionTemplate
2115

2216
!!! error TS1125: Hexadecimal digit expected.
@@ -25,12 +19,6 @@ tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(9,51): er
2519

2620
!!! error TS1125: Hexadecimal digit expected.
2721
const z = tag`\u{hello} \xtraordinary wonderful \uworld` // should work with Tagged NoSubstitutionTemplate
28-
29-
!!! error TS1125: Hexadecimal digit expected.
30-
31-
!!! error TS1125: Hexadecimal digit expected.
32-
33-
!!! error TS1125: Hexadecimal digit expected.
3422

3523
const a1 = tag`${ 100 }\0` // \0
3624
const a2 = tag`${ 100 }\00` // \\00

‎tests/baselines/reference/invalidTaggedTemplateEscapeSequences(target=es5).errors.txt

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
1-
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(7,18): error TS1125: Hexadecimal digit expected.
21
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(8,15): error TS1125: Hexadecimal digit expected.
32
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(8,33): error TS1125: Hexadecimal digit expected.
43
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(8,75): error TS1125: Hexadecimal digit expected.
5-
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(9,18): error TS1125: Hexadecimal digit expected.
6-
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(9,27): error TS1125: Hexadecimal digit expected.
7-
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(9,51): error TS1125: Hexadecimal digit expected.
84

95

10-
==== tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts (7 errors) ====
6+
==== tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts (3 errors) ====
117
function tag (str: any, ...args: any[]): any {
128
return str
139
}
1410

1511
const a = tag`123`
1612
const b = tag`123 ${100}`
1713
const x = tag`\u{hello} ${ 100 } \xtraordinary ${ 200 } wonderful ${ 300 } \uworld`;
18-
19-
!!! error TS1125: Hexadecimal digit expected.
2014
const y = `\u{hello} ${ 100 } \xtraordinary ${ 200 } wonderful ${ 300 } \uworld`; // should error with NoSubstitutionTemplate
2115

2216
!!! error TS1125: Hexadecimal digit expected.
@@ -25,12 +19,6 @@ tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(9,51): er
2519

2620
!!! error TS1125: Hexadecimal digit expected.
2721
const z = tag`\u{hello} \xtraordinary wonderful \uworld` // should work with Tagged NoSubstitutionTemplate
28-
29-
!!! error TS1125: Hexadecimal digit expected.
30-
31-
!!! error TS1125: Hexadecimal digit expected.
32-
33-
!!! error TS1125: Hexadecimal digit expected.
3422

3523
const a1 = tag`${ 100 }\0` // \0
3624
const a2 = tag`${ 100 }\00` // \\00

‎tests/baselines/reference/invalidTaggedTemplateEscapeSequences(target=esnext).errors.txt

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
1-
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(7,18): error TS1125: Hexadecimal digit expected.
21
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(8,15): error TS1125: Hexadecimal digit expected.
32
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(8,33): error TS1125: Hexadecimal digit expected.
43
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(8,75): error TS1125: Hexadecimal digit expected.
5-
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(9,18): error TS1125: Hexadecimal digit expected.
6-
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(9,27): error TS1125: Hexadecimal digit expected.
7-
tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(9,51): error TS1125: Hexadecimal digit expected.
84

95

10-
==== tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts (7 errors) ====
6+
==== tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts (3 errors) ====
117
function tag (str: any, ...args: any[]): any {
128
return str
139
}
1410

1511
const a = tag`123`
1612
const b = tag`123 ${100}`
1713
const x = tag`\u{hello} ${ 100 } \xtraordinary ${ 200 } wonderful ${ 300 } \uworld`;
18-
19-
!!! error TS1125: Hexadecimal digit expected.
2014
const y = `\u{hello} ${ 100 } \xtraordinary ${ 200 } wonderful ${ 300 } \uworld`; // should error with NoSubstitutionTemplate
2115

2216
!!! error TS1125: Hexadecimal digit expected.
@@ -25,12 +19,6 @@ tests/cases/conformance/es2018/invalidTaggedTemplateEscapeSequences.ts(9,51): er
2519

2620
!!! error TS1125: Hexadecimal digit expected.
2721
const z = tag`\u{hello} \xtraordinary wonderful \uworld` // should work with Tagged NoSubstitutionTemplate
28-
29-
!!! error TS1125: Hexadecimal digit expected.
30-
31-
!!! error TS1125: Hexadecimal digit expected.
32-
33-
!!! error TS1125: Hexadecimal digit expected.
3422

3523
const a1 = tag`${ 100 }\0` // \0
3624
const a2 = tag`${ 100 }\00` // \\00

0 commit comments

Comments
 (0)