Skip to content

Commit 13fa49a

Browse files
asgerfasgerf
committed
JS: Update TRAP output
1 parent b9b10af commit 13fa49a

12 files changed

Lines changed: 1529 additions & 1416 deletions

File tree

‎javascript/extractor/tests/generatedcode/output/trap/ejs.js.trap‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ locations_default(#20087,#10000,1,13,1,29)
243243
hasLocation(#20086,#20087)
244244
enclosing_stmt(#20086,#20082)
245245
expr_containers(#20086,#20001)
246-
generated_code_expr_info(#20086,"<%=","%>"," user_data1 ")
246+
expr_contains_template_tag_location(#20086,#20087)
247247
#20088=*
248248
stmts(#20088,23,#20001,1,"let dat ... ta2 %>;")
249249
hasLocation(#20088,#20007)
@@ -269,7 +269,7 @@ locations_default(#20093,#10000,2,13,2,29)
269269
hasLocation(#20092,#20093)
270270
enclosing_stmt(#20092,#20088)
271271
expr_containers(#20092,#20001)
272-
generated_code_expr_info(#20092,"<%-","%>"," user_data2 ")
272+
expr_contains_template_tag_location(#20092,#20093)
273273
#20094=*
274274
stmts(#20094,3,#20001,2,"if (<%s ... g%>) {}")
275275
hasLocation(#20094,#20009)
@@ -281,7 +281,7 @@ locations_default(#20096,#10000,3,5,3,17)
281281
hasLocation(#20095,#20096)
282282
enclosing_stmt(#20095,#20094)
283283
expr_containers(#20095,#20001)
284-
generated_code_expr_info(#20095,"<%","%>","something")
284+
expr_contains_template_tag_location(#20095,#20096)
285285
#20097=*
286286
stmts(#20097,1,#20094,1,"{}")
287287
#20098=@"loc,{#10000},3,20,3,21"
@@ -315,15 +315,15 @@ locations_default(#20105,#10000,4,5,4,11)
315315
hasLocation(#20104,#20105)
316316
enclosing_stmt(#20104,#20099)
317317
expr_containers(#20104,#20001)
318-
generated_code_expr_info(#20104,"<%","%>","bar")
318+
expr_contains_template_tag_location(#20104,#20105)
319319
#20106=*
320320
exprs(#20106,120,#20100,1,"<%baz%>")
321321
#20107=@"loc,{#10000},4,14,4,20"
322322
locations_default(#20107,#10000,4,14,4,20)
323323
hasLocation(#20106,#20107)
324324
enclosing_stmt(#20106,#20099)
325325
expr_containers(#20106,#20001)
326-
generated_code_expr_info(#20106,"<%","%>","baz")
326+
expr_contains_template_tag_location(#20106,#20107)
327327
#20108=*
328328
stmts(#20108,2,#20001,4,"<% generated_code %>")
329329
hasLocation(#20108,#20015)
@@ -333,7 +333,7 @@ exprs(#20109,120,#20108,0,"<% generated_code %>")
333333
hasLocation(#20109,#20015)
334334
enclosing_stmt(#20109,#20108)
335335
expr_containers(#20109,#20001)
336-
generated_code_expr_info(#20109,"<%","%>"," generated_code ")
336+
expr_contains_template_tag_location(#20109,#20015)
337337
#20110=*
338338
stmts(#20110,23,#20001,5,"let str ... de %>"";")
339339
#20111=@"loc,{#10000},7,1,7,41"

‎javascript/extractor/tests/generatedcode/output/trap/test.html.trap‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ locations_default(#20055,#10000,9,19,9,36)
160160
hasLocation(#20054,#20055)
161161
enclosing_stmt(#20054,#20049)
162162
expr_containers(#20054,#20002)
163-
generated_code_expr_info(#20054,"{{{","}}}"," user_data1 ")
163+
expr_contains_template_tag_location(#20054,#20055)
164164
#20056=*
165165
stmts(#20056,18,#20002,1,"var dat ... afe }};")
166166
#20057=@"loc,{#10000},10,7,10,49"
@@ -188,7 +188,7 @@ locations_default(#20062,#10000,10,19,10,48)
188188
hasLocation(#20061,#20062)
189189
enclosing_stmt(#20061,#20056)
190190
expr_containers(#20061,#20002)
191-
generated_code_expr_info(#20061,"{{","}}"," user_data2 | json | safe ")
191+
expr_contains_template_tag_location(#20061,#20062)
192192
#20063=*
193193
stmts(#20063,18,#20002,2,"var dat ... ta3 %>;")
194194
#20064=@"loc,{#10000},11,7,11,36"
@@ -216,7 +216,7 @@ locations_default(#20069,#10000,11,19,11,35)
216216
hasLocation(#20068,#20069)
217217
enclosing_stmt(#20068,#20063)
218218
expr_containers(#20068,#20002)
219-
generated_code_expr_info(#20068,"<%-","%>"," user_data3 ")
219+
expr_contains_template_tag_location(#20068,#20069)
220220
#20070=*
221221
entry_cfg_node(#20070,#20002)
222222
hasLocation(#20070,#20004)
@@ -276,6 +276,7 @@ template_placeholder_tag_info(#20084,#20080,"{{{subtitle_html}}}")
276276
#20085=@"loc,{#10000},5,5,5,23"
277277
locations_default(#20085,#10000,5,5,5,23)
278278
hasLocation(#20084,#20085)
279+
scopes(#20000,0)
279280
#20086=@"script;{#10000},5,8"
280281
#20087=*
281282
lines(#20087,#20086,"subtitle_html","")
@@ -356,6 +357,7 @@ xmllocations(#20001,#20107)
356357
template_placeholder_tag_info(#20108,#20001,"{{{ user_data1 }}}")
357358
locations_default(#20055,#10000,9,19,9,36)
358359
hasLocation(#20108,#20055)
360+
scopes(#20000,0)
359361
#20109=@"script;{#10000},9,22"
360362
#20110=*
361363
lines(#20110,#20109," user_data1 ","")
@@ -410,6 +412,7 @@ toplevel_parent_xml_node(#20109,#20108)
410412
template_placeholder_tag_info(#20123,#20001,"{{ user_data2 | json | safe }}")
411413
locations_default(#20062,#10000,10,19,10,48)
412414
hasLocation(#20123,#20062)
415+
scopes(#20000,0)
413416
#20124=@"script;{#10000},10,21"
414417
#20125=*
415418
lines(#20125,#20124," user_data2 | json | safe ","")
@@ -524,6 +527,7 @@ toplevel_parent_xml_node(#20124,#20123)
524527
template_placeholder_tag_info(#20154,#20001,"<%- user_data3 %>")
525528
locations_default(#20069,#10000,11,19,11,35)
526529
hasLocation(#20154,#20069)
530+
scopes(#20000,0)
527531
#20155=@"script;{#10000},11,22"
528532
#20156=*
529533
lines(#20156,#20155," user_data3 ","")
@@ -592,6 +596,7 @@ template_placeholder_tag_info(#20172,#20170,"<%= footer %>")
592596
#20173=@"loc,{#10000},7,8,7,20"
593597
locations_default(#20173,#10000,7,8,7,20)
594598
hasLocation(#20172,#20173)
599+
scopes(#20000,0)
595600
#20174=@"script;{#10000},7,11"
596601
#20175=*
597602
lines(#20175,#20174," footer ","")
@@ -656,6 +661,7 @@ template_placeholder_tag_info(#20191,#20189,"<%- body_html %>")
656661
#20192=@"loc,{#10000},6,8,6,23"
657662
locations_default(#20192,#10000,6,8,6,23)
658663
hasLocation(#20191,#20192)
664+
scopes(#20000,0)
659665
#20193=@"script;{#10000},6,11"
660666
#20194=*
661667
lines(#20194,#20193," body_html ","")
@@ -720,6 +726,7 @@ template_placeholder_tag_info(#20210,#20208,"{{title}}")
720726
#20211=@"loc,{#10000},4,9,4,17"
721727
locations_default(#20211,#10000,4,9,4,17)
722728
hasLocation(#20210,#20211)
729+
scopes(#20000,0)
723730
#20212=@"script;{#10000},4,11"
724731
#20213=*
725732
lines(#20213,#20212,"title","")

‎javascript/extractor/tests/generatedcode/output/trap/tst.js.trap‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ locations_default(#20147,#10000,1,13,1,28)
398398
hasLocation(#20146,#20147)
399399
enclosing_stmt(#20146,#20142)
400400
expr_containers(#20146,#20001)
401-
generated_code_expr_info(#20146,"{{","}}"," user_data1 ")
401+
expr_contains_template_tag_location(#20146,#20147)
402402
#20148=*
403403
stmts(#20148,23,#20001,1,"let dat ... a2 }}};")
404404
hasLocation(#20148,#20013)
@@ -424,7 +424,7 @@ locations_default(#20153,#10000,2,13,2,30)
424424
hasLocation(#20152,#20153)
425425
enclosing_stmt(#20152,#20148)
426426
expr_containers(#20152,#20001)
427-
generated_code_expr_info(#20152,"{{{","}}}"," user_data2 ")
427+
expr_contains_template_tag_location(#20152,#20153)
428428
#20154=*
429429
stmts(#20154,3,#20001,2,"if ({{s ... g}}) {}")
430430
hasLocation(#20154,#20015)
@@ -436,7 +436,7 @@ locations_default(#20156,#10000,3,5,3,17)
436436
hasLocation(#20155,#20156)
437437
enclosing_stmt(#20155,#20154)
438438
expr_containers(#20155,#20001)
439-
generated_code_expr_info(#20155,"{{","}}","something")
439+
expr_contains_template_tag_location(#20155,#20156)
440440
#20157=*
441441
stmts(#20157,1,#20154,1,"{}")
442442
#20158=@"loc,{#10000},3,20,3,21"
@@ -470,15 +470,15 @@ locations_default(#20165,#10000,4,5,4,11)
470470
hasLocation(#20164,#20165)
471471
enclosing_stmt(#20164,#20159)
472472
expr_containers(#20164,#20001)
473-
generated_code_expr_info(#20164,"{{","}}","bar")
473+
expr_contains_template_tag_location(#20164,#20165)
474474
#20166=*
475475
exprs(#20166,120,#20160,1,"{{baz}}")
476476
#20167=@"loc,{#10000},4,14,4,20"
477477
locations_default(#20167,#10000,4,14,4,20)
478478
hasLocation(#20166,#20167)
479479
enclosing_stmt(#20166,#20159)
480480
expr_containers(#20166,#20001)
481-
generated_code_expr_info(#20166,"{{","}}","baz")
481+
expr_contains_template_tag_location(#20166,#20167)
482482
#20168=*
483483
stmts(#20168,1,#20001,4,"{{not_g ... _code}}")
484484
#20169=@"loc,{#10000},6,1,6,22"

0 commit comments

Comments
 (0)