-
Notifications
You must be signed in to change notification settings - Fork 473
Analysis: resolve @rescript/runtime via environment variable RESCRIPT_RUNTIME #8023
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
+32
−10
Merged
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
26c2d3c
Fix hover for Stdlib module
nojaf 471aa28
fmt
nojaf d4800d4
Pass runtime via environment variable
nojaf 161ddc1
Revert test files
nojaf 717d384
Merge branch 'master' into fix-hover
nojaf a967931
Add changelog
nojaf ec5edd5
Revert Hover.ml
nojaf 4179647
Improve comment
nojaf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,19 +5,42 @@ let namespacedName namespace name = | |
|
|
||
| let ( /+ ) = Filename.concat | ||
|
|
||
| (* | ||
| Here is the real problem: | ||
|
|
||
| For pnpm it needs to figure out | ||
|
|
||
| "/Users/nojaf/Projects/test-stdlib/node_modules/.pnpm/@[email protected]/node_modules/@rescript/runtime" | ||
| *) | ||
|
|
||
| let getRuntimeDir rootPath = | ||
| match !Cfg.isDocGenFromCompiler with | ||
| | false -> ( | ||
| let result = | ||
| ModuleResolution.resolveNodeModulePath ~startPath:rootPath | ||
| "@rescript/runtime" | ||
| in | ||
| match result with | ||
| | Some path -> Some path | ||
| | None -> | ||
| let message = "@rescript/runtime could not be found" in | ||
| Log.log message; | ||
| None) | ||
| (* First check RESCRIPT_RUNTIME environment variable, like bsc does *) | ||
| match Sys.getenv_opt "RESCRIPT_RUNTIME" with | ||
| | Some envPath -> | ||
| if Debug.verbose () then | ||
| Printf.printf "[getRuntimeDir] Using RESCRIPT_RUNTIME=%s\n" envPath; | ||
| Some envPath | ||
| | None -> ( | ||
| let result = | ||
| ModuleResolution.resolveNodeModulePath ~startPath:rootPath | ||
| "@rescript/runtime" | ||
| in | ||
| match result with | ||
| | Some path -> | ||
| if Debug.verbose () then | ||
| Printf.printf "[getRuntimeDir] Resolved via node_modules: %s\n" path; | ||
| Some path | ||
| | None -> | ||
| let message = "@rescript/runtime could not be found" in | ||
| Log.log message; | ||
| if Debug.verbose () then | ||
| Printf.printf | ||
| "[getRuntimeDir] Failed to resolve @rescript/runtime from \ | ||
| rootPath=%s\n" | ||
| rootPath; | ||
| None)) | ||
| | true -> Some rootPath | ||
|
|
||
| let getLibBs path = Files.ifExists (path /+ "lib" /+ "bs") | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zth I would use an environment variable here to avoid breaking all the analysis commands.
Thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that's fine, we use env variables for other stuff as well. So go for it!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, ready for review.