Skip to content

Commit 460a74d

Browse files
mjambonmjambon
committed
Update test expectations, since (string_fragment) now shows up in (string).
1 parent fc5bcbc commit 460a74d

File tree

4 files changed

+72
-55
lines changed

4 files changed

+72
-55
lines changed

‎test/corpus/expressions.txt

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,18 @@ line';
1313
----
1414

1515
(program
16-
(expression_statement (string (escape_sequence) (escape_sequence)))
17-
(expression_statement (string (escape_sequence) (escape_sequence)))
16+
(expression_statement
17+
(string
18+
(string_fragment) (escape_sequence) (string_fragment)
19+
(escape_sequence) (string_fragment)))
20+
(expression_statement
21+
(string
22+
(string_fragment) (escape_sequence) (string_fragment)
23+
(escape_sequence) (string_fragment)))
1824
(expression_statement (string (escape_sequence)))
1925
(expression_statement (string (escape_sequence)))
20-
(expression_statement (string (escape_sequence))))
26+
(expression_statement
27+
(string (string_fragment) (escape_sequence) (string_fragment))))
2128

2229
============================================
2330
Template strings
@@ -67,14 +74,14 @@ Template strings
6774
(expression_statement (template_string))
6875
(expression_statement (template_string))
6976
(expression_statement (template_string
70-
(template_substitution (string))
71-
(template_substitution (string))))
77+
(template_substitution (string (string_fragment)))
78+
(template_substitution (string (string_fragment)))))
7279
(expression_statement (template_string (escape_sequence)))
7380
(expression_statement (template_string
7481
(escape_sequence)
7582
(template_substitution (call_expression
7683
(member_expression (identifier) (property_identifier))
77-
(arguments (string))))
84+
(arguments (string (string_fragment)))))
7885
(escape_sequence)
7986
(template_substitution (identifier))))
8087
(expression_statement (template_string (escape_sequence)))
@@ -223,10 +230,10 @@ Objects
223230
(statement_block)
224231
(empty_statement)
225232
(expression_statement (object
226-
(pair (property_identifier) (string))))
233+
(pair (property_identifier) (string (string_fragment)))))
227234
(expression_statement (object
228-
(pair (property_identifier) (string))
229-
(pair (string) (identifier))
235+
(pair (property_identifier) (string (string_fragment)))
236+
(pair (string (string_fragment)) (identifier))
230237
(pair (number) (number))))
231238
(expression_statement (object
232239
(pair (property_identifier) (identifier))))
@@ -389,7 +396,7 @@ class Foo extends require('another-class') {
389396

390397
(class_declaration
391398
(identifier)
392-
(class_heritage (call_expression (identifier) (arguments (string))))
399+
(class_heritage (call_expression (identifier) (arguments (string (string_fragment)))))
393400
(class_body
394401
(method_definition
395402
(property_identifier)
@@ -497,7 +504,7 @@ class Foo {
497504
(decorator
498505
(identifier))
499506
(property_identifier)
500-
(string)))))
507+
(string (string_fragment))))))
501508

502509
============================================
503510
Arrays
@@ -514,9 +521,9 @@ Arrays
514521

515522
(program
516523
(expression_statement (array))
517-
(expression_statement (array (string)))
518-
(expression_statement (array (string)))
519-
(expression_statement (array (string) (identifier)))
524+
(expression_statement (array (string (string_fragment))))
525+
(expression_statement (array (string (string_fragment))))
526+
(expression_statement (array (string (string_fragment)) (identifier)))
520527
(expression_statement (array (identifier)))
521528
(expression_statement (array (assignment_expression (identifier) (number)))))
522529

@@ -671,7 +678,7 @@ x["some-string"];
671678
(program
672679
(expression_statement (member_expression (identifier) (property_identifier)))
673680
(expression_statement (subscript_expression (identifier) (identifier)))
674-
(expression_statement (subscript_expression (identifier) (string))))
681+
(expression_statement (subscript_expression (identifier) (string (string_fragment)))))
675682

