Merge remote-tracking branch 'upstream/master' into rc/1.20-merge-master

Conflict in `javascript/extractor/src/com/semmle/js/extractor/Main.java` resolved
in favour of `master`.

javascript/extractor/tests/encoding/input/zwsp.js

@@ -0,0 +1 @@
+​

javascript/extractor/tests/encoding/output/trap/zwsp.js.trap

@@ -0,0 +1,26 @@
+#10000=@"/zwsp.js;sourcefile"
+files(#10000,"/zwsp.js","zwsp","js",0)
+#10001=@"/;folder"
+folders(#10001,"/","")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=@"global_scope"
+scopes(#20000,0)
+#20001=@"script;{#10000},1,1"
+toplevels(#20001,0)
+#20002=@"loc,{#10000},1,1,1,1"
+locations_default(#20002,#10000,1,1,1,1)
+hasLocation(#20001,#20002)
+#20003=*
+jsParseErrors(#20003,#20001,"Error: Unexpected character '​' (U+200B)","​
+")
+hasLocation(#20003,#20002)
+#20004=*
+lines(#20004,#20001,"​","
+")
+hasLocation(#20004,#20002)
+numlines(#20001,1,0,0)
+numlines(#10000,1,0,0)
+filetype(#10000,"javascript")

javascript/extractor/tests/shebang/output/trap/tst.html.trap

@@ -14,7 +14,7 @@ toplevels(#20001,1)
 locations_default(#20002,#10000,3,17,3,17)
 hasLocation(#20001,#20002)
 #20003=*
-jsParseErrors(#20003,#20001,"Error: Unexpected character '#'","#!/usr/bin/node
+jsParseErrors(#20003,#20001,"Error: Unexpected character '#' (U+0023)","#!/usr/bin/node
 ")
 #20004=@"loc,{#10000},4,1,4,1"
 locations_default(#20004,#10000,4,1,4,1)