Skip to content

Patch 2.0.1 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,18 @@ node_modules
test/**/*.js
doc/tags

server/**/*.d.ts
server/**/*.js.map
server/node_modules/.bin

# We don't need that file
server/analysis_binaries/README.md

# We need to vendor node_modules and all the executables
!server/node_modules/
!server/analysis_binaries/darwin-run.exe
!server/analysis_binaries/linux-run.exe
!server/analysis_binaries/win32-run.exe
!server/**/node_modules/
!server/analysis_binaries/darwin/rescript-editor-analysis.exe
!server/analysis_binaries/linux/rescript-editor-analysis.exe
!server/analysis_binaries/win32/rescript-editor-analysis.exe

examples/**/node_modules
examples/**/lib
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## master

## 2.0.1

- Fixes an issue where `:RescriptTypeHint`, `:RescriptUpgrade` fail with an 127 exit code (due to missing analysis binaries)
- Fixes `coc` server crashing issues

## 2.0.0

**Improvements:**
Expand Down
6 changes: 4 additions & 2 deletions autoload/rescript.vim
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function! rescript#Init()
let s:got_build_err = 0

if !exists("g:rescript_analysis_exe")
let g:rescript_analysis_exe = s:rescript_plugin_dir . "/server/analysis_binaries/" . s:rescript_arch . "-run.exe"
let g:rescript_analysis_exe = s:rescript_plugin_dir . "/server/analysis_binaries/" . s:rescript_arch . "/rescript-editor-analysis.exe"
endif

call rescript#UpdateProjectEnv()
Expand Down Expand Up @@ -427,7 +427,7 @@ function! rescript#Build(...)
" Otherwise we are in modern mode and use rescript.exe
let l:cmd = g:rescript_exe
if l:with_deps ==? 1
let l:cmd = g:rescript_exe . " -with-deps"
let l:cmd = g:rescript_exe . " build -with-deps"
endif
endif

Expand Down Expand Up @@ -511,6 +511,7 @@ function! rescript#ReasonToRescript()
echo "Current buffer is not a .re / .rei file... Do nothing."
return
endif

let l:command = g:rescript_bsc_exe . " -format " . @%

silent let l:out = systemlist(l:command)
Expand Down Expand Up @@ -548,6 +549,7 @@ function! rescript#Info()
echo "Detected rescript_bsb_exe: " . g:rescript_bsb_exe
else
echo "Detected rescript_exe: " . g:rescript_exe
echo "Detected (legacy) rescript_bsc_exe: " . g:rescript_bsc_exe
endif

echo "Bundled rescript server version: " . rescript#GetRescriptServerVersion()
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 5 additions & 1 deletion server/node_modules/anymatch/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/binary-extensions/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/braces/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/chokidar/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/fill-range/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/fsevents/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/glob-parent/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/is-binary-path/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/is-extglob/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/is-glob/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/is-number/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/normalize-path/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/picomatch/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/readdirp/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/to-regex-range/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion server/node_modules/vscode-jsonrpc/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading