Mark used attribute only based on fst of the payload

Since the snd of payload could be transformed, it is inexact.
Also only check the attribute where the location is not ghost

Author: bobzhang

jscomp/all.depend

@@ -175,10 +175,9 @@ syntax/bs_syntaxerr.cmx : syntax/bs_syntaxerr.cmi
 syntax/ast_compatible.cmx : ext/ext_list.cmx syntax/ast_compatible.cmi
 syntax/ast_utf8_string.cmx : ext/ext_utf8.cmx ext/ext_char.cmx \
     syntax/ast_utf8_string.cmi
-syntax/ast_utf8_string_interp.cmx : ext/literals.cmx ext/ext_utf8.cmx \
-    ext/ext_string.cmx ext/ext_char.cmx common/bs_loc.cmx \
-    syntax/ast_utf8_string.cmx syntax/ast_compatible.cmx \
-    syntax/ast_utf8_string_interp.cmi
+syntax/ast_utf8_string_interp.cmx : ext/ext_utf8.cmx ext/ext_string.cmx \
+    ext/ext_char.cmx common/bs_loc.cmx syntax/ast_utf8_string.cmx \
+    syntax/ast_compatible.cmx syntax/ast_utf8_string_interp.cmi
 syntax/ast_derive_constructor.cmx :
 syntax/ast_derive_util.cmx : ext/ext_list.cmx syntax/ast_compatible.cmx \
     syntax/ast_derive_util.cmi
@@ -206,9 +205,9 @@ syntax/ast_comb.cmx : ext/ext_list.cmx syntax/ast_literal.cmx \
 syntax/ast_core_type.cmx : ext/ext_list.cmx syntax/bs_syntaxerr.cmx \
     syntax/ast_literal.cmx syntax/ast_compatible.cmx syntax/ast_comb.cmx \
     syntax/ast_core_type.cmi
-syntax/bs_ast_invariant.cmx : ext/literals.cmx ext/hash_set_poly.cmx \
-    ext/ext_string.cmx ext/ext_list.cmx common/bs_warnings.cmx \
-    syntax/bs_ast_iterator.cmx syntax/ast_core_type.cmx \
+syntax/bs_ast_invariant.cmx : ext/hash_set_poly.cmx ext/ext_list.cmx \
+    common/bs_warnings.cmx syntax/bs_ast_iterator.cmx \
+    syntax/ast_utf8_string_interp.cmx syntax/ast_core_type.cmx \
     syntax/bs_ast_invariant.cmi
 syntax/ast_attributes.cmx : ext/ext_string.cmx ext/ext_list.cmx \
     syntax/bs_syntaxerr.cmx syntax/bs_ast_invariant.cmx \

jscomp/ext/literals.ml

@@ -117,8 +117,6 @@ let dash_nostdlib = "-nostdlib"
 
 let reactjs_jsx_ppx_2_exe = "reactjs_jsx_ppx_2.exe"
 let reactjs_jsx_ppx_3_exe  = "reactjs_jsx_ppx_3.exe"
-let unescaped_j_delimiter = "j"
-let unescaped_js_delimiter = "js"
 
 let native = "native"
 let bytecode = "bytecode"

jscomp/ext/literals.mli

@@ -118,10 +118,6 @@ val dash_nostdlib : string
 
 val reactjs_jsx_ppx_2_exe : string 
 val reactjs_jsx_ppx_3_exe : string 
-val unescaped_j_delimiter : string 
-
-
-val unescaped_js_delimiter : string 
 
 val native : string
 val bytecode : string

jscomp/syntax/ast_attributes.ml

@@ -282,11 +282,11 @@ let iter_process_bs_int_as  attrs =
     ) attrs; !st
 
 
-let iter_process_bs_string_or_int_as attrs =
+let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
   let st = ref None in
-  List.iter
+  Ext_list.iter attrs
     (fun
-      (({txt ; loc}, payload ) as attr : attr)  ->
+      (({txt ; loc}, payload ) as attr)  ->
       match  txt with
       | "bs.as"
         ->
@@ -310,7 +310,7 @@ let iter_process_bs_string_or_int_as attrs =
           Bs_syntaxerr.err loc Duplicated_bs_as
       | _ -> ()
 
-    ) attrs;
+    ) ;
   !st
 
 let locg = Location.none

jscomp/syntax/ast_exp_apply.ml

@@ -98,7 +98,7 @@ let handle_exp_apply
             | {pexp_desc = Pexp_apply (fn, args); pexp_loc; pexp_attributes} ->
               let fn = self.expr self fn in
               let args = Ext_list.map  args (fun (lab,exp) -> lab, self.expr self exp ) in
-              Bs_ast_invariant.warn_unused_attributes pexp_attributes;
+              Bs_ast_invariant.warn_discarded_unused_attributes pexp_attributes;
               { pexp_desc = Pexp_apply(fn, (Ast_compatible.no_label, new_obj_arg) :: args);
                 pexp_attributes = [];
                 pexp_loc = pexp_loc}
