Support 3.13 #79
Support 3.13 #79
Conversation
Bumps to 3.9.0
src/lib.rs
Outdated
| * `workspace.workspaceEdit.documentChanges` client capability. | ||
| * | ||
| * If a client neither supports `documentChanges` nor `workspace.workspaceEdit.resourceOperations` then | ||
| * only plain `TextEdit`s using the `changes` property are supported. | ||
| */ | ||
| #[serde(skip_serializing_if = "Option::is_none")] | ||
| pub document_changes: Option<Vec<TextDocumentEdit>>, |
There was a problem hiding this comment.
s/TextDocumentEdit/DocumentChanges?
There was a problem hiding this comment.
If I'm reading it right the Vec needs to be removed too.
There was a problem hiding this comment.
Yep, since DocumentChanges contains a Vec
src/lib.rs
Outdated
| } | ||
|
|
||
| #[derive(Debug, Eq, PartialEq, Clone, Deserialize, Serialize)] | ||
| #[serde(untagged)] |
There was a problem hiding this comment.
I think you could encode this with https://serde.rs/container-attrs.html#serdetag--type + https://serde.rs/variant-attrs.html#serdeother and then the kind fields could probably be removed.
There was a problem hiding this comment.
How would you deal with the different options like CreateFileOptions etc.?
There was a problem hiding this comment.
oh wait I think I see...
There was a problem hiding this comment.
I'm not sure this combination will work. #[serde(other)] only works on unit variants.
There was a problem hiding this comment.
I THINK inserting a shim gives us the correct results:
#[derive(Debug, Eq, PartialEq, Clone, Deserialize, Serialize)]
#[serde(untagged)]
pub enum DocumentChanges {
Edits(Vec<TextDocumentEdit>),
Operations(Vec<DocumentChangeOperation>),
}
#[derive(Debug, Eq, PartialEq, Clone, Deserialize, Serialize)]
#[serde(untagged, rename_all="lowercase" )]
pub enum DocumentChangeOperation {
Op(ResourceOp), // <------- In an ideal world `ResourceOp` wouldn't be needed
Edit(TextDocumentEdit),
}
#[derive(Debug, Eq, PartialEq, Clone, Deserialize, Serialize)]
#[serde(tag = "kind", rename_all="lowercase" )]
pub enum ResourceOp {
Create(CreateFile),
Rename(RenameFile),
Delete(DeleteFile),
}This looks right according to my test except that the TextDocumentEdit's fields are swapped so the string equality fails.
src/lib.rs
Outdated
| @@ -2337,6 +2687,8 @@ pub struct ApplyWorkspaceEditResponse { | |||
| pub applied: bool, | |||
| } | |||
|
|
|||
| pub type CodeActionKind = String; | |||
There was a problem hiding this comment.
There are some predefined CodeActionKind values that could be added and exported (search for export namespace CodeActionKind)
There was a problem hiding this comment.
I saw that but wasn't sure if those values were open ended or not (or how best to encode that?)
There was a problem hiding this comment.
Could just add a few &str constants to make the available.
|
Okay I've addressed your comments. |
Allows interoperability with vscode-language-client 5.1.0
|
Should be good now. With bf12571 we can now run against a language client build with the latest |
|
Thanks again! Released as 0.51 |
This should bump us up to 3.13. It's probably best to review each commit separately.
Supercedes #78
Fixes #76