From 2f12414bcb9e46c04b22e7abbb37940a3bc9f388 Mon Sep 17 00:00:00 2001 From: thomasjm Date: Wed, 14 Oct 2026 23:46:20 -0700 Subject: [PATCH 1/2] Untransform workspace/applyEdit so edits reach the client as notebook edits --- app/Main.hs | 2 +- src/Transform/Config.hs | 1 + stack.yaml | 2 +- stack.yaml.lock | 8 ++++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Main.hs b/app/Main.hs index 488495a..61f0a4f 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -207,7 +207,7 @@ readWrappedOut config clientReqMap serverReqMap wrappedOut sendToStdout = foreve modifyMVar_ serverReqMap $ \m -> case updateServerRequestMap m msgId (SMethodAndParams meth (msg ^. Lens.params)) of Just m' -> return m' Nothing -> return m - sendToStdout (transformServerReq meth msg) + transformServerReq meth msg >>= sendToStdout Right (ServerToClientRsp meth initialParams msg) -> transformServerRsp config meth initialParams msg >>= sendToStdout diff --git a/src/Transform/Config.hs b/src/Transform/Config.hs index 58b0a7b..7caa34f 100644 --- a/src/Transform/Config.hs +++ b/src/Transform/Config.hs @@ -28,6 +28,7 @@ rustNotebookConfig :: FilePath -> Int -> NotebookConfig RustNotebookTransformer rustNotebookConfig shadowDir didSaveDebounceMs = NotebookConfig { notebookConfigHandles = const True , notebookConfigDidSaveDebounceMs = Just didSaveDebounceMs + , notebookConfigHandlesFormatting = True , notebookConfigTransformerParamsFor = \u -> if isNotebook u then transformerParams else idTransformerParams , notebookConfigMakeShadowDocument = makeShadowDocument shadowDir , notebookConfigUnopenedUri = addExtensionToUri ".rs" diff --git a/stack.yaml b/stack.yaml index a5c9d69..ef90d95 100644 --- a/stack.yaml +++ b/stack.yaml @@ -13,7 +13,7 @@ system-ghc: true extra-deps: - git: https://github.com/codedownio/notebook-language-server-core.git - commit: cb55077c20b22919956d0fcfa4287c5cb82c8fa2 + commit: f737bddb1981666a7d22f0f60a7289bbb967a696 # - language-rust-0.2.0.27 diff --git a/stack.yaml.lock b/stack.yaml.lock index 7a645f8..3b37679 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -5,15 +5,15 @@ packages: - completed: - commit: cb55077c20b22919956d0fcfa4287c5cb82c8fa2 + commit: f737bddb1981666a7d22f0f60a7289bbb967a696 git: https://github.com/codedownio/notebook-language-server-core.git name: notebook-language-server-core pantry-tree: - sha256: 9ba9d7a2e117c3fe1d0767d4b5992007bb69d7bdfbb306c133b762e73a79c082 - size: 2202 + sha256: 53abc5c9405647f56c1bd03ca3f1f29d0b9c5c7745ed39a89c7946aaced27f00 + size: 2399 version: 0.1.0.0 original: - commit: cb55077c20b22919956d0fcfa4287c5cb82c8fa2 + commit: f737bddb1981666a7d22f0f60a7289bbb967a696 git: https://github.com/codedownio/notebook-language-server-core.git snapshots: - completed: From 62ce9017d2a0e6d9ea27c9b6257fbe138aa2bb7b Mon Sep 17 00:00:00 2001 From: thomasjm Date: Thu, 15 Oct 2026 00:01:36 -0700 Subject: [PATCH 2/2] Point at core's merged commit --- stack.yaml | 2 +- stack.yaml.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stack.yaml b/stack.yaml index ef90d95..748b181 100644 --- a/stack.yaml +++ b/stack.yaml @@ -13,7 +13,7 @@ system-ghc: true extra-deps: - git: https://github.com/codedownio/notebook-language-server-core.git - commit: f737bddb1981666a7d22f0f60a7289bbb967a696 + commit: 244731900dee065cbf794ba74294f3a0f55c74fd # - language-rust-0.2.0.27 diff --git a/stack.yaml.lock b/stack.yaml.lock index 3b37679..f463c0f 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -5,7 +5,7 @@ packages: - completed: - commit: f737bddb1981666a7d22f0f60a7289bbb967a696 + commit: 244731900dee065cbf794ba74294f3a0f55c74fd git: https://github.com/codedownio/notebook-language-server-core.git name: notebook-language-server-core pantry-tree: @@ -13,7 +13,7 @@ packages: size: 2399 version: 0.1.0.0 original: - commit: f737bddb1981666a7d22f0f60a7289bbb967a696 + commit: 244731900dee065cbf794ba74294f3a0f55c74fd git: https://github.com/codedownio/notebook-language-server-core.git snapshots: - completed: