Skip to content
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.

Sign up for GitHub

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

Some rewatch fixes #1033

Merged
merged 6 commits into from
Aug 30, 2024
Merged

Some rewatch fixes #1033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
45f747b
pick up on namespace-entry
jfrolich Aug 30, 2024
0dc31b8
fix workspace lookup
jfrolich Aug 30, 2024
1580d4e
fix crash when log file dissappears
jfrolich Aug 30, 2024
aced35c
fix
jfrolich Aug 30, 2024
3897e1e
remove log
jfrolich Aug 30, 2024
7ff8e71
add changelog items
jfrolich Aug 30, 2024
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: 12 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@

## master

#### :bug: Bug Fix

- Fix a regression with incremental typechecking in monorepos with rewatch, where the workspace directory was not properly set.

#### :bug: Bug Fix

- When log files are deleted (due to a clean), the editor tooling doesn't crash anymore

#### :rocket: New Feature

- Support for the `namespace-entry` feature of rewatch, to allow entrypoint modules for namespaced packages.

## 1.54.0

#### :nail_care: Polish
Expand Down
6 changes: 5 additions & 1 deletion analysis/src/FindFiles.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,18 @@ let nameSpaceToName n =

let getNamespace config =
let ns = config |> Json.get "namespace" in
let namespaceEntry = config |> Json.get "namespace-entry" in
let fromString = ns |> bind Json.string in
let isNamespaced =
ns |> bind Json.bool |> Option.value ~default:(fromString |> Option.is_some)
in
let either x y = if x = None then y else x in
if isNamespaced then
let fromName = config |> Json.get "name" |> bind Json.string in
either fromString fromName |> Option.map nameSpaceToName
let name = either fromString fromName |> Option.map nameSpaceToName in
match (namespaceEntry, name) with
| Some _, Some name -> Some ("@" ^ name)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I follow here, why is @ prepended?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a way to create a namespace entry (entry module for a namespace in rewatch) - a feature we created and use @ Walnut.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It allows you to have a namespace and create an entry module to the namespace, so not all modules are exposed. The @ is added to the normal namespace module, so it's impossible to import it syntaxwise, and it's opened in the entry module of the namespace, in that module it's possible to alias the modules that are exported from the package.

| _ -> name
else None

module StringSet = Set.Make (String)
Expand Down
2 changes: 1 addition & 1 deletion server/src/incrementalCompilation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ function triggerIncrementalCompilationOfFile(
return;
}
const workspaceRootPath = projectRootPath
? utils.findProjectRootOfFile(projectRootPath)
? utils.findProjectRootOfFile(projectRootPath, true)
: null;

const bscBinaryLocation = project.bscBinaryLocation;
Expand Down
18 changes: 11 additions & 7 deletions server/src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,17 @@ let compilerLogsWatcher = chokidar
}
}
} else {
sendUpdatedDiagnostics();
sendCompilationFinishedMessage();
if (config.extensionConfiguration.inlayHints?.enable === true) {
sendInlayHintsRefresh();
}
if (config.extensionConfiguration.codeLens === true) {
sendCodeLensRefresh();
try {
sendUpdatedDiagnostics();
sendCompilationFinishedMessage();
if (config.extensionConfiguration.inlayHints?.enable === true) {
sendInlayHintsRefresh();
}
if (config.extensionConfiguration.codeLens === true) {
sendCodeLensRefresh();
}
} catch {
console.log("Error while sending updated diagnostics");
}
}
});
Expand Down
5 changes: 3 additions & 2 deletions server/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,14 @@ let findProjectRootOfFileInDir = (
// TODO: races here?
// TODO: this doesn't handle file:/// scheme
export let findProjectRootOfFile = (
source: p.DocumentUri
source: p.DocumentUri,
skipParent?: boolean
): null | p.DocumentUri => {
// First look in project files
let foundRootFromProjectFiles: string | null = null;

for (const rootPath of projectsFiles.keys()) {
if (source.startsWith(rootPath)) {
if (source.startsWith(rootPath) && (!skipParent || source !== rootPath)) {
// Prefer the longest path (most nested)
if (
foundRootFromProjectFiles == null ||
Expand Down