use Location.print_loc

mununki · mununki · commit 9706da8f458a · 2023-04-28T02:22:04.000+09:00
diff --git a/jscomp/build_tests/super_errors/expected/repeated_def_extension_constr.res.expected b/jscomp/build_tests/super_errors/expected/repeated_def_extension_constr.res.expected
@@ -7,5 +7,6 @@
   [1;31m3[0m [2m│[0m type [1;31ma[0m
   4 [2m│[0m 
 
-  Multiple definition of the type name a at line 1, characters 5-6.
-  Names must be unique in a given structure or signature.
+  Multiple definition of the type name a 
+  at [1m[36m/.../fixtures/repeated_def_extension_constr.res[0m:[2m1:6[0m[0m
+   Names must be unique in a given structure or signature.
diff --git a/jscomp/build_tests/super_errors/expected/repeated_def_module_types.res.expected b/jscomp/build_tests/super_errors/expected/repeated_def_module_types.res.expected
@@ -7,5 +7,6 @@
   [1;31m3[0m [2m│[0m module type [1;31mM[0m = {}
   4 [2m│[0m 
 
-  Multiple definition of the module type name M at line 1, characters 12-13.
-  Names must be unique in a given structure or signature.
+  Multiple definition of the module type name M 
+  at [1m[36m/.../fixtures/repeated_def_module_types.res[0m:[2m1:13[0m[0m
+   Names must be unique in a given structure or signature.
diff --git a/jscomp/build_tests/super_errors/expected/repeated_def_modules.res.expected b/jscomp/build_tests/super_errors/expected/repeated_def_modules.res.expected
@@ -7,5 +7,6 @@
   [1;31m3[0m [2m│[0m module [1;31mM[0m = {}
   4 [2m│[0m 
 
-  Multiple definition of the module name M at line 1, characters 7-8.
-  Names must be unique in a given structure or signature.
+  Multiple definition of the module name M 
+  at [1m[36m/.../fixtures/repeated_def_modules.res[0m:[2m1:8[0m[0m
+   Names must be unique in a given structure or signature.
diff --git a/jscomp/build_tests/super_errors/expected/repeated_def_types.res.expected b/jscomp/build_tests/super_errors/expected/repeated_def_types.res.expected
@@ -7,5 +7,6 @@
   [1;31m3[0m [2m│[0m type [1;31ma[0m
   4 [2m│[0m 
 
-  Multiple definition of the type name a at line 1, characters 5-6.
-  Names must be unique in a given structure or signature.
+  Multiple definition of the type name a 
+  at [1m[36m/.../fixtures/repeated_def_types.res[0m:[2m1:6[0m[0m
+   Names must be unique in a given structure or signature.
diff --git a/jscomp/ml/typemod.ml b/jscomp/ml/typemod.ml
@@ -1862,11 +1862,10 @@ let report_error ppf = function
               types (other than when replacing a type constructor with @ \
               a type constructor with the same arguments).@]"
   | Repeated_name(kind, name, repeated_loc) ->
-      let (_, start_line, start_char) = Location.get_pos_info repeated_loc.loc_start in
-      let (_, _, end_char) = Location.get_pos_info repeated_loc.loc_end in
       fprintf ppf
-        "@[Multiple definition of the %s name %s at line %d, characters %d-%d.@ \
-           Names must be unique in a given structure or signature.@]" kind name start_line start_char end_char
+        "@[Multiple definition of the %s name %s @ \
+           at @{<loc>%a@}@ @ \
+           Names must be unique in a given structure or signature.@]" kind name Location.print_loc repeated_loc
   | Non_generalizable typ ->
     (* modified *)
     fprintf ppf "@[<v>";

-Original file line number
+Diff line change
   [1;31m3[0m [2m│[0m type [1;31ma[0m
 [2m│[0m
 -  Multiple definition of the type name a at line 1, characters 5-6.
 -  Names must be unique in a given structure or signature.
 +  Multiple definition of the type name a
 +  at [1m[36m/.../fixtures/repeated_def_extension_constr.res[0m:[2m1:6[0m[0m
 +   Names must be unique in a given structure or signature.