@@ -117,7 +117,7 @@ let handle_exp_apply
                                 ->
                                 let fn = self.expr self fn in
                                 let args = Ext_list.map  args (fun (lab,exp) -> lab, self.expr self exp ) in
-                                Bs_ast_invariant.warn_unused_attributes pexp_attributes;
+                                Bs_ast_invariant.warn_discarded_unused_attributes pexp_attributes;
                                 { Parsetree.pexp_desc = Pexp_apply(fn, (Ast_compatible.no_label, bounded_obj_arg) :: args);
                                   pexp_attributes = [];
                                   pexp_loc = pexp_loc}
@@ -171,7 +171,7 @@ let handle_exp_apply
              currently the pattern match is written in a top down style.
              Another corner case: f##(g a b [@bs])
           *)
-          Bs_ast_invariant.warn_unused_attributes attrs ;
+          Bs_ast_invariant.warn_discarded_unused_attributes attrs ;
           {e with pexp_desc = Ast_util.method_apply loc self obj name args}
         | [
 #if OCAML_VERSION =~ ">4.03.0" then           

jscomp/syntax/ast_polyvar.ml

@@ -95,32 +95,32 @@ let map_row_fields_into_strings ptyp_loc
     (row_fields : Parsetree.row_field list) : External_arg_spec.attr = 
   let case, result = 
     Ext_list.fold_right row_fields (`Nothing, []) (fun tag (nullary, acc) -> 
-         match nullary, tag with 
-         | (`Nothing | `Null), 
-           Rtag (label, attrs, true,  [])
-           -> 
-           begin match Ast_attributes.iter_process_bs_string_as attrs with 
-             | Some name -> 
-               `Null, ((hash_label label, name) :: acc )
+        match nullary, tag with 
+        | (`Nothing | `Null), 
+          Rtag (label, attrs, true,  [])
+          -> 
+          begin match Ast_attributes.iter_process_bs_string_as attrs with 
+            | Some name -> 
+              `Null, ((hash_label label, name) :: acc )
 
-             | None -> 
-               `Null, ((hash_label label, label_of_name label) :: acc )
-           end
-         | (`Nothing | `NonNull), Rtag(label, attrs, false, ([ _ ])) 
-           -> 
-           begin match Ast_attributes.iter_process_bs_string_as attrs with 
-             | Some name -> 
-               `NonNull, ((hash_label label, name) :: acc)
-             | None -> 
-               `NonNull, ((hash_label label, label_of_name label) :: acc)
-           end
-         | _ -> Bs_syntaxerr.err ptyp_loc Invalid_bs_string_type
+            | None -> 
+              `Null, ((hash_label label, label_of_name label) :: acc )
+          end
+        | (`Nothing | `NonNull), Rtag(label, attrs, false, ([ _ ])) 
+          -> 
+          begin match Ast_attributes.iter_process_bs_string_as attrs with 
+            | Some name -> 
+              `NonNull, ((hash_label label, name) :: acc)
+            | None -> 
+              `NonNull, ((hash_label label, label_of_name label) :: acc)
+          end
+        | _ -> Bs_syntaxerr.err ptyp_loc Invalid_bs_string_type
 
-       )  in 
-  (match case with 
-   | `Nothing -> Bs_syntaxerr.err ptyp_loc Invalid_bs_string_type
-   | `Null -> External_arg_spec.NullString result 
-   | `NonNull -> NonNullString result)
+      )  in 
+  match case with 
+  | `Nothing -> Bs_syntaxerr.err ptyp_loc Invalid_bs_string_type
+  | `Null -> External_arg_spec.NullString result 
+  | `NonNull -> NonNullString result
 
 
 let is_enum row_fields = 

jscomp/syntax/ast_tuple_pattern_flatten.ml

@@ -99,7 +99,7 @@ let flattern_tuple_pattern_vb
           List.for_all is_simple_pattern xs &&
           Ext_list.same_length es xs
         ->
-        Bs_ast_invariant.warn_unused_attributes tuple_attributes ; (* will be dropped*)
+        Bs_ast_invariant.warn_discarded_unused_attributes tuple_attributes ; (* will be dropped*)
         Ext_list.fold_right2 xs es acc (fun pat exp acc->
              {Parsetree.
                pvb_pat =

jscomp/syntax/ast_utf8_string_interp.ml

@@ -385,6 +385,8 @@ let to_string_ident : Longident.t =
 
 
 let escaped_j_delimiter =  "*j" (* not user level syntax allowed *)
+let unescaped_j_delimiter = "j"
+let unescaped_js_delimiter = "js"
 
 let escaped = Some escaped_j_delimiter 
 
@@ -457,7 +459,7 @@ let transform_interp loc s =
 
 
 let transform (e : Parsetree.expression) s delim : Parsetree.expression = 
-    if Ext_string.equal delim Literals.unescaped_js_delimiter then
+    if Ext_string.equal delim unescaped_js_delimiter then
         let js_str = Ast_utf8_string.transform e.pexp_loc s in
         { e with pexp_desc =
                        Pexp_constant (
@@ -467,8 +469,12 @@ let transform (e : Parsetree.expression) s delim : Parsetree.expression =
             Const_string 
 #end                                     
                          (js_str, escaped))}
-    else if Ext_string.equal delim Literals.unescaped_j_delimiter then
+    else if Ext_string.equal delim unescaped_j_delimiter then
             transform_interp e.pexp_loc s
     else e
 
-let is_unicode_string opt = Ext_string.equal opt escaped_j_delimiter    
+let is_unicode_string opt = Ext_string.equal opt escaped_j_delimiter    
+
+let is_unescaped s = 
+  Ext_string.equal s unescaped_j_delimiter
+  || Ext_string.equal s unescaped_js_delimiter

jscomp/syntax/ast_utf8_string_interp.mli

@@ -75,5 +75,9 @@ val transform :
   Parsetree.expression
 
 val is_unicode_string :   
+  string -> 
+  bool
+
+val is_unescaped :   
   string -> 
   bool

jscomp/syntax/bs_ast_invariant.ml

@@ -33,8 +33,9 @@ let is_bs_attribute txt =
    String.unsafe_get txt 2 = '.'
   )
 
-let used_attributes : Parsetree.attribute Hash_set_poly.t = Hash_set_poly.create 16 
+let used_attributes : _ Hash_set_poly.t = Hash_set_poly.create 16 
 
+#if false then
 let dump_attribute fmt = (fun ( (sloc : string Asttypes.loc),payload) -> 
     Format.fprintf fmt "@[%s %a@]" sloc.txt (Printast.payload 0 ) payload
     )
@@ -43,28 +44,31 @@ let dump_used_attributes fmt =
   Format.fprintf fmt "Used attributes Listing Start:@.";
   Hash_set_poly.iter  (fun attr -> dump_attribute fmt attr) used_attributes;
   Format.fprintf fmt "Used attributes Listing End:@."
+#end
 
-
-let mark_used_bs_attribute (x : Parsetree.attribute) = 
-  Hash_set_poly.add used_attributes x
+(* only mark non-ghost used bs attribute *)
+let mark_used_bs_attribute ((x,_) : Parsetree.attribute) = 
+  if not x.loc.loc_ghost then
+    Hash_set_poly.add used_attributes x
 
 let dummy_unused_attribute : Warnings.t = (Bs_unused_attribute "")
 
 
 
 let warn_unused_attribute 
-  (({txt; loc}, _) as attr : Parsetree.attribute) = 
+  (({txt; loc} as sloc, _) : Parsetree.attribute) = 
   if is_bs_attribute txt && 
-     not (Hash_set_poly.mem used_attributes attr) then 
+     not loc.loc_ghost &&
+     not (Hash_set_poly.mem used_attributes sloc) then 
     begin    
-#if BS_DEBUG then (*COMMENT*)
+#if false then (*COMMENT*)
       dump_used_attributes Format.err_formatter; 
       dump_attribute Format.err_formatter attr ;
 #end
       Location.prerr_warning loc (Bs_unused_attribute txt)
     end
 
-let warn_unused_attributes (attrs : Parsetree.attributes) = 
+let warn_discarded_unused_attributes (attrs : Parsetree.attributes) = 
   if attrs <> [] then 
     Ext_list.iter attrs warn_unused_attribute
 
@@ -90,8 +94,7 @@ let emit_external_warnings : iterator=
           Const_string 
 #end
           (_, Some s)) 
-          when Ext_string.equal s Literals.unescaped_j_delimiter 
-            || Ext_string.equal s Literals.unescaped_js_delimiter -> 
+          when Ast_utf8_string_interp.is_unescaped s -> 
           Bs_warnings.error_unescaped_delimiter a.pexp_loc s 
         | _ -> default_iterator.expr self a 
       );

jscomp/syntax/bs_ast_invariant.mli

@@ -30,10 +30,10 @@ type iterator = Bs_ast_iterator.iterator
 val mark_used_bs_attribute : 
   Parsetree.attribute -> unit 
 
-(** [warn_unused_attributes discarded]
+(** [warn_discarded_unused_attributes discarded]
   warn if [discarded] has unused bs attribute
 *)  
-val warn_unused_attributes :   
+val warn_discarded_unused_attributes :   
   Parsetree.attributes -> unit 
 (** Ast invariant checking for detecting errors *)
 

jscomp/syntax/external_process.ml

@@ -84,7 +84,7 @@ let get_arg_type
         we should warn, there is a trade off whether
         we should warn dropped non bs attribute or not
       *)
-      Bs_ast_invariant.warn_unused_attributes ptyp_attrs;
+      Bs_ast_invariant.warn_discarded_unused_attributes ptyp_attrs;
       match result with
       |  None ->
         Bs_syntaxerr.err ptyp.ptyp_loc Invalid_underscore_type_in_external