diff --git a/editor-extensions/vscode/package-lock.json b/editor-extensions/vscode/package-lock.json
index bc8f9338..3cc270b2 100644
--- a/editor-extensions/vscode/package-lock.json
+++ b/editor-extensions/vscode/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "reason-vscode",
- "version": "1.7.2",
+ "version": "1.7.11",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/editor-extensions/vscode/package.json b/editor-extensions/vscode/package.json
index dd13245e..91e4575a 100644
--- a/editor-extensions/vscode/package.json
+++ b/editor-extensions/vscode/package.json
@@ -19,7 +19,8 @@
"activationEvents": [
"onLanguage:reason",
"onLanguage:ocaml",
- "onLanguage:reason_lisp"
+ "onLanguage:reason_lisp",
+ "onLanguage:bucklescript"
],
"main": "./src/index",
"contributes": {
diff --git a/examples/example-project/.vscode/settings.json b/examples/example-project/.vscode/settings.json
index 0f0e9a37..b4107e50 100644
--- a/examples/example-project/.vscode/settings.json
+++ b/examples/example-project/.vscode/settings.json
@@ -1,10 +1,10 @@
{
"editor.codeLens": true,
// "reason_language_server.location": "../../lib/bs/native/bin.native",
- "reason_language_server.location": "../../_build/default/bin/Bin.exe",
+ "reason_language_server.location": "../../bin.exe",
// "reason_language_server.location": "../lib/bs/native/bin.native.exe",
"reason_language_server.reloadOnChange": true,
- "reason_language_server.per_value_codelens": false,
+ "reason_language_server.per_value_codelens": true,
"reason_language_server.show_debug_errors": true,
// "reason_language_server.autoRebuild": false,
//"reason_language_server.show_module_path_on_hover": false
diff --git a/examples/example-project/bsconfig.json b/examples/example-project/bsconfig.json
index db7fac24..8cbede0a 100644
--- a/examples/example-project/bsconfig.json
+++ b/examples/example-project/bsconfig.json
@@ -5,6 +5,8 @@
"warnings": {
"number": "-32-26-27-33"
},
+ "bs-dependencies": ["reason-react"],
+ "reason": { "react-jsx": 3 },
"namespace": "try-it",
"refmt": 3
}
\ No newline at end of file
diff --git a/examples/example-project/package-lock.json b/examples/example-project/package-lock.json
index 124dc123..fc2cc624 100644
--- a/examples/example-project/package-lock.json
+++ b/examples/example-project/package-lock.json
@@ -3,9 +3,14 @@
"lockfileVersion": 1,
"dependencies": {
"bs-platform": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-5.0.0.tgz",
- "integrity": "sha512-zxLobdIaf/r7go47hOgxcd6C0ANh7MYMEtZNb9Al7JdoekzFZI50F4GpZpP8kMh9Z+M5PoPE1WuryT4S8mT8Kg=="
+ "version": "8.2.0",
+ "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-8.2.0.tgz",
+ "integrity": "sha512-quvmUac/ZxGDsT7L5+6RNXrLPvLHkWFownacaqlwVoyAm770bPyupTRU49ALPGk3HpjfD5eE+lpGdOSPtuwJiA=="
+ },
+ "reason-react": {
+ "version": "0.9.1",
+ "resolved": "https://registry.npmjs.org/reason-react/-/reason-react-0.9.1.tgz",
+ "integrity": "sha512-nlH0O2TDy9KzOLOW+vlEQk4ExHOeciyzFdoLcsmmiit6hx6H5+CVDrwJ+8aiaLT/kqK5xFOjy4PS7PftWz4plA=="
}
}
}
diff --git a/examples/example-project/package.json b/examples/example-project/package.json
index 2816c9e0..f7b9ac47 100644
--- a/examples/example-project/package.json
+++ b/examples/example-project/package.json
@@ -1,6 +1,7 @@
{
"dependencies": {
- "bs-platform": "^5.0.0"
+ "bs-platform": "8.2.0",
+ "reason-react": "^0.9.1"
},
"scripts": {
"build": "bsb -make-world",
diff --git a/examples/example-project/src/Awesome.rei b/examples/example-project/src/Awesome.rei
deleted file mode 100644
index 1c4c81ca..00000000
--- a/examples/example-project/src/Awesome.rei
+++ /dev/null
@@ -1,4 +0,0 @@
-type atype = {
- name: int,
- age: int,
-};
\ No newline at end of file
diff --git a/examples/example-project/src/Hello.re b/examples/example-project/src/Hello.re
index 8e36e994..4305486c 100644
--- a/examples/example-project/src/Hello.re
+++ b/examples/example-project/src/Hello.re
@@ -77,8 +77,8 @@ let a = [
let div = (~x, ~y, ~children, ()) => 10;
let m = ;
let something = animal => switch animal {
diff --git a/examples/example-project/src/ZZ.res b/examples/example-project/src/ZZ.res
new file mode 100644
index 00000000..84ee822c
--- /dev/null
+++ b/examples/example-project/src/ZZ.res
@@ -0,0 +1,16 @@
+
+
+let a = 12
+
+let b = [1, 2, 3, a]
+
+
+let c =
+
+// module M = {
+// @react.component
+// let make = (~x) => React.string(x)
+// }
+
+
+// let d =
diff --git a/src/analyze/AsYouType.re b/src/analyze/AsYouType.re
index 4ca571d9..9c5fad70 100644
--- a/src/analyze/AsYouType.re
+++ b/src/analyze/AsYouType.re
@@ -62,6 +62,8 @@ let format = (text, fmtCmd) => {
};
let justBscCommand = (~interface, ~reasonFormat, ~command, compilerPath, sourceFile, includes, flags) => {
+ // TestRes
+ let res = Filename.check_suffix(sourceFile, ".res") || Filename.check_suffix(sourceFile, ".resi");
let flags = reasonFormat ? {
/* Filter out -pp flags for Reason files. Refmt is the only preprocessor
that should apply to Reason files. */
@@ -82,7 +84,7 @@ let justBscCommand = (~interface, ~reasonFormat, ~command, compilerPath, sourceF
command,
includes |> List.map(i => Printf.sprintf("-I %s", Commands.shellEscape(i))) |> String.concat(" "),
flags ++ (reasonFormat ? " -bs-re-out" : ""),
- interface ? "-intf" : "-impl",
+ res ? "" : (interface ? "-intf" : "-impl"),
sourceFile
)
};
@@ -173,7 +175,13 @@ let getAst = (~cacheLocation, ~compilerVersion, ~moduleName, ~uri) => {
let process = (~uri, ~moduleName, ~basePath, ~reasonFormat, text, ~cacheLocation, ~compilerVersion, ~allLocations, compilerPath, refmtPath, includes, flags) => {
let interface = Utils.endsWith(uri, "i");
+ // TestRes
+ let res = Utils.endsWith(uri, "res") || Utils.endsWith(uri, "resi");
let%try (syntaxError, astFile) = switch (refmtPath) {
+ | _ when res =>
+ let astFile = cacheLocation /+ moduleName ++ ".res" ++ (interface ? "i" : "");
+ let%try () = Files.writeFileResult(astFile, text);
+ Ok((None, astFile))
| Some(refmtPath) => runRefmt(~interface, ~moduleName, ~cacheLocation, text, refmtPath);
| None => {
let astFile = cacheLocation /+ moduleName ++ ".ast" ++ (interface ? "i" : "");
@@ -228,7 +236,7 @@ let process = (~uri, ~moduleName, ~basePath, ~reasonFormat, text, ~cacheLocation
// | _ => Log.log("Doesn't exist")
// };
let%try_wrap full = fullForCmt(cmtPath, uri, x => x);
- Success(String.concat("\n", lines @ error), full)
+ Success(String.concat("\n", (res ? [] : lines) @ error), full)
}
}
};