JS: Update TRAP output

Author: asgerf

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

@@ -243,7 +243,7 @@ locations_default(#20087,#10000,1,13,1,29)
 hasLocation(#20086,#20087)
 enclosing_stmt(#20086,#20082)
 expr_containers(#20086,#20001)
-generated_code_expr_info(#20086,"<%=","%>"," user_data1 ")
+expr_contains_template_tag_location(#20086,#20087)
 #20088=*
 stmts(#20088,23,#20001,1,"let dat ... ta2 %>;")
 hasLocation(#20088,#20007)
@@ -269,7 +269,7 @@ locations_default(#20093,#10000,2,13,2,29)
 hasLocation(#20092,#20093)
 enclosing_stmt(#20092,#20088)
 expr_containers(#20092,#20001)
-generated_code_expr_info(#20092,"<%-","%>"," user_data2 ")
+expr_contains_template_tag_location(#20092,#20093)
 #20094=*
 stmts(#20094,3,#20001,2,"if (<%s ... g%>) {}")
 hasLocation(#20094,#20009)
@@ -281,7 +281,7 @@ locations_default(#20096,#10000,3,5,3,17)
 hasLocation(#20095,#20096)
 enclosing_stmt(#20095,#20094)
 expr_containers(#20095,#20001)
-generated_code_expr_info(#20095,"<%","%>","something")
+expr_contains_template_tag_location(#20095,#20096)
 #20097=*
 stmts(#20097,1,#20094,1,"{}")
 #20098=@"loc,{#10000},3,20,3,21"
@@ -315,15 +315,15 @@ locations_default(#20105,#10000,4,5,4,11)
 hasLocation(#20104,#20105)
 enclosing_stmt(#20104,#20099)
 expr_containers(#20104,#20001)
-generated_code_expr_info(#20104,"<%","%>","bar")
+expr_contains_template_tag_location(#20104,#20105)
 #20106=*
 exprs(#20106,120,#20100,1,"<%baz%>")
 #20107=@"loc,{#10000},4,14,4,20"
 locations_default(#20107,#10000,4,14,4,20)
 hasLocation(#20106,#20107)
 enclosing_stmt(#20106,#20099)
 expr_containers(#20106,#20001)
-generated_code_expr_info(#20106,"<%","%>","baz")
+expr_contains_template_tag_location(#20106,#20107)
 #20108=*
 stmts(#20108,2,#20001,4,"<% generated_code %>")
 hasLocation(#20108,#20015)
@@ -333,7 +333,7 @@ exprs(#20109,120,#20108,0,"<% generated_code %>")
 hasLocation(#20109,#20015)
 enclosing_stmt(#20109,#20108)
 expr_containers(#20109,#20001)
-generated_code_expr_info(#20109,"<%","%>"," generated_code ")
+expr_contains_template_tag_location(#20109,#20015)
 #20110=*
 stmts(#20110,23,#20001,5,"let str ... de %>"";")
 #20111=@"loc,{#10000},7,1,7,41"

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

@@ -160,7 +160,7 @@ locations_default(#20055,#10000,9,19,9,36)
 hasLocation(#20054,#20055)
 enclosing_stmt(#20054,#20049)
 expr_containers(#20054,#20002)
-generated_code_expr_info(#20054,"{{{","}}}"," user_data1 ")
+expr_contains_template_tag_location(#20054,#20055)
 #20056=*
 stmts(#20056,18,#20002,1,"var dat ... afe }};")
 #20057=@"loc,{#10000},10,7,10,49"
@@ -188,7 +188,7 @@ locations_default(#20062,#10000,10,19,10,48)
 hasLocation(#20061,#20062)
 enclosing_stmt(#20061,#20056)
 expr_containers(#20061,#20002)
-generated_code_expr_info(#20061,"{{","}}"," user_data2 | json | safe ")
+expr_contains_template_tag_location(#20061,#20062)
 #20063=*
 stmts(#20063,18,#20002,2,"var dat ... ta3 %>;")
 #20064=@"loc,{#10000},11,7,11,36"
@@ -216,7 +216,7 @@ locations_default(#20069,#10000,11,19,11,35)
 hasLocation(#20068,#20069)
 enclosing_stmt(#20068,#20063)
 expr_containers(#20068,#20002)
-generated_code_expr_info(#20068,"<%-","%>"," user_data3 ")
+expr_contains_template_tag_location(#20068,#20069)
 #20070=*
 entry_cfg_node(#20070,#20002)
 hasLocation(#20070,#20004)
@@ -276,6 +276,7 @@ template_placeholder_tag_info(#20084,#20080,"{{{subtitle_html}}}")
 #20085=@"loc,{#10000},5,5,5,23"
 locations_default(#20085,#10000,5,5,5,23)
 hasLocation(#20084,#20085)
+scopes(#20000,0)
 #20086=@"script;{#10000},5,8"
 #20087=*
 lines(#20087,#20086,"subtitle_html","")
@@ -356,6 +357,7 @@ xmllocations(#20001,#20107)
 template_placeholder_tag_info(#20108,#20001,"{{{ user_data1 }}}")
 locations_default(#20055,#10000,9,19,9,36)
 hasLocation(#20108,#20055)
+scopes(#20000,0)
 #20109=@"script;{#10000},9,22"
 #20110=*
 lines(#20110,#20109," user_data1 ","")
@@ -410,6 +412,7 @@ toplevel_parent_xml_node(#20109,#20108)
 template_placeholder_tag_info(#20123,#20001,"{{ user_data2 | json | safe }}")
 locations_default(#20062,#10000,10,19,10,48)
 hasLocation(#20123,#20062)
+scopes(#20000,0)
 #20124=@"script;{#10000},10,21"
 #20125=*
 lines(#20125,#20124," user_data2 | json | safe ","")
@@ -524,6 +527,7 @@ toplevel_parent_xml_node(#20124,#20123)
 template_placeholder_tag_info(#20154,#20001,"<%- user_data3 %>")
 locations_default(#20069,#10000,11,19,11,35)
 hasLocation(#20154,#20069)
+scopes(#20000,0)
 #20155=@"script;{#10000},11,22"
 #20156=*
 lines(#20156,#20155," user_data3 ","")
@@ -592,6 +596,7 @@ template_placeholder_tag_info(#20172,#20170,"<%= footer %>")
 #20173=@"loc,{#10000},7,8,7,20"
 locations_default(#20173,#10000,7,8,7,20)
 hasLocation(#20172,#20173)
+scopes(#20000,0)
 #20174=@"script;{#10000},7,11"
 #20175=*
 lines(#20175,#20174," footer ","")
@@ -656,6 +661,7 @@ template_placeholder_tag_info(#20191,#20189,"<%- body_html %>")
 #20192=@"loc,{#10000},6,8,6,23"
 locations_default(#20192,#10000,6,8,6,23)
 hasLocation(#20191,#20192)
+scopes(#20000,0)
 #20193=@"script;{#10000},6,11"
 #20194=*
 lines(#20194,#20193," body_html ","")
@@ -720,6 +726,7 @@ template_placeholder_tag_info(#20210,#20208,"{{title}}")
 #20211=@"loc,{#10000},4,9,4,17"
 locations_default(#20211,#10000,4,9,4,17)
 hasLocation(#20210,#20211)
+scopes(#20000,0)
 #20212=@"script;{#10000},4,11"
 #20213=*
 lines(#20213,#20212,"title","")

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

@@ -398,7 +398,7 @@ locations_default(#20147,#10000,1,13,1,28)
 hasLocation(#20146,#20147)
 enclosing_stmt(#20146,#20142)
 expr_containers(#20146,#20001)
-generated_code_expr_info(#20146,"{{","}}"," user_data1 ")
+expr_contains_template_tag_location(#20146,#20147)
 #20148=*
 stmts(#20148,23,#20001,1,"let dat ... a2 }}};")
 hasLocation(#20148,#20013)
@@ -424,7 +424,7 @@ locations_default(#20153,#10000,2,13,2,30)
 hasLocation(#20152,#20153)
 enclosing_stmt(#20152,#20148)
 expr_containers(#20152,#20001)
-generated_code_expr_info(#20152,"{{{","}}}"," user_data2 ")
+expr_contains_template_tag_location(#20152,#20153)
 #20154=*
 stmts(#20154,3,#20001,2,"if ({{s ... g}}) {}")
 hasLocation(#20154,#20015)
@@ -436,7 +436,7 @@ locations_default(#20156,#10000,3,5,3,17)
 hasLocation(#20155,#20156)
 enclosing_stmt(#20155,#20154)
 expr_containers(#20155,#20001)
-generated_code_expr_info(#20155,"{{","}}","something")
+expr_contains_template_tag_location(#20155,#20156)
 #20157=*
 stmts(#20157,1,#20154,1,"{}")
 #20158=@"loc,{#10000},3,20,3,21"
@@ -470,15 +470,15 @@ locations_default(#20165,#10000,4,5,4,11)
 hasLocation(#20164,#20165)
 enclosing_stmt(#20164,#20159)
 expr_containers(#20164,#20001)
-generated_code_expr_info(#20164,"{{","}}","bar")
+expr_contains_template_tag_location(#20164,#20165)
 #20166=*
 exprs(#20166,120,#20160,1,"{{baz}}")
 #20167=@"loc,{#10000},4,14,4,20"
 locations_default(#20167,#10000,4,14,4,20)
 hasLocation(#20166,#20167)
 enclosing_stmt(#20166,#20159)
 expr_containers(#20166,#20001)
-generated_code_expr_info(#20166,"{{","}}","baz")
+expr_contains_template_tag_location(#20166,#20167)
 #20168=*
 stmts(#20168,1,#20001,4,"{{not_g ... _code}}")
 #20169=@"loc,{#10000},6,1,6,22"