Skip to content
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

Implementation of lazy assits #4717

Merged
merged 6 commits into from
Jun 3, 2020
Merged

Conversation

mcrakhman
Copy link
Contributor

No description provided.

@mcrakhman mcrakhman changed the title Preliminary implementation of lazy Assits Implementation of lazy assits Jun 2, 2020
@mcrakhman mcrakhman marked this pull request as draft June 2, 2020 21:22
# Conflicts:
#	crates/rust-analyzer/src/to_proto.rs
Copy link
Member

@matklad matklad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good overall!

Could you also add docs to lsp_extensions.md?

crates/rust-analyzer/src/lsp_ext.rs Outdated Show resolved Hide resolved
crates/rust-analyzer/src/main_loop/handlers.rs Outdated Show resolved Hide resolved
crates/rust-analyzer/src/main_loop/handlers.rs Outdated Show resolved Hide resolved
crates/rust-analyzer/src/to_proto.rs Outdated Show resolved Hide resolved
crates/rust-analyzer/src/to_proto.rs Outdated Show resolved Hide resolved
editors/code/src/client.ts Outdated Show resolved Hide resolved
# Conflicts:
#	crates/rust-analyzer/src/main_loop/handlers.rs
#	crates/rust-analyzer/src/to_proto.rs
@mcrakhman mcrakhman marked this pull request as ready for review June 3, 2020 17:35
@mcrakhman
Copy link
Contributor Author

@matklad Seems I've fixed the comments, now I will revert back the changes in extract_enum, so there will only be code related to the assist itself

@matklad
Copy link
Member

matklad commented Jun 3, 2020

bors r

@bors
Copy link
Contributor

bors bot commented Jun 3, 2020

@bors bors bot merged commit 65a3cc2 into rust-lang:master Jun 3, 2020
@@ -202,6 218,8 @@ impl Request for CodeActionRequest {
pub struct CodeAction {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is missing pub diagnostics: Option<Vec<Diagnostic>>,. In addition it is going to conflict with edit in 3.16.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don’t use diagnostics, so that’s why it is missing. What exactly changes in edit in 3.16?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ignore me. I was thinking of insert/replace edits in CompletionItem

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants