switch out lsp-types for gen-lsp-types by BenjaminBrienen · Pull Request #22115 · rust-lang/rust-analyzer

BenjaminBrienen · 2026-04-20T17:39:34Z

Blocked on:

implement From<&str> for string enums with custom values ribru17/gen-lsp-types#8
LspRequestMethods::Custom should take a &'static str ribru17/gen-lsp-types#9
Collision between crate::Id and crate::generated::Id ribru17/gen-lsp-types#10
Move items in root module to mod json_rpc to avoid name collisions ribru17/gen-lsp-types#11
Support constructing string enums which support custom values in const contexts ribru17/gen-lsp-types#14

Alternative to: #22108

ribru17 · 2026-04-23T16:41:03Z

Heads up @BenjaminBrienen I just pushed v0.4.0, will probably affect this PR

BenjaminBrienen · 2026-04-23T18:02:13Z

I already updated to it :)

BenjaminBrienen · 2026-04-24T00:59:43Z

I'm assuming you would like a side of squash with this meal

ribru17 · 2026-04-24T02:13:30Z

Fyi, the lsp-types issues fixed in gen-lsp-types are:

Along with:

rust-analyzer/crates/rust-analyzer/src/bin/main.rs

Line 218 in 4c57da3

    
           // lsp-types has a typo in the `/capabilities/workspace/diagnostics` field, its typoed as `diagnostic`

BenjaminBrienen · 2026-04-24T02:30:12Z

-        // FIXME: Also detect the proposed lsp version at caps.workspace.workspaceEdit.snippetEditSupport
-        // once lsp-types has it.


I already have a draft PR based on top of this one that implements the split and uses the capability properly, so I just removed the comment for now. Is that fine?

DropDemBits

Going through all of the it.method == R::METHOD changes made me realize that there's no request-equivalent helper function of notification_is 😅

My main concern though is if the file:// scheme is still required though, as I think the tests ensure that we're emitting self-consistent values rather than if those values actually make sense for the LS client.

View changes since this review

DropDemBits · 2026-04-24T03:16:16Z

-        // FIXME: Also detect the proposed lsp version at caps.workspace.workspaceEdit.snippetEditSupport
-        // once lsp-types has it.


I hadn't known about the draft PR, sorry!

rustbot · 2026-04-24T18:42:13Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

BenjaminBrienen · 2026-04-24T18:42:58Z

~~It is failing because of something to do with the difference between resource operation and document change, I think. It is just one slow test. I couldn't figure out the reason.~~

Veykril · 2026-04-25T06:50:39Z

    {
-        let req = self.req.take_if(|it| it.method == R::METHOD)?;
-        let res = crate::from_json(R::METHOD, &req.params);
+        let req = self.req.take_if(|it| it.method.as_str() == R::METHOD.as_str())?;


Suggested change

let req = self.req.take_if(|it| it.method.as_str() == R::METHOD.as_str())?;

let req = self.req.take_if(|it| it.method == R::METHOD)?;

View changes since the review

can't compare std::string::String with gen_lsp_types::LspRequestMethod

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 20, 2026

BenjaminBrienen mentioned this pull request Apr 20, 2026

update lsp-types to 0.97 #22108

Closed

BenjaminBrienen force-pushed the gen-lsp-types branch from 266f7ac to 207d300 Compare April 21, 2026 23:25

ribru17 reviewed Apr 22, 2026

View reviewed changes

Comment thread crates/rust-analyzer/src/bin/main.rs Outdated

DropDemBits reviewed Apr 23, 2026

View reviewed changes

Comment thread crates/rust-analyzer/src/handlers/request.rs Outdated

BenjaminBrienen force-pushed the gen-lsp-types branch from b996006 to e887c95 Compare April 23, 2026 10:20

This comment has been minimized.

Sign in to view

BenjaminBrienen force-pushed the gen-lsp-types branch from db9f359 to 97d9e55 Compare April 23, 2026 11:00

This comment has been minimized.

Sign in to view

BenjaminBrienen force-pushed the gen-lsp-types branch 2 times, most recently from 552f6d5 to b10f69c Compare April 23, 2026 13:35

This comment has been minimized.

Sign in to view

BenjaminBrienen force-pushed the gen-lsp-types branch from b10f69c to 8694af0 Compare April 23, 2026 14:37

BenjaminBrienen force-pushed the gen-lsp-types branch 2 times, most recently from fd865d7 to 90f1985 Compare April 24, 2026 00:47

BenjaminBrienen force-pushed the gen-lsp-types branch from 554de57 to 9ea32c3 Compare April 24, 2026 01:08

BenjaminBrienen commented Apr 24, 2026

View reviewed changes

DropDemBits reviewed Apr 24, 2026

View reviewed changes

BenjaminBrienen force-pushed the gen-lsp-types branch from b6b4eca to f1abaaa Compare April 24, 2026 18:42

BenjaminBrienen force-pushed the gen-lsp-types branch 2 times, most recently from 4e097a1 to c7b031d Compare April 24, 2026 20:56

ribru17 reviewed Apr 24, 2026

View reviewed changes

Comment thread crates/rust-analyzer/src/lsp/capabilities.rs

Comment thread crates/rust-analyzer/src/lsp/capabilities.rs Outdated

BenjaminBrienen mentioned this pull request Apr 25, 2026

migrate from lsp-types to gen-lsp-types wgsl-analyzer/wgsl-analyzer#1090

Open

Veykril reviewed Apr 25, 2026

View reviewed changes

BenjaminBrienen force-pushed the gen-lsp-types branch 2 times, most recently from 53e9186 to bcaaea6 Compare April 25, 2026 09:08

switch out lsp-types for gen-lsp-types

e55875b

BenjaminBrienen force-pushed the gen-lsp-types branch from bee3902 to e55875b Compare April 25, 2026 09:25

		// FIXME: Also detect the proposed lsp version at caps.workspace.workspaceEdit.snippetEditSupport
		// once lsp-types has it.

	let req = self.req.take_if(\|it\| it.method.as_str() == R::METHOD.as_str())?;
	let req = self.req.take_if(\|it\| it.method == R::METHOD)?;

Conversation

BenjaminBrienen commented Apr 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

ribru17 commented Apr 23, 2026

Uh oh!

BenjaminBrienen commented Apr 23, 2026

Uh oh!

BenjaminBrienen commented Apr 24, 2026

Uh oh!

ribru17 commented Apr 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

BenjaminBrienen Apr 24, 2026

Choose a reason for hiding this comment

Uh oh!

DropDemBits left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DropDemBits Apr 24, 2026

Choose a reason for hiding this comment

Uh oh!

rustbot commented Apr 24, 2026

Uh oh!

BenjaminBrienen commented Apr 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Veykril Apr 25, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BenjaminBrienen Apr 25, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

BenjaminBrienen commented Apr 20, 2026 •

edited

Loading

ribru17 commented Apr 24, 2026 •

edited

Loading

DropDemBits left a comment •

edited by rustbot

Loading

BenjaminBrienen commented Apr 24, 2026 •

edited

Loading

Veykril Apr 25, 2026 •

edited by rustbot

Loading