Merge pull request github#6448 from asgerf/js/handlebars-extraction-preliminary

JS: Update locations in Angular2 test

Author: asgerf

javascript/extractor/tests/ng-templates/output/trap/component.js.trap

@@ -542,53 +542,53 @@ toplevel_parent_xml_node(#20139,#20159)
 #20160=*
 xmlChars(#20160,"
 	",#10000,0,0,#10000)
-#20161=@"loc,{#10000},4,13,5,2"
-locations_default(#20161,#10000,4,13,5,2)
+#20161=@"loc,{#10000},4,13,5,1"
+locations_default(#20161,#10000,4,13,5,1)
 xmllocations(#20160,#20161)
 #20162=*
 xmlChars(#20162,"
 	",#10000,2,0,#10000)
-#20163=@"loc,{#10000},5,29,6,2"
-locations_default(#20163,#10000,5,29,6,2)
+#20163=@"loc,{#10000},5,29,6,1"
+locations_default(#20163,#10000,5,29,6,1)
 xmllocations(#20162,#20163)
 #20164=*
 xmlChars(#20164,"
 	",#10000,4,0,#10000)
-#20165=@"loc,{#10000},6,23,7,2"
-locations_default(#20165,#10000,6,23,7,2)
+#20165=@"loc,{#10000},6,23,7,1"
+locations_default(#20165,#10000,6,23,7,1)
 xmllocations(#20164,#20165)
 #20166=*
 xmlChars(#20166,"
 	",#10000,6,0,#10000)
-#20167=@"loc,{#10000},7,27,8,2"
-locations_default(#20167,#10000,7,27,8,2)
+#20167=@"loc,{#10000},7,27,8,1"
+locations_default(#20167,#10000,7,27,8,1)
 xmllocations(#20166,#20167)
 #20168=*
 xmlElements(#20168,"foo",#10000,5,#10000)
-#20169=@"loc,{#10000},7,2,7,27"
-locations_default(#20169,#10000,7,2,7,27)
+#20169=@"loc,{#10000},7,2,7,26"
+locations_default(#20169,#10000,7,2,7,26)
 xmllocations(#20168,#20169)
 xmlAttrs(#20159,#20168,"[baz]","expr?.bar",0,#10000)
-#20170=@"loc,{#10000},7,7,7,24"
-locations_default(#20170,#10000,7,7,7,24)
+#20170=@"loc,{#10000},7,7,7,23"
+locations_default(#20170,#10000,7,7,7,23)
 xmllocations(#20159,#20170)
 #20171=*
 xmlElements(#20171,"foo",#10000,3,#10000)
-#20172=@"loc,{#10000},6,2,6,23"
-locations_default(#20172,#10000,6,2,6,23)
+#20172=@"loc,{#10000},6,2,6,22"
+locations_default(#20172,#10000,6,2,6,22)
 xmllocations(#20171,#20172)
 xmlAttrs(#20138,#20171,"[baz]","expr!",0,#10000)
-#20173=@"loc,{#10000},6,7,6,20"
-locations_default(#20173,#10000,6,7,6,20)
+#20173=@"loc,{#10000},6,7,6,19"
+locations_default(#20173,#10000,6,7,6,19)
 xmllocations(#20138,#20173)
 #20174=*
 xmlElements(#20174,"foo",#10000,1,#10000)
-#20175=@"loc,{#10000},5,2,5,29"
-locations_default(#20175,#10000,5,2,5,29)
+#20175=@"loc,{#10000},5,2,5,28"
+locations_default(#20175,#10000,5,2,5,28)
 xmllocations(#20174,#20175)
 xmlAttrs(#20120,#20174,"[prop]","expr + expr",0,#10000)
-#20176=@"loc,{#10000},5,7,5,27"
-locations_default(#20176,#10000,5,7,5,27)
+#20176=@"loc,{#10000},5,7,5,26"
+locations_default(#20176,#10000,5,7,5,26)
 xmllocations(#20120,#20176)
 xml_element_parent_expression(#20174,#20097,0)
 xml_element_parent_expression(#20171,#20097,1)

javascript/ql/test/library-tests/frameworks/Angular2/test.expected

@@ -33,4 +33,4 @@ taintFlow
 | source.component.ts:14:22:14:29 | source() | source.component.ts:20:48:20:48 | x |
 | source.component.ts:15:33:15:40 | source() | sink.component.ts:22:48:22:57 | this.sink1 |
 testAttrSourceLocation
-| inline.component.ts:8:43:8:61 | [testAttr]=taint | inline.component.ts:8:55:8:59 | <toplevel> |
+| inline.component.ts:8:43:8:60 | [testAttr]=taint | inline.component.ts:8:55:8:59 | <toplevel> |