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.

Sign up for GitHub

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

feat: code actions - document edits #478

Merged
merged 18 commits into from
Jul 24, 2021
Merged

feat: code actions - document edits #478

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
21bf614
wip: Code actions
archseer Jun 14, 2021
3a7b921
fix(term): use current macro instead Context::context
gbaranski Jul 21, 2021
cdfb6f2
feat(lsp): set code_action capabilities
gbaranski Jul 21, 2021
bc62f03
feat(term): set SPC-a to code_action
gbaranski Jul 21, 2021
5d253df
feat(term): wip on applying code actions
gbaranski Jul 21, 2021
eeca3b5
deps: `cargo update`
gbaranski Jul 21, 2021
70db2f1
feat(term): applying code actions edits
gbaranski Jul 21, 2021
9dcdb55
fix(term): cleanup of apply_edit
gbaranski Jul 22, 2021
32facf1
fix(term): applying edits as a whole thing instead one by one
gbaranski Jul 22, 2021
70dfc98
refactor(term): move apply_edits below
gbaranski Jul 22, 2021
1661bf0
fix(term): improve unimplemented messages for further investigation
gbaranski Jul 22, 2021
daeb8e5
fix(term): change code action command comment
gbaranski Jul 22, 2021
1dfc39a
Merge branch 'master' into code-action
gbaranski Jul 22, 2021
b3f0d72
fix(term): add matching `}`
gbaranski Jul 22, 2021
36499a8
fix(term): cleanup, todo!() on workspace edit
gbaranski Jul 23, 2021
02c13b8
fix(term): remove unrelated workspace_symbol_picker
gbaranski Jul 23, 2021
6dd84e1
fix(term): apply cargo-clippy suggestions
gbaranski Jul 23, 2021
4907c63
fix(term): replace todo!'s with editor.set_error
gbaranski Jul 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(term): applying code actions edits
  • Loading branch information
@gbaranski
gbaranski committed Jul 21, 2021
commit 70db2f140dbbc5f6b45511bbea3a66a57a271004
114 changes: 66 additions & 48 deletions helix-term/src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use helix_core::{
object, pos_at_coords,
regex::{self, Regex},
register::Register,
search, selection, surround, textobject, ChangeSet, LineEnding, Position, Range, Rope,
search, selection, surround, textobject, Change, LineEnding, Position, Range, Rope,
RopeGraphemes, RopeSlice, Selection, SmallVec, Tendril, Transaction,
};

Expand Down Expand Up @@ -2130,14 +2130,41 @@ pub fn workspace_symbol_picker(cx: &mut Context) {
)
}

fn apply_edit(
editor: &mut Editor,
edited_document: &lsp::OptionalVersionedTextDocumentIdentifier,
offset_encoding: OffsetEncoding,
edit: &lsp::OneOf<lsp::TextEdit, lsp::AnnotatedTextEdit>,
) {
let (view, doc) = current!(editor);
assert_eq!(doc.url().unwrap(), edited_document.uri);

match edit {
lsp::OneOf::Left(text_edit) => {
let lsp_pos_to_pos =
|lsp_pos| lsp_pos_to_pos(doc.text(), lsp_pos, offset_encoding).unwrap();

// This clone probably could be optimized if Picker::new would give T instead of &T
let text_replacement = Tendril::from(text_edit.new_text.clone());
let change: Change = (
lsp_pos_to_pos(text_edit.range.start),
lsp_pos_to_pos(text_edit.range.end),
Some(text_replacement.clone().into()),
);
let transaction = Transaction::change(doc.text(), std::iter::once(change));
doc.apply(&transaction, view.id);
}
lsp::OneOf::Right(_annotated_text_edit) => todo!(),
}
}

pub fn code_action(cx: &mut Context) {
let (view, doc) = current!(cx.editor);

let language_server = match doc.language_server() {
Some(language_server) => language_server,
None => return,
};
let offset_encoding = language_server.offset_encoding();

let range = range_to_lsp_range(
doc.text(),
Expand All @@ -2146,10 +2173,11 @@ pub fn code_action(cx: &mut Context) {
);

let future = language_server.code_actions(doc.identifier(), range);
let offset_encoding = language_server.offset_encoding().clone();

cx.callback(
future,
move |editor: &mut Editor,
move |_editor: &mut Editor,
compositor: &mut Compositor,
response: Option<lsp::CodeActionResponse>| {
if let Some(actions) = response {
Expand All @@ -2162,51 +2190,7 @@ pub fn code_action(cx: &mut Context) {
lsp::CodeActionOrCommand::Command(command) => command.title.as_str().into(),
},
move |editor: &mut Editor, code_action, _action| {
match code_action {
lsp::CodeActionOrCommand::Command(command) => {
log::debug!("command: {:?}", command);
}
lsp::CodeActionOrCommand::CodeAction(code_action) => {
log::debug!("code action: {:?}", code_action);
if let Some(ref edit) = code_action.edit {
if let Some(ref changes) = edit.document_changes {
match changes {
lsp::DocumentChanges::Edits(document_edits) => {
for document_edit in document_edits {
for edit in &document_edit.edits {
match edit {
lsp::OneOf::Left(text_edit) => {
let document = editor
.documents()
.find(|doc| {
doc.url().as_ref()
== Some(
&document_edit
.text_document
.uri,
)
})
.unwrap();

let transaction = Transaction {
changes: todo!(),
selection: todo!(),
};
}
lsp::OneOf::Right(
annotated_text_edit,
) => todo!(),
}
}
}
}
lsp::DocumentChanges::Operations(_) => todo!(),
}
}
}
}
}
//
make_code_action_callback(editor, code_action, offset_encoding)
},
);
compositor.push(Box::new(picker))
Expand All @@ -2215,6 +2199,40 @@ pub fn code_action(cx: &mut Context) {
)
}

fn make_code_action_callback(
editor: &mut Editor,
code_action: &lsp::CodeActionOrCommand,
offset_encoding: OffsetEncoding,
) {
match code_action {
lsp::CodeActionOrCommand::Command(command) => {
log::debug!("command: {:?}", command);
}
lsp::CodeActionOrCommand::CodeAction(code_action) => {
log::debug!("code action: {:?}", code_action);
if let Some(ref edit) = code_action.edit {
if let Some(ref changes) = edit.document_changes {
match changes {
lsp::DocumentChanges::Edits(document_edits) => {
for document_edit in document_edits {
for edit in &document_edit.edits {
apply_edit(
editor,
&document_edit.text_document,
offset_encoding,
edit,
);
}
}
}
lsp::DocumentChanges::Operations(_) => todo!(),
}
}
}
}
}
}

// I inserts at the first nonwhitespace character of each line with a selection
fn prepend_to_line(cx: &mut Context) {
goto_first_nonwhitespace(cx);
Expand Down