Remove more .re syntax leftovers (#5712)

cknitt · web-flow · commit 3aedb24ebbc3 · 2022-10-01T15:26:33.000+02:00
diff --git a/jscomp/bsb/bsb_file_groups.ml b/jscomp/bsb/bsb_file_groups.ml
@@ -38,7 +38,7 @@ type file_group = {
   is_dev : bool;
   generators : build_generator list;
       (* output of [generators] should be added to [sources],
-         if it is [.ml,.mli,.re,.rei]
+         if it is [.ml,.mli,.res,.resi]
       *)
 }
 
diff --git a/jscomp/bsb/bsb_file_groups.mli b/jscomp/bsb/bsb_file_groups.mli
@@ -39,7 +39,7 @@ type file_group = {
   (* false means not in dev mode *)
   generators : build_generator list;
       (* output of [generators] should be added to [sources],
-         if it is [.ml,.mli,.re,.rei]
+         if it is [.ml,.mli,.res,.resi]
       *)
 }
 
diff --git a/jscomp/gentype/EmitJs.ml b/jscomp/gentype/EmitJs.ml
@@ -229,7 +229,7 @@ let emitCodeItem ~config ~emitters ~moduleItemsEmitter ~env ~fileName
                ("In case of type error, check the type of '" ^ valueName
               ^ "' in '"
                ^ (fileName |> ModuleName.toString)
-               ^ ".re'" ^ " and '"
+               ^ ".res'" ^ " and '"
                ^ (importPath |> ImportPath.emit)
                ^ "'.")
              ~early:true ~emitters ~name:valueNameTypeChecked ~type_
diff --git a/jscomp/gentype/GenTypeMain.ml b/jscomp/gentype/GenTypeMain.ml
@@ -104,9 +104,9 @@ let processCmtFile cmt =
     let isInterface = Filename.check_suffix cmtFile ".cmti" in
     let resolver =
       ModuleResolver.createLazyResolver ~config
-        ~extensions:[ ".re"; ".res"; EmitType.shimExtension ]
+        ~extensions:[ ".res"; EmitType.shimExtension ]
         ~excludeFile:(fun fname ->
-          fname = "React.re" || fname = "ReasonReact.re")
+          fname = "React.res" || fname = "ReasonReact.res")
     in
     let inputCMT, hasGenTypeAnnotations =
       let inputCMT = readCmt cmtFile in
diff --git a/jscomp/gentype/ModuleResolver.ml b/jscomp/gentype/ModuleResolver.ml
@@ -195,28 +195,25 @@ let apply ~resolver ~useBsDependencies moduleName =
   moduleName |> Lazy.force resolver.lazyFind ~useBsDependencies
 
 (** Resolve a reference to ModuleName, and produce a path suitable for require.
-   E.g. require "../foo/bar/ModuleName.ext" where ext is ".re" or ".js". *)
+   E.g. require "../foo/bar/ModuleName.ext" where ext is ".res" or ".js". *)
 let resolveModule ~(config : Config.t) ~importExtension ~outputFileRelative
     ~resolver ~useBsDependencies moduleName =
   let outputFileRelativeDir =
