Skip to content

fix(language-server): handle non-baml-src baml files - #2506

Merged
sxlijin merged 8 commits into
canaryfrom
sam/vscode-playground
Sep 25, 2025
Merged

fix(language-server): handle non-baml-src baml files#2506
sxlijin merged 8 commits into
canaryfrom
sam/vscode-playground

Conversation

@sxlijin

@sxlijin sxlijin commented Sep 23, 2025

Copy link
Copy Markdown
Contributor

Roll forward of #2486, with deadlocks fixed.

Deadlocks were present because session.reload() needs to grab locks on every project, but its API does not make this obvious, and in #2486 there were implicit scope changes that resulted in MutexGuard destructors not running before session.reload() got called.

@sxlijin
sxlijin temporarily deployed to boundary-tools-dev September 23, 2025 20:04 — with GitHub Actions Inactive
@sxlijin
sxlijin temporarily deployed to boundary-tools-dev September 23, 2025 20:04 — with GitHub Actions Inactive
@sxlijin
sxlijin temporarily deployed to boundary-tools-dev September 23, 2025 20:04 — with GitHub Actions Inactive
@entelligence-ai-pr-reviews

entelligence-ai-pr-reviews Bot commented Sep 23, 2025

Copy link
Copy Markdown

🔒 Entelligence AI Vulnerability Scanner

✅ No security vulnerabilities found!

Your code passed our comprehensive security analysis.

@entelligence-ai-pr-reviews

entelligence-ai-pr-reviews Bot commented Sep 23, 2025

Copy link
Copy Markdown

LGTM 👍

@github-actions

github-actions Bot commented Sep 23, 2025

Copy link
Copy Markdown

🌿 Preview your docs: https://boundary-preview-9db42254-7f3e-4609-a0c6-f22f612ddbc5.docs.buildwithfern.com

@vercel

vercel Bot commented Sep 23, 2025 •
edited
Loading

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment
Project Deployment Preview Comments Updated (UTC)
promptfiddle Skipped Skipped Sep 25, 2025 9:21pm

@codecov

codecov Bot commented Sep 23, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 9.30233% with 117 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...server/api/notifications/did_save_text_document.rs 0.00% 24 Missing ⚠️
...gine/language_server/src/server/api/diagnostics.rs 0.00% 21 Missing ⚠️
...e_server/src/server/api/notifications/did_close.rs 0.00% 15 Missing ⚠️
engine/language_server/src/session.rs 52.17% 11 Missing ⚠️
...ge_server/src/server/api/notifications/did_open.rs 0.00% 9 Missing ⚠️
engine/language_server/src/server/api.rs 0.00% 7 Missing ⚠️
..._server/src/server/api/notifications/did_change.rs 0.00% 6 Missing ⚠️
...rver/api/notifications/did_change_watched_files.rs 0.00% 5 Missing ⚠️
...guage_server/src/server/api/requests/completion.rs 0.00% 4 Missing ⚠️
...guage_server/src/server/api/requests/diagnostic.rs 0.00% 4 Missing ⚠️
... and 5 more

📢 Thoughts on this report? Let us know!

chatgpt-codex-connector[bot]
chatgpt-codex-connector Bot reviewed Sep 23, 2025
View reviewed changes

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Codex Review: Here are some suggestions.

Reply with @codex fix comments to fix any unresolved comments.

About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you open a pull request for review, mark a draft as ready, or comment "@codex review". If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex fix this CI failure" or "@codex address that feedback".