676683
============================================
677684
Chained Property access
@@ -740,7 +747,7 @@ function(x, y) {
740747
(program
741748
(expression_statement (call_expression
742749
(member_expression (identifier) (property_identifier))
743-
(arguments (identifier) (string))))
750+
(arguments (identifier) (string (string_fragment)))))
744751
(expression_statement (call_expression
745752
(function
746753
(formal_parameters (identifier) (identifier))
@@ -811,7 +818,7 @@ new Thing;
811818
(program
812819
(expression_statement (new_expression
813820
(member_expression (identifier) (property_identifier))
814-
(arguments (number) (string))))
821+
(arguments (number) (string (string_fragment)))))
815822
(expression_statement (new_expression
816823
(identifier))))
817824

@@ -1015,7 +1022,7 @@ x &&= 0;
10151022
(member_expression (identifier) (property_identifier))
10161023
(number)))
10171024
(expression_statement (assignment_expression
1018-
(subscript_expression (identifier) (string))
1025+
(subscript_expression (identifier) (string (string_fragment)))
10191026
(number)))
10201027
(expression_statement (assignment_expression
10211028
(identifier)
@@ -1098,7 +1105,7 @@ true ? delete thing.prop : null;
10981105

10991106
(program
11001107
(expression_statement
1101-
(unary_expression (subscript_expression (identifier) (string))))
1108+
(unary_expression (subscript_expression (identifier) (string (string_fragment)))))
11021109
(expression_statement
11031110
(ternary_expression (true)
11041111
(unary_expression (member_expression (identifier) (property_identifier)))
@@ -1202,7 +1209,7 @@ b = <Foo.Bar.Baz.Baz></Foo.Bar.Baz.Baz>;
12021209
(identifier)
12031210
(jsx_self_closing_element
12041211
(identifier)
1205-
(jsx_attribute (property_identifier) (string))
1212+
(jsx_attribute (property_identifier) (string (string_fragment)))
12061213
(jsx_attribute (property_identifier) (jsx_expression (number))))))
12071214
(expression_statement (assignment_expression
12081215
(identifier)
@@ -1349,7 +1356,7 @@ yield db.users.where('[endpoint+email]')
13491356
(member_expression
13501357
(member_expression (identifier) (property_identifier))
13511358
(property_identifier))
1352-
(arguments (string))))))
1359+
(arguments (string (string_fragment)))))))
13531360

13541361
============================================
13551362
JSX
@@ -1388,9 +1395,9 @@ i = <Foo:Bar bar={}>{...children}</Foo:Bar>
13881395
(expression_statement (assignment_expression (identifier)
13891396
(jsx_self_closing_element
13901397
(identifier)
1391-
(jsx_attribute (property_identifier) (string))
1398+
(jsx_attribute (property_identifier) (string (string_fragment)))
13921399
(jsx_attribute (property_identifier) (jsx_expression (number)))
1393-
(jsx_attribute (property_identifier) (string))
1400+
(jsx_attribute (property_identifier) (string (string_fragment)))
13941401
(jsx_attribute (property_identifier)))))
13951402
(expression_statement (assignment_expression (identifier)
13961403
(jsx_self_closing_element
@@ -1410,7 +1417,7 @@ i = <Foo:Bar bar={}>{...children}</Foo:Bar>
14101417
(member_expression
14111418
(member_expression (this) (property_identifier))
14121419
(property_identifier))
1413-
(string))
1420+
(string (string_fragment)))
14141421
(unary_expression
14151422
(member_expression
14161423
(member_expression (this) (property_identifier))

‎test/corpus/literals.txt

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ const últimaVez = 1
4646

4747
(program
4848
(lexical_declaration (variable_declarator (identifier) (number)))
49-
(expression_statement (object (pair (property_identifier) (string)) (pair (string) (string)))))
49+
(expression_statement
50+
(object
51+
(pair (property_identifier) (string (string_fragment)))
52+
(pair (string) (string)))))
5053

5154
==========================================
5255
Strings containing comment-like content
@@ -57,7 +60,8 @@ Strings containing comment-like content
5760
---
5861

5962
(program
60-
(expression_statement (string (escape_sequence))))
63+
(expression_statement
64+
(string (string_fragment) (escape_sequence) (string_fragment))))
6165

6266
==========================================
6367
Quote escaping
@@ -78,11 +82,13 @@ Quote escaping
7882
(expression_statement (string))
7983
(expression_statement (string))
8084
(expression_statement (string (escape_sequence)))
85+
(expression_statement
86+
(string (string_fragment) (escape_sequence) (string_fragment)))
8187
(expression_statement (string (escape_sequence)))
82-
(expression_statement (string (escape_sequence)))
83-
(expression_statement (string (escape_sequence)))
84-
(expression_statement (string))
85-
(expression_statement (string)))
88+
(expression_statement
89+
(string (string_fragment) (escape_sequence) (string_fragment)))
90+
(expression_statement (string (string_fragment)))
91+
(expression_statement (string (string_fragment))))
8692

8793
==========================================
8894
Line continuations
@@ -97,8 +103,10 @@ world';
97103
---
98104

99105
(program
100-
(expression_statement (string (escape_sequence)))
101-
(expression_statement (string (escape_sequence))))
106+
(expression_statement
107+
(string (string_fragment) (escape_sequence) (string_fragment)))
108+
(expression_statement
109+
(string (string_fragment) (escape_sequence) (string_fragment))))
102110

103111
============================================================
104112
Non-standard unescaped newlines legal in TSX attributes
@@ -113,8 +121,8 @@ world';
113121
---
114122

115123
(program
116-
(expression_statement (string))
117-
(expression_statement (string)))
124+
(expression_statement (string (string_fragment)))
125+
(expression_statement (string (string_fragment))))
118126

119127
=========================================================
120128
JSX strings with unescaped newlines for TSX attributes
@@ -133,13 +141,13 @@ JSX strings with unescaped newlines for TSX attributes
133141
(jsx_element
134142
(jsx_opening_element
135143
(identifier)
136-
(jsx_attribute (property_identifier) (string)))
144+
(jsx_attribute (property_identifier) (string (string_fragment))))
137145
(jsx_closing_element
138146
(identifier))))
139147
(expression_statement
140148
(jsx_element
141149
(jsx_opening_element
142150
(identifier)
143-
(jsx_attribute (property_identifier) (string)))
151+
(jsx_attribute (property_identifier) (string (string_fragment))))
144152
(jsx_closing_element
145153
(identifier)))))