-    (* e.g. src if we're generating src/File.re.js *)
+    (* e.g. src if we're generating src/File.bs.js *)
     Filename.dirname outputFileRelative
   in
   let outputFileAbsoluteDir = config.projectRoot +++ outputFileRelativeDir in
-  let moduleNameReFile =
-    (* Check if the module is in the same directory as the file being generated.
-       So if e.g. project_root/src/ModuleName.re exists. *)
-    outputFileAbsoluteDir +++ (ModuleName.toString moduleName ^ ".re")
-  in
   let moduleNameResFile =
+    (* Check if the module is in the same directory as the file being generated.
+       So if e.g. project_root/src/ModuleName.res exists. *)
     outputFileAbsoluteDir +++ (ModuleName.toString moduleName ^ ".res")
   in
   let candidate =
     (* e.g. import "./Modulename.ext" *)
     moduleName
     |> ImportPath.fromModule ~dir:Filename.current_dir_name ~importExtension
   in
-  if Sys.file_exists moduleNameReFile || Sys.file_exists moduleNameResFile then
+  if Sys.file_exists moduleNameResFile then
     candidate
   else
     let rec pathToList path =
@@ -229,7 +226,7 @@ let resolveModule ~(config : Config.t) ~importExtension ~outputFileRelative
     match moduleName |> apply ~resolver ~useBsDependencies with
     | None -> candidate
     | Some (resolvedModuleDir, case, bsDependencies) ->
-        (* e.g. "dst" in case of dst/ModuleName.re  *)
+        (* e.g. "dst" in case of dst/ModuleName.res *)
         let walkUpOutputDir =
           outputFileRelativeDir |> pathToList
           |> List.map (fun _ -> Filename.parent_dir_name)
diff --git a/jscomp/gentype/Paths.ml b/jscomp/gentype/Paths.ml
@@ -61,7 +61,7 @@ let getBsConfigFile ~projectRoot =
   match bsconfig |> Sys.file_exists with true -> Some bsconfig | false -> None
 
 (** Find the relative path from /.../bs/lib
-   e.g. /foo/bar/bs/lib/src/Hello.re --> src/Hello.re *)
+   e.g. /foo/bar/bs/lib/src/Hello.res --> src/Hello.res *)
 let relativePathFromBsLib fileName =
   if Filename.is_relative fileName then fileName
   else
diff --git a/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.resi b/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.resi
@@ -1,4 +1,4 @@
-// Use the annotations, and definitions, from the .re file
+// Use the annotations, and definitions, from the .res file
 @@genType.ignoreInterface
 
 @genType type t
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.gen.tsx
@@ -6,7 +6,7 @@ import {default as makeNotChecked} from './hookExample';
 
 import {default as defaultNotChecked} from './hookExample';
 
-// In case of type error, check the type of 'make' in 'ImportHookDefault.re' and './hookExample'.
+// In case of type error, check the type of 'make' in 'ImportHookDefault.res' and './hookExample'.
 export const makeTypeChecked: React.ComponentType<{
   readonly person: person; 
   readonly children: React.ReactNode; 
@@ -20,7 +20,7 @@ export const make: unknown = makeTypeChecked as React.ComponentType<{
   readonly renderMe: ImportHooks_renderMe<string>
 }>;
 
-// In case of type error, check the type of 'default' in 'ImportHookDefault.re' and './hookExample'.
+// In case of type error, check the type of 'default' in 'ImportHookDefault.res' and './hookExample'.
 export const defaultTypeChecked: React.ComponentType<{
   readonly person: person; 
   readonly children: React.ReactNode; 
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.gen.tsx
@@ -6,7 +6,7 @@ import {makeRenamed as makeRenamedNotChecked} from './hookExample';
 
 import {foo as fooNotChecked} from './hookExample';
 
-// In case of type error, check the type of 'makeRenamed' in 'ImportHooks.re' and './hookExample'.
+// In case of type error, check the type of 'makeRenamed' in 'ImportHooks.res' and './hookExample'.
 export const makeRenamedTypeChecked: React.ComponentType<{
   readonly actions?: JSX.Element; 
   readonly person: person; 
@@ -22,7 +22,7 @@ export const makeRenamed: unknown = makeRenamedTypeChecked as React.ComponentTyp
   readonly renderMe: renderMe<any>
 }>;
 
-// In case of type error, check the type of 'foo' in 'ImportHooks.re' and './hookExample'.
+// In case of type error, check the type of 'foo' in 'ImportHooks.res' and './hookExample'.
 export const fooTypeChecked: (_1:{ readonly person: person }) => string = fooNotChecked;
 
 // Export 'foo' early to allow circular import from the '.bs.js' file.
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.gen.tsx
@@ -4,7 +4,7 @@
 
 import {default as defaultNotChecked} from './';
 
-// In case of type error, check the type of 'default' in 'ImportIndex.re' and './'.
+// In case of type error, check the type of 'default' in 'ImportIndex.res' and './'.
 export const defaultTypeChecked: React.ComponentType<{ readonly method?: "push" | "replace" }> = defaultNotChecked;
 
 // Export '$$default' early to allow circular import from the '.bs.js' file.
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx
@@ -22,31 +22,31 @@ import {default as defaultNotChecked} from './MyMath';
 import * as Curry__Es6Import from 'rescript/lib/es6/curry.js';
 const Curry: any = Curry__Es6Import;
 
-// In case of type error, check the type of 'round' in 'ImportJsValue.re' and './MyMath'.
+// In case of type error, check the type of 'round' in 'ImportJsValue.res' and './MyMath'.
 export const roundTypeChecked: (_1:number) => number = roundNotChecked;
 
 // Export 'round' early to allow circular import from the '.bs.js' file.
 export const round: unknown = roundTypeChecked as (_1:number) => number;
 
-// In case of type error, check the type of 'area' in 'ImportJsValue.re' and './MyMath'.
+// In case of type error, check the type of 'area' in 'ImportJsValue.res' and './MyMath'.
 export const areaTypeChecked: (_1:point) => number = areaNotChecked;
 
 // Export 'area' early to allow circular import from the '.bs.js' file.
 export const area: unknown = areaTypeChecked as (_1:point) => number;
 
-// In case of type error, check the type of 'returnMixedArray' in 'ImportJsValue.re' and './MyMath'.
+// In case of type error, check the type of 'returnMixedArray' in 'ImportJsValue.res' and './MyMath'.
 export const returnMixedArrayTypeChecked: () => numberOrString[] = returnMixedArrayNotChecked;
 
 // Export 'returnMixedArray' early to allow circular import from the '.bs.js' file.
 export const returnMixedArray: unknown = returnMixedArrayTypeChecked as () => numberOrString[];
 
-// In case of type error, check the type of 'useColor' in 'ImportJsValue.re' and './MyMath'.
+// In case of type error, check the type of 'useColor' in 'ImportJsValue.res' and './MyMath'.
 export const useColorTypeChecked: (_1:color) => number = useColorNotChecked;
 
 // Export 'useColor' early to allow circular import from the '.bs.js' file.
 export const useColor: unknown = useColorTypeChecked as (_1:color) => number;
 
-// In case of type error, check the type of 'higherOrder' in 'ImportJsValue.re' and './MyMath'.
+// In case of type error, check the type of 'higherOrder' in 'ImportJsValue.res' and './MyMath'.
 export const higherOrderTypeChecked: (_1:((_1:number, _2:number) => number)) => number = higherOrderNotChecked;
 
 // Export 'higherOrder' early to allow circular import from the '.bs.js' file.
@@ -58,7 +58,7 @@ export const higherOrder: unknown = function (Arg1: any) {
   return result
 } as (_1:((_1:number, _2:number) => number)) => number;
 
-// In case of type error, check the type of 'convertVariant' in 'ImportJsValue.re' and './MyMath'.
+// In case of type error, check the type of 'convertVariant' in 'ImportJsValue.res' and './MyMath'.
 export const convertVariantTypeChecked: (_1:variant) => variant = convertVariantNotChecked;
 
 // Export 'convertVariant' early to allow circular import from the '.bs.js' file.
@@ -71,13 +71,13 @@ export const convertVariant: unknown = function (Arg1: any) {
     : {TAG: 1, _0:result.value} as any
 } as (_1:variant) => variant;
 
-// In case of type error, check the type of 'polymorphic' in 'ImportJsValue.re' and './MyMath'.
+// In case of type error, check the type of 'polymorphic' in 'ImportJsValue.res' and './MyMath'.
 export const polymorphicTypeChecked: <a>(_1:a) => a = polymorphicNotChecked;
 
 // Export 'polymorphic' early to allow circular import from the '.bs.js' file.
 export const polymorphic: unknown = polymorphicTypeChecked as <a>(_1:a) => a;
 
-// In case of type error, check the type of 'default' in 'ImportJsValue.re' and './MyMath'.
+// In case of type error, check the type of 'default' in 'ImportJsValue.res' and './MyMath'.
 export const defaultTypeChecked: number = defaultNotChecked;
 
 // Export '$$default' early to allow circular import from the '.bs.js' file.
diff --git a/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx
@@ -6,7 +6,7 @@ import {make as makeNotChecked} from './hookExample';
 
 import * as React from 'react';
 
-// In case of type error, check the type of 'make' in 'JSXV4.re' and './hookExample'.
+// In case of type error, check the type of 'make' in 'JSXV4.res' and './hookExample'.
 export const makeTypeChecked: React.ComponentType<{
   readonly actions?: JSX.Element; 
   readonly person: person; 
diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyInput.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/MyInput.gen.tsx
@@ -4,7 +4,7 @@
 
 import {default as defaultNotChecked} from './MyInput';
 
-// In case of type error, check the type of 'default' in 'MyInput.re' and './MyInput'.
+// In case of type error, check the type of 'default' in 'MyInput.res' and './MyInput'.
 export const defaultTypeChecked: React.ComponentType<{ readonly onFocus?: (_1:inputFocusEvent) => void }> = defaultNotChecked;
 
 // Export '$$default' early to allow circular import from the '.bs.js' file.
diff --git a/jscomp/ounit_tests/ounit_string_tests.ml b/jscomp/ounit_tests/ounit_string_tests.ml
@@ -72,12 +72,12 @@ let suites =
     (* __LOC__ >:: begin fun _ -> 
       OUnit.assert_bool __LOC__ @@
       List.for_all (fun x -> Ext_string.is_valid_source_name x = Good)
-        ["x.ml"; "x.mli"; "x.re"; "x.rei"; 
+        ["x.ml"; "x.mli"; "x.res"; "x.resi"; 
          "A_x.ml"; "ab.ml"; "a_.ml"; "a__.ml";
          "ax.ml"];
       OUnit.assert_bool __LOC__ @@ not @@
       List.exists (fun x -> Ext_string.is_valid_source_name x = Good)
-        [".re"; ".rei";"..re"; "..rei"; "..ml"; ".mll~"; 
+        [".res"; ".resi";"..res"; "..resi"; "..ml"; ".mll~"; 
          "...ml"; "_.mli"; "_x.ml"; "__.ml"; "__.rei"; 
          ".#hello.ml"; ".#hello.rei"; "a-.ml"; "a-b.ml"; "-a-.ml"
         ; "-.ml"
@@ -486,7 +486,10 @@ let suites =
           (Ext_filename.module_name "a/b/c.d")
           "C";
         string_eq 
-          (Ext_filename.module_name "a/b/xc.re")
+          (Ext_filename.module_name "a/b/xc.res")
+          "Xc";
+        string_eq 
+          (Ext_filename.module_name "a/b/xc.resi")
           "Xc";
         string_eq 
           (Ext_filename.module_name "a/b/xc.ml")
diff --git a/jscomp/test/ext_string_test.js b/jscomp/test/ext_string_test.js
@@ -493,11 +493,11 @@ function is_valid_source_name(name) {
   var x = check_any_suffix_case_then_chop(name, {
         hd: ".ml",
         tl: {
-          hd: ".re",
+          hd: ".res",
           tl: {
             hd: ".mli",
             tl: {
-              hd: ".rei",
+              hd: ".resi",
               tl: /* [] */0
             }
           }
diff --git a/jscomp/test/ext_string_test.ml b/jscomp/test/ext_string_test.ml
@@ -363,9 +363,9 @@ type check_result =
 let is_valid_source_name name : check_result =
   match check_any_suffix_case_then_chop name [
       ".ml"; 
-      ".re";
+      ".res";
       ".mli"; 
-      ".rei"
+      ".resi"
     ] with 
   | None -> Suffix_mismatch
   | Some x -> 
diff --git a/lib/4.06.1/rescript.ml b/lib/4.06.1/rescript.ml
@@ -4387,7 +4387,7 @@ type file_group = {
   (* false means not in dev mode *)
   generators : build_generator list;
       (* output of [generators] should be added to [sources],
-         if it is [.ml,.mli,.re,.rei]
+         if it is [.ml,.mli,.res,.resi]
       *)
 }
 
@@ -4445,7 +4445,7 @@ type file_group = {
   is_dev : bool;
   generators : build_generator list;
       (* output of [generators] should be added to [sources],
-         if it is [.ml,.mli,.re,.rei]
+         if it is [.ml,.mli,.res,.resi]
       *)
 }
 
diff --git a/lib/4.06.1/unstable/all_ounit_tests.ml b/lib/4.06.1/unstable/all_ounit_tests.ml
@@ -38647,12 +38647,12 @@ let suites =
     (* __LOC__ >:: begin fun _ -> 
       OUnit.assert_bool __LOC__ @@
       List.for_all (fun x -> Ext_string.is_valid_source_name x = Good)
-        ["x.ml"; "x.mli"; "x.re"; "x.rei"; 
+        ["x.ml"; "x.mli"; "x.res"; "x.resi"; 
          "A_x.ml"; "ab.ml"; "a_.ml"; "a__.ml";
          "ax.ml"];
       OUnit.assert_bool __LOC__ @@ not @@
       List.exists (fun x -> Ext_string.is_valid_source_name x = Good)
-        [".re"; ".rei";"..re"; "..rei"; "..ml"; ".mll~"; 
+        [".res"; ".resi";"..res"; "..resi"; "..ml"; ".mll~"; 
          "...ml"; "_.mli"; "_x.ml"; "__.ml"; "__.rei"; 
          ".#hello.ml"; ".#hello.rei"; "a-.ml"; "a-b.ml"; "-a-.ml"
         ; "-.ml"
@@ -39061,7 +39061,10 @@ let suites =
           (Ext_filename.module_name "a/b/c.d")
           "C";
         string_eq 
-          (Ext_filename.module_name "a/b/xc.re")
+          (Ext_filename.module_name "a/b/xc.res")
+          "Xc";
+        string_eq 
+          (Ext_filename.module_name "a/b/xc.resi")
           "Xc";
         string_eq 
           (Ext_filename.module_name "a/b/xc.ml")
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
@@ -239914,28 +239914,25 @@ let apply ~resolver ~useBsDependencies moduleName =
   moduleName |> Lazy.force resolver.lazyFind ~useBsDependencies
 
 (** Resolve a reference to ModuleName, and produce a path suitable for require.
-   E.g. require "../foo/bar/ModuleName.ext" where ext is ".re" or ".js". *)
+   E.g. require "../foo/bar/ModuleName.ext" where ext is ".res" or ".js". *)
 let resolveModule ~(config : Config.t) ~importExtension ~outputFileRelative
     ~resolver ~useBsDependencies moduleName =
   let outputFileRelativeDir =
-    (* e.g. src if we're generating src/File.re.js *)
+    (* e.g. src if we're generating src/File.bs.js *)
     Filename.dirname outputFileRelative
   in
   let outputFileAbsoluteDir = config.projectRoot +++ outputFileRelativeDir in
-  let moduleNameReFile =
-    (* Check if the module is in the same directory as the file being generated.
-       So if e.g. project_root/src/ModuleName.re exists. *)
-    outputFileAbsoluteDir +++ (ModuleName.toString moduleName ^ ".re")
-  in
   let moduleNameResFile =
+    (* Check if the module is in the same directory as the file being generated.
+       So if e.g. project_root/src/ModuleName.res exists. *)
     outputFileAbsoluteDir +++ (ModuleName.toString moduleName ^ ".res")
   in
   let candidate =
     (* e.g. import "./Modulename.ext" *)
     moduleName
     |> ImportPath.fromModule ~dir:Filename.current_dir_name ~importExtension
   in
-  if Sys.file_exists moduleNameReFile || Sys.file_exists moduleNameResFile then
+  if Sys.file_exists moduleNameResFile then
     candidate
   else
     let rec pathToList path =
@@ -239948,7 +239945,7 @@ let resolveModule ~(config : Config.t) ~importExtension ~outputFileRelative
     match moduleName |> apply ~resolver ~useBsDependencies with
     | None -> candidate
     | Some (resolvedModuleDir, case, bsDependencies) ->
-        (* e.g. "dst" in case of dst/ModuleName.re  *)
+        (* e.g. "dst" in case of dst/ModuleName.res *)
         let walkUpOutputDir =
           outputFileRelativeDir |> pathToList
           |> List.map (fun _ -> Filename.parent_dir_name)
@@ -240068,7 +240065,7 @@ let getBsConfigFile ~projectRoot =
   match bsconfig |> Sys.file_exists with true -> Some bsconfig | false -> None
 
 (** Find the relative path from /.../bs/lib
-   e.g. /foo/bar/bs/lib/src/Hello.re --> src/Hello.re *)
+   e.g. /foo/bar/bs/lib/src/Hello.res --> src/Hello.res *)
 let relativePathFromBsLib fileName =
   if Filename.is_relative fileName then fileName
   else
@@ -241887,7 +241884,7 @@ let emitCodeItem ~config ~emitters ~moduleItemsEmitter ~env ~fileName
                ("In case of type error, check the type of '" ^ valueName
               ^ "' in '"
                ^ (fileName |> ModuleName.toString)
-               ^ ".re'" ^ " and '"
+               ^ ".res'" ^ " and '"
                ^ (importPath |> ImportPath.emit)
                ^ "'.")
              ~early:true ~emitters ~name:valueNameTypeChecked ~type_
@@ -243649,9 +243646,9 @@ let processCmtFile cmt =
     let isInterface = Filename.check_suffix cmtFile ".cmti" in
     let resolver =
       ModuleResolver.createLazyResolver ~config
-        ~extensions:[ ".re"; ".res"; EmitType.shimExtension ]
+        ~extensions:[ ".res"; EmitType.shimExtension ]
         ~excludeFile:(fun fname ->
-          fname = "React.re" || fname = "ReasonReact.re")
+          fname = "React.res" || fname = "ReasonReact.res")
     in
     let inputCMT, hasGenTypeAnnotations =
       let inputCMT = readCmt cmtFile in
diff --git a/scripts/littlecase.js b/scripts/littlecase.js
diff --git a/scripts/ninja.js b/scripts/ninja.js
diff --git a/scripts/rescript_convert.js b/scripts/rescript_convert.js
diff --git a/scripts/tasks.js b/scripts/tasks.js

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ type file_group = {`
`38`	`38`	`is_dev : bool;`
`39`	`39`	`generators : build_generator list;`
`40`	`40`	`(* output of [generators] should be added to [sources],`
`41`		`- if it is [.ml,.mli,.re,.rei]`
	`41`	`+ if it is [.ml,.mli,.res,.resi]`
`42`	`42`	`*)`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ type file_group = {`
`39`	`39`	`(* false means not in dev mode *)`
`40`	`40`	`generators : build_generator list;`
`41`	`41`	`(* output of [generators] should be added to [sources],`
`42`		`- if it is [.ml,.mli,.re,.rei]`
	`42`	`+ if it is [.ml,.mli,.res,.resi]`
`43`	`43`	`*)`
`44`	`44`	`}`
`45`	`45`