Skip to content

Find per-platform binaries for v12.0.0-alpha.13+ #1092

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@

## master

#### :rocket: New Feature

- Find `bsc.exe` and `rescript-code-editor-analysis.exe` from platform-specific packages used by ReScript `v12.0.0-alpha.13`+.https://github.com/rescript-lang/rescript-vscode/pull/1092

#### :bug: Bug fix

- Fix: bug where we incorrectly showed a warning notification about something going wrong with incremental type checking, when in fact the compiler was reporting module-related type errors https://github.com/rescript-lang/rescript-vscode/pull/1090
Expand Down
10 changes: 10 additions & 0 deletions server/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,16 @@ let findPlatformPath = (projectRootPath: p.DocumentUri | null) => {

let platformPath = path.join(rescriptDir, c.platformDir);

// Binaries have been split into optional platform-specific dependencies
// since v12.0.0-alpha.13
if (!fs.existsSync(platformPath)) {
platformPath = path.join(
rescriptDir,
"..",
`@rescript/${process.platform}-${process.arch}/bin`
)
}

// Workaround for darwinarm64 which has no folder yet in ReScript <= 9.1.4
if (
process.platform == "darwin" &&
Expand Down