Skip to content

Commit 77bb8be

Browse files
committed
Avoid crash when switching from 9.x to 10.x.
1 parent af3c2f2 commit 77bb8be

5 files changed

+7
-20
lines changed

Diff for: src/bindings/RescriptCompilerApi.mjs

+1-9
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,6 @@ function fromString(apiVersion) {
8888
}
8989
}
9090

91-
function defaultTargetLang(t) {
92-
if (t === 0) {
93-
return /* Res */2;
94-
} else {
95-
return /* Reason */0;
96-
}
97-
}
98-
9991
function availableLanguages(t) {
10092
if (t === 0) {
10193
return [
@@ -109,7 +101,7 @@ function availableLanguages(t) {
109101

110102
var Version = {
111103
fromString: fromString,
112-
defaultTargetLang: defaultTargetLang,
104+
defaultTargetLang: /* Res */2,
113105
availableLanguages: availableLanguages
114106
};
115107

Diff for: src/bindings/RescriptCompilerApi.res

+1-5
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,7 @@ module Version = {
5858
| _ => UnknownVersion(apiVersion)
5959
}
6060

61-
let defaultTargetLang = t =>
62-
switch t {
63-
| V1 => Lang.Res
64-
| _ => Reason
65-
}
61+
let defaultTargetLang = Lang.Res
6662

6763
let availableLanguages = t =>
6864
switch t {

Diff for: src/bindings/RescriptCompilerApi.resi

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module Version: {
2828
// Helps finding the right API version
2929
let fromString: string => t
3030

31-
let defaultTargetLang: t => Lang.t
31+
let defaultTargetLang: Lang.t
3232

3333
let availableLanguages: t => array<Lang.t>
3434
}

Diff for: src/common/CompilerManagerHook.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ function useCompilerManager(initialLangOpt, onAction, param) {
404404
};
405405
var targetLang = Belt_Option.getWithDefault(Caml_option.undefined_to_opt(RescriptCompilerApi.Version.availableLanguages(apiVersion).find(function (l) {
406406
return l === initialLang;
407-
})), RescriptCompilerApi.Version.defaultTargetLang(apiVersion));
407+
})), RescriptCompilerApi.Version.defaultTargetLang);
408408
return Curry._1(setState, (function (param) {
409409
return {
410410
TAG: 2,
@@ -468,7 +468,7 @@ function useCompilerManager(initialLangOpt, onAction, param) {
468468
_0: {
469469
versions: ready.versions,
470470
selected: selected,
471-
targetLang: RescriptCompilerApi.Version.defaultTargetLang(apiVersion),
471+
targetLang: RescriptCompilerApi.Version.defaultTargetLang,
472472
errors: [],
473473
result: /* Nothing */0
474474
},

Diff for: src/common/CompilerManagerHook.res

+2-3
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ let useCompilerManager = (~initialLang: Lang.t=Res, ~onAction: option<action =>
352352
let targetLang =
353353
Version.availableLanguages(apiVersion)
354354
->Js.Array2.find(l => l === initialLang)
355-
->Belt.Option.getWithDefault(Version.defaultTargetLang(apiVersion))
355+
->Belt.Option.getWithDefault(Version.defaultTargetLang)
356356

357357
setState(_ => Ready({
358358
selected: selected,
@@ -400,7 +400,7 @@ let useCompilerManager = (~initialLang: Lang.t=Res, ~onAction: option<action =>
400400

401401
setState(_ => Ready({
402402
selected: selected,
403-
targetLang: Version.defaultTargetLang(apiVersion),
403+
targetLang: Version.defaultTargetLang,
404404
versions: ready.versions,
405405
errors: [],
406406
result: FinalResult.Nothing,
@@ -428,7 +428,6 @@ let useCompilerManager = (~initialLang: Lang.t=Res, ~onAction: option<action =>
428428
| Lang.OCaml => instance->Compiler.ocamlCompile(code)
429429
| Lang.Reason =>
430430
CompilationResult.UnexpectedError(j`Reason not supported with API version "$apiVersion"`)
431-
432431
| Lang.Res => instance->Compiler.resCompile(code)
433432
}
434433
| UnknownVersion(apiVersion) =>

0 commit comments

Comments
 (0)