Remove more .re syntax leftovers (rescript-lang#5712)

Author: cknitt

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]
  *)
 }
 

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]
  *)
 }
 

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_

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

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)

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

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

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; 

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.

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.