Repository navigation
fix(lsp): support lsprotocol 2025.x DiagnosticRefreshRequest and InlayHintRefreshRequest #6220
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
boomesh11
wants to merge
1
commit into
SQLMesh:main
Choose a base branch
from
boomesh11:fix/lsprotocol-2025-refresh-imports
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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
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 |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| import importlib | ||
| import sys | ||
| import types as pytypes | ||
|
|
||
|
|
||
| def test_lsp_main_imports_with_lsprotocol_2025_names(monkeypatch): | ||
| import lsprotocol.types as lsp_types | ||
|
|
||
| # Simulate lsprotocol 2025.x where Workspace*RefreshRequest were renamed | ||
| monkeypatch.delattr(lsp_types, "WorkspaceDiagnosticRefreshRequest", raising=False) | ||
| monkeypatch.delattr(lsp_types, "WorkspaceInlayHintRefreshRequest", raising=False) | ||
|
|
||
| if not hasattr(lsp_types, "DiagnosticRefreshRequest"): | ||
| dummy_req = type("DiagnosticRefreshRequest", (), {"__init__": lambda self, **kw: None}) | ||
| monkeypatch.setattr(lsp_types, "DiagnosticRefreshRequest", dummy_req, raising=False) | ||
| if not hasattr(lsp_types, "InlayHintRefreshRequest"): | ||
| dummy_inlay = type("InlayHintRefreshRequest", (), {"__init__": lambda self, **kw: None}) | ||
| monkeypatch.setattr(lsp_types, "InlayHintRefreshRequest", dummy_inlay, raising=False) | ||
|
|
||
| # Stub pygls.server if not installed in minimal test env | ||
| if "pygls.server" not in sys.modules: | ||
| pygls_mod = pytypes.ModuleType("pygls") | ||
| server_mod = pytypes.ModuleType("pygls.server") | ||
| server_mod.LanguageServer = object | ||
| monkeypatch.setitem(sys.modules, "pygls", pygls_mod) | ||
| monkeypatch.setitem(sys.modules, "pygls.server", server_mod) | ||
|
|
||
| sys.modules.pop("sqlmesh.lsp.main", None) | ||
| try: | ||
| mod = importlib.import_module("sqlmesh.lsp.main") | ||
| assert mod.WorkspaceDiagnosticRefreshRequest is lsp_types.DiagnosticRefreshRequest | ||
| assert mod.WorkspaceInlayHintRefreshRequest is lsp_types.InlayHintRefreshRequest | ||
| except ModuleNotFoundError: | ||
| # Fallback if full sqlmesh runtime deps aren't installed; verify AST/import block directly | ||
| import ast | ||
| from pathlib import Path | ||
|
|
||
| src = (Path(__file__).resolve().parents[2] / "sqlmesh" / "lsp" / "main.py").read_text(encoding="utf-8") | ||
| tree = ast.parse(src) | ||
| assert any(isinstance(n, ast.Try) for n in tree.body) | ||
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.
Verify the fallback imports instead of accepting any
tryblock.If a runtime dependency is missing, Line 33 bypasses both alias assertions. This assertion then passes even if the fallback imports a nonexistent module, because the broken import block is still an
ast.Try.Execute the isolated import block against the simulated names and assert both aliases. Do not treat an unrelated import failure as successful compatibility verification.