‎test/corpus/semicolon_insertion.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,9 @@ var a = new A()
197197
(member_expression
198198
(new_expression (identifier) (arguments))
199199
(property_identifier))
200-
(arguments (object (pair (property_identifier) (string)))))
200+
(arguments
201+
(object
202+
(pair (property_identifier) (string (string_fragment))))))
201203
(property_identifier))
202204
(arguments)))))
203205

‎test/corpus/statements.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,33 +53,33 @@ import.meta.url;
5353

5454
(program
5555
(import_statement
56-
(import_clause (identifier)) (string))
56+
(import_clause (identifier)) (string (string_fragment)))
5757
(import_statement
58-
(import_clause (namespace_import (identifier))) (string))
58+
(import_clause (namespace_import (identifier))) (string (string_fragment)))
5959
(import_statement
60-
(import_clause (named_imports (import_specifier (identifier)))) (string))
60+
(import_clause (named_imports (import_specifier (identifier)))) (string (string_fragment)))
6161
(import_statement
62-
(import_clause (named_imports (import_specifier (identifier)) (import_specifier (identifier)))) (string))
62+
(import_clause (named_imports (import_specifier (identifier)) (import_specifier (identifier)))) (string (string_fragment)))
6363
(import_statement
64-
(import_clause (named_imports (import_specifier (identifier)) (import_specifier (identifier) (identifier)))) (string))
64+
(import_clause (named_imports (import_specifier (identifier)) (import_specifier (identifier) (identifier)))) (string (string_fragment)))
6565
(import_statement
66-
(import_clause (identifier) (named_imports (import_specifier (identifier)) (import_specifier (identifier) (identifier)))) (string))
66+
(import_clause (identifier) (named_imports (import_specifier (identifier)) (import_specifier (identifier) (identifier)))) (string (string_fragment)))
6767
(import_statement
68-
(import_clause (identifier) (namespace_import (identifier))) (string))
68+
(import_clause (identifier) (namespace_import (identifier))) (string (string_fragment)))
6969
(import_statement
70-
(string))
70+
(string (string_fragment)))
7171
(import_statement
72-
(import_clause (named_imports (import_specifier (identifier)) (import_specifier (identifier) (identifier)))) (string))
72+
(import_clause (named_imports (import_specifier (identifier)) (import_specifier (identifier) (identifier)))) (string (string_fragment)))
7373
(expression_statement
7474
(call_expression
7575
(import)
76-
(arguments (string))))
76+
(arguments (string (string_fragment)))))
7777
(expression_statement
7878
(call_expression
7979
(member_expression
8080
(call_expression
8181
(import)
82-
(arguments (string)))
82+
(arguments (string (string_fragment))))
8383
(property_identifier))
8484
(arguments (arrow_function (formal_parameters (identifier)) (statement_block)))))
8585
(expression_statement
@@ -147,22 +147,22 @@ export { import1 as name1, import2 as name2, nameN } from 'foo';
147147
(export_statement
148148
(export_clause (export_specifier name: (identifier) alias: (identifier))))
149149
(export_statement
150-
source: (string))
150+
source: (string (string_fragment)))
151151
(export_statement
152152
(namespace_import (identifier))
153-
source: (string))
153+
source: (string (string_fragment)))
154154
(export_statement
155155
(export_clause
156156
(export_specifier name: (identifier))
157157
(export_specifier name: (identifier))
158158
(export_specifier name: (identifier)))
159-
source: (string))
159+
source: (string (string_fragment)))
160160
(export_statement
161161
(export_clause
162162
(export_specifier name: (identifier) alias: (identifier))
163163
(export_specifier name: (identifier) alias: (identifier))
164164
(export_specifier name: (identifier)))
165-
source: (string)))
165+
source: (string (string_fragment))))
166166

167167
============================================
168168
Decorators before exports
@@ -644,7 +644,7 @@ switch (x) {
644644
(switch_case (number)
645645
(expression_statement (call_expression (identifier) (arguments)))
646646
(break_statement))
647-
(switch_case (string)
647+
(switch_case (string (string_fragment))
648648
(expression_statement (call_expression (identifier) (arguments)))
649649
(break_statement))
650650
(switch_default
@@ -660,7 +660,7 @@ throw new Error("uh oh");
660660

661661
(program
662662
(throw_statement
663-
(new_expression (identifier) (arguments (string)))))
663+
(new_expression (identifier) (arguments (string (string_fragment))))))
664664

665665
============================================
666666
Throw statements with sequence expressions
@@ -827,4 +827,4 @@ console.log("HI")
827827
(identifier)
828828
(property_identifier))
829829
(arguments
830-
(string)))))
830+
(string (string_fragment))))))

0 commit comments

Comments
 (0)