Comment thread engine/language_server/src/server/api/notifications/did_change_watched_files.rs Outdated
Comment on lines 27 to 33
if params.changes.iter().any(|change| {
let Ok(path) = change.uri.to_file_path() else {
return true;
};
session.get_or_create_project(&path).is_err()
}) {
return Ok(());

@chatgpt-codex-connector chatgpt-codex-connector Bot Sep 23, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

[P1] Avoid dropping watched-file batches with mixed paths

The new guard returns early whenever any change in the batch cannot be resolved to a baml_src project. This skips the reload and diagnostic publishing for the entire batch, even when the same batch contains valid baml_src files. The previous code only bailed out when no baml_src paths were present. A watcher that reports both BAML and non-BAML file events (e.g. a generator output alongside a source change) will now leave diagnostics stale for the actual BAML file. Filter out non-BAML entries instead of aborting the whole handler.

Useful? React with 👍 / 👎.

@aaronvg aaronvg Sep 23, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

i think this is valid no?

@github-actions

github-actions Bot commented Sep 23, 2025

Copy link
Copy Markdown

https://sage-backend-e6mvwf1z9-baml.vercel.app

@sxlijin
sxlijin temporarily deployed to boundary-tools-dev September 24, 2025 22:59 — with GitHub Actions Inactive
@sxlijin
sxlijin temporarily deployed to boundary-tools-dev September 24, 2025 22:59 — with GitHub Actions Inactive
@sxlijin
sxlijin temporarily deployed to boundary-tools-dev September 24, 2025 22:59 — with GitHub Actions Inactive
@github-actions

github-actions Bot commented Sep 24, 2025

Copy link
Copy Markdown

🌿 Preview your docs: https://boundary-preview-4d9769c5-1754-48a9-af0d-cff1b49dff4f.docs.buildwithfern.com

@github-actions

github-actions Bot commented Sep 24, 2025

Copy link
Copy Markdown

https://sage-backend-511b2lrop-baml.vercel.app

@sxlijin
sxlijin force-pushed the sam/vscode-playground branch from 9762467 to 9fcf85c Compare September 25, 2025 00:19
@sxlijin
sxlijin force-pushed the sam/vscode-playground branch from 9fcf85c to dfce4bd Compare September 25, 2025 19:47
@sxlijin
sxlijin temporarily deployed to boundary-tools-dev September 25, 2025 19:47 — with GitHub Actions Inactive
@sxlijin
sxlijin temporarily deployed to boundary-tools-dev September 25, 2025 19:47 — with GitHub Actions Inactive
@github-actions

github-actions Bot commented Sep 25, 2025

Copy link
Copy Markdown

🌿 Preview your docs: https://boundary-preview-77ac7d03-771e-4af3-b325-0269e080469e.docs.buildwithfern.com

@sxlijin
sxlijin temporarily deployed to boundary-tools-dev September 25, 2025 19:55 — with GitHub Actions Inactive
@sxlijin
sxlijin temporarily deployed to boundary-tools-dev September 25, 2025 19:55 — with GitHub Actions Inactive
@sxlijin
sxlijin temporarily deployed to boundary-tools-dev September 25, 2025 19:55 — with GitHub Actions Inactive
@github-actions

github-actions Bot commented Sep 25, 2025

Copy link
Copy Markdown

🌿 Preview your docs: https://boundary-preview-08faac3a-c892-44f0-befa-128e6d4418b0.docs.buildwithfern.com

@github-actions

github-actions Bot commented Sep 25, 2025

Copy link
Copy Markdown

https://sage-backend-dkjn0qiiw-baml.vercel.app

@sxlijin
sxlijin temporarily deployed to boundary-tools-dev September 25, 2025 21:21 — with GitHub Actions Inactive
@sxlijin
sxlijin temporarily deployed to boundary-tools-dev September 25, 2025 21:21 — with GitHub Actions Inactive
@sxlijin
sxlijin temporarily deployed to boundary-tools-dev September 25, 2025 21:21 — with GitHub Actions Inactive
@github-actions

github-actions Bot commented Sep 25, 2025

Copy link
Copy Markdown

🌿 Preview your docs: https://boundary-preview-5b7dc2ea-0c6a-472e-ab6e-325a73e7c9b4.docs.buildwithfern.com

@github-actions

github-actions Bot commented Sep 25, 2025

Copy link
Copy Markdown

https://sage-backend-izlzqbi38-baml.vercel.app

@sxlijin
sxlijin added this pull request to the merge queue Sep 25, 2025
Merged via the queue into canary with commit 613df6b Sep 25, 2025
25 checks passed
@sxlijin
sxlijin deleted the sam/vscode-playground branch September 25, 2025 22:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@aaronvg aaronvg aaronvg left review comments
@chatgpt-codex-connector chatgpt-codex-connector[bot] chatgpt-codex-connector[bot] left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sxlijin @aaronvg