Skip to content

[mlir-lsp] Fix window.workDoneProgress capability #149905

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
merged 1 commit into from
Jul 24, 2025

Conversation

AmaranthineCodices
Copy link
Contributor

PR #143449 had an incorrect parser implementation for window.workDoneProgress that actually parsed textDocument.window.workDoneProgress.

PR llvm#143449 had an incorrect parser implementation for window.workDoneProgress that actually parsed textDocument.window.workDoneProgress.
@llvmbot llvmbot added mlir:core MLIR Core Infrastructure mlir labels Jul 21, 2025
@llvmbot
Copy link
Member

llvmbot commented Jul 21, 2025

@llvm/pr-subscribers-mlir-core

@llvm/pr-subscribers-mlir

Author: Lily Brown (AmaranthineCodices)

Changes

PR #143449 had an incorrect parser implementation for window.workDoneProgress that actually parsed textDocument.window.workDoneProgress.


Full diff: https://github.com/llvm/llvm-project/pull/149905.diff

1 Files Affected:

  • (modified) mlir/lib/Tools/lsp-server-support/Protocol.cpp (+5-5)
diff --git a/mlir/lib/Tools/lsp-server-support/Protocol.cpp b/mlir/lib/Tools/lsp-server-support/Protocol.cpp
index 33cdd2855eff1..98287048355c1 100644
--- a/mlir/lib/Tools/lsp-server-support/Protocol.cpp
+++ b/mlir/lib/Tools/lsp-server-support/Protocol.cpp
@@ -284,11 +284,11 @@ bool mlir::lsp::fromJSON(const llvm::json::Value &value,
       if (codeAction->getObject("codeActionLiteralSupport"))
         result.codeActionStructure = true;
     }
-    if (auto *window = textDocument->getObject("window")) {
-      if (std::optional<bool> workDoneProgressSupport =
-              window->getBoolean("workDoneProgress"))
-        result.workDoneProgress = *workDoneProgressSupport;
-    }
+  }
+  if (auto *window = o->getObject("window")) {
+    if (std::optional<bool> workDoneProgressSupport =
+            window->getBoolean("workDoneProgress"))
+      result.workDoneProgress = *workDoneProgressSupport;
   }
   return true;
 }

@JoeLoser JoeLoser merged commit 2cb6be2 into llvm:main Jul 24, 2025
12 checks passed
@AmaranthineCodices AmaranthineCodices deleted the lbrown/fix-lsp-capabilities branch July 24, 2025 20:35
mahesh-attarde pushed a commit to mahesh-attarde/llvm-project that referenced this pull request Jul 28, 2025
PR llvm#143449 had an incorrect parser implementation for
window.workDoneProgress that actually parsed
textDocument.window.workDoneProgress.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mlir:core MLIR Core Infrastructure mlir
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants