Skip to content

Add number separator related assists #3683

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

Closed
vbfox wants to merge 2 commits into from
Closed

Add number separator related assists #3683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6576d2a
Add number separator related assists
vbfox Mar 21, 2020
08a082e
Use filter instead of manual code
vbfox Mar 22, 2020
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
50 changes: 50 additions & 0 deletions crates/ra_assists/src/assist_ctx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ impl<'a> AssistCtx<'a> {
AssistGroup { ctx: self, group_name: group_name.into(), assists: Vec::new() }
}

pub(crate) fn add_assists(self) -> AssistVec<'a> {
AssistVec { ctx: self, assists: Vec::new() }
}

pub(crate) fn token_at_offset(&self) -> TokenAtOffset<SyntaxToken> {
self.source_file.syntax().token_at_offset(self.frange.range.start())
}
Expand All @@ -129,6 +133,16 @@ impl<'a> AssistCtx<'a> {
pub(crate) fn find_node_at_offset<N: AstNode>(&self) -> Option<N> {
find_node_at_offset(self.source_file.syntax(), self.frange.range.start())
}

pub(crate) fn find_covering_node_at_offset<N: AstNode>(&self) -> Option<N> {
let node = find_node_at_offset::<N>(self.source_file.syntax(), self.frange.range.start())?;
if self.frange.range.is_subrange(&node.syntax().text_range()) {
Some(node)
} else {
None
}
}

pub(crate) fn covering_element(&self) -> SyntaxElement {
find_covering_element(self.source_file.syntax(), self.frange.range)
}
Expand Down Expand Up @@ -174,6 +188,42 @@ impl<'a> AssistGroup<'a> {
}
}

pub(crate) struct AssistVec<'a> {
Copy link
Contributor

@matklad matklad Mar 23, 2020

Choose a reason for hiding this comment

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

yup, this API looks good to me!

ctx: AssistCtx<'a>,
assists: Vec<AssistInfo>,
}

impl<'a> AssistVec<'a> {
pub(crate) fn add_assist(
&mut self,
id: AssistId,
label: impl Into<String>,
f: impl FnOnce(&mut ActionBuilder),
) {
let label = AssistLabel::new(label.into(), id);

let mut info = AssistInfo::new(label);
if self.ctx.should_compute_edit {
let action = {
let mut edit = ActionBuilder::default();
f(&mut edit);
edit.build()
};
info = info.resolved(action)
};

self.assists.push(info)
}

pub(crate) fn finish(self) -> Option<Assist> {
if self.assists.is_empty() {
None
} else {
Some(Assist(self.assists))
}
}
}

#[derive(Default)]
pub(crate) struct ActionBuilder {
edit: TextEditBuilder,
Expand Down
Loading