mirror of
https://github.com/Myriad-Dreamin/tinymist.git
synced 2025-11-20 11:55:34 +00:00
can't replace unused function with placeholder _
This commit is contained in:
Hong Jiarong
parent
254a3e0b76
commit
6e419641c0
5 changed files with 77 additions and 119 deletions
|
|
@ -319,7 +319,14 @@ impl<'a> CodeActionWorker<'a> {
|
|||
root: &LinkedNode<'_>,
|
||||
range: &Range<usize>,
|
||||
) -> Option<()> {
|
||||
if range.is_empty() || self.is_spread_binding(root, range) {
|
||||
if range.is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
let cursor = (range.start + range.end) / 2;
|
||||
let node = root.leaf_at_compat(cursor)?;
|
||||
|
||||
if self.is_spread_binding(&node) || self.is_function_binding(&node) {
|
||||
return None;
|
||||
}
|
||||
|
||||
|
|
@ -344,21 +351,73 @@ impl<'a> CodeActionWorker<'a> {
|
|||
Some(())
|
||||
}
|
||||
|
||||
fn is_spread_binding(&self, root: &LinkedNode<'_>, range: &Range<usize>) -> bool {
|
||||
if range.is_empty() {
|
||||
return false;
|
||||
}
|
||||
|
||||
let cursor = (range.start + range.end) / 2;
|
||||
let Some(node) = root.leaf_at_compat(cursor) else {
|
||||
return false;
|
||||
};
|
||||
|
||||
fn is_spread_binding(&self, node: &LinkedNode<'_>) -> bool {
|
||||
if node.kind() == SyntaxKind::Spread {
|
||||
return true;
|
||||
}
|
||||
|
||||
node_ancestors(&node).any(|ancestor| ancestor.kind() == SyntaxKind::Spread)
|
||||
node_ancestors(node).any(|ancestor| ancestor.kind() == SyntaxKind::Spread)
|
||||
}
|
||||
|
||||
fn is_function_binding(&self, node: &LinkedNode<'_>) -> bool {
|
||||
self.find_let_binding_ancestor(node)
|
||||
.map(|let_binding| matches!(let_binding.kind(), ast::LetBindingKind::Closure(..)))
|
||||
.unwrap_or(false)
|
||||
}
|
||||
|
||||
fn find_let_binding_ancestor<'b>(
|
||||
&self,
|
||||
node: &'b LinkedNode<'b>,
|
||||
) -> Option<ast::LetBinding<'b>> {
|
||||
let mut current = Some(node);
|
||||
while let Some(n) = current {
|
||||
if n.kind() == SyntaxKind::LetBinding {
|
||||
return n.cast::<ast::LetBinding>();
|
||||
}
|
||||
current = n.parent();
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
fn find_declaration_ancestor<'b>(
|
||||
&self,
|
||||
node: &'b LinkedNode<'b>,
|
||||
) -> Option<&'b LinkedNode<'b>> {
|
||||
let mut current = Some(node);
|
||||
while let Some(n) = current {
|
||||
match n.kind() {
|
||||
SyntaxKind::LetBinding | SyntaxKind::ModuleImport | SyntaxKind::ModuleInclude => {
|
||||
return Some(n);
|
||||
}
|
||||
_ => {
|
||||
current = n.parent();
|
||||
}
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
fn expand_declaration_range(&self, mut range: Range<usize>) -> Range<usize> {
|
||||
let bytes = self.source.text().as_bytes();
|
||||
|
||||
if range.start > 0 {
|
||||
let mut idx = range.start;
|
||||
while idx > 0 && matches!(bytes[idx - 1], b' ' | b'\t') {
|
||||
idx -= 1;
|
||||
}
|
||||
|
||||
if idx > 0 && bytes[idx - 1] == b'#' {
|
||||
range.start = idx - 1;
|
||||
}
|
||||
}
|
||||
|
||||
if range.end < bytes.len() && bytes[range.end] == b'\n' {
|
||||
range.end += 1;
|
||||
} else if range.start > 0 && bytes[range.start - 1] == b'\n' {
|
||||
range.start -= 1;
|
||||
}
|
||||
|
||||
range
|
||||
}
|
||||
|
||||
/// Remove the declaration corresponding to an unused binding.
|
||||
|
|
@ -373,18 +432,7 @@ impl<'a> CodeActionWorker<'a> {
|
|||
|
||||
let cursor = (name_range.start + name_range.end) / 2;
|
||||
let node = root.leaf_at_compat(cursor)?;
|
||||
let mut node = &node;
|
||||
|
||||
let decl_node = loop {
|
||||
match node.kind() {
|
||||
SyntaxKind::LetBinding | SyntaxKind::ModuleImport | SyntaxKind::ModuleInclude => {
|
||||
break node.clone();
|
||||
}
|
||||
_ => {
|
||||
node = node.parent()?;
|
||||
}
|
||||
}
|
||||
};
|
||||
let decl_node = self.find_declaration_ancestor(&node)?;
|
||||
|
||||
if decl_node.kind() == SyntaxKind::LetBinding {
|
||||
let let_binding = decl_node.cast::<ast::LetBinding>()?;
|
||||
|
|
@ -403,25 +451,7 @@ impl<'a> CodeActionWorker<'a> {
|
|||
}
|
||||
}
|
||||
|
||||
let mut remove_range = decl_node.range();
|
||||
let bytes = self.source.text().as_bytes();
|
||||
|
||||
if remove_range.start > 0 {
|
||||
let mut idx = remove_range.start;
|
||||
while idx > 0 && matches!(bytes[idx - 1], b' ' | b'\t') {
|
||||
idx -= 1;
|
||||
}
|
||||
|
||||
if idx > 0 && bytes[idx - 1] == b'#' {
|
||||
remove_range.start = idx - 1;
|
||||
}
|
||||
}
|
||||
|
||||
if remove_range.end < bytes.len() && bytes[remove_range.end] == b'\n' {
|
||||
remove_range.end += 1;
|
||||
} else if remove_range.start > 0 && bytes[remove_range.start - 1] == b'\n' {
|
||||
remove_range.start -= 1;
|
||||
}
|
||||
let remove_range = self.expand_declaration_range(decl_node.range());
|
||||
|
||||
let lsp_range = self.ctx.to_lsp_range(remove_range.clone(), &self.source);
|
||||
let edit = self.local_edit(EcoSnippetTextEdit::new_plain(lsp_range, EcoString::new()))?;
|
||||
|
|
@ -522,6 +552,10 @@ impl<'a> CodeActionWorker<'a> {
|
|||
root: &LinkedNode<'_>,
|
||||
name_range: &Range<usize>,
|
||||
) -> Option<Range<usize>> {
|
||||
if name_range.is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
let cursor = (name_range.start + name_range.end) / 2;
|
||||
let node = root.leaf_at_compat(cursor)?;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,21 +22,6 @@ input_file: crates/tinymist-query/src/fixtures/dead_code/function_as_value.typ
|
|||
"kind": "quickfix",
|
||||
"title": "Prefix `_` to `unused_callback`"
|
||||
},
|
||||
{
|
||||
"edit": {
|
||||
"changes": {
|
||||
"s0.typ": [
|
||||
{
|
||||
"insertTextFormat": 1,
|
||||
"newText": "_",
|
||||
"range": "6:5:6:20"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"kind": "quickfix",
|
||||
"title": "Replace with `_`"
|
||||
},
|
||||
{
|
||||
"edit": {
|
||||
"changes": {
|
||||
|
|
|
|||
|
|
@ -175,21 +175,6 @@ input_file: crates/tinymist-query/src/fixtures/dead_code/multiple_unused.typ
|
|||
"kind": "quickfix",
|
||||
"title": "Prefix `_` to `unused_func1`"
|
||||
},
|
||||
{
|
||||
"edit": {
|
||||
"changes": {
|
||||
"s0.typ": [
|
||||
{
|
||||
"insertTextFormat": 1,
|
||||
"newText": "_",
|
||||
"range": "6:5:6:17"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"kind": "quickfix",
|
||||
"title": "Replace with `_`"
|
||||
},
|
||||
{
|
||||
"edit": {
|
||||
"changes": {
|
||||
|
|
@ -226,21 +211,6 @@ input_file: crates/tinymist-query/src/fixtures/dead_code/multiple_unused.typ
|
|||
"kind": "quickfix",
|
||||
"title": "Prefix `_` to `unused_func2`"
|
||||
},
|
||||
{
|
||||
"edit": {
|
||||
"changes": {
|
||||
"s0.typ": [
|
||||
{
|
||||
"insertTextFormat": 1,
|
||||
"newText": "_",
|
||||
"range": "8:5:8:17"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"kind": "quickfix",
|
||||
"title": "Replace with `_`"
|
||||
},
|
||||
{
|
||||
"edit": {
|
||||
"changes": {
|
||||
|
|
|
|||
|
|
@ -22,21 +22,6 @@ input_file: crates/tinymist-query/src/fixtures/dead_code/unused_function.typ
|
|||
"kind": "quickfix",
|
||||
"title": "Prefix `_` to `unused_func`"
|
||||
},
|
||||
{
|
||||
"edit": {
|
||||
"changes": {
|
||||
"s0.typ": [
|
||||
{
|
||||
"insertTextFormat": 1,
|
||||
"newText": "_",
|
||||
"range": "1:5:1:16"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"kind": "quickfix",
|
||||
"title": "Replace with `_`"
|
||||
},
|
||||
{
|
||||
"edit": {
|
||||
"changes": {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
---
|
||||
source: crates/tinymist-query/src/code_action.rs
|
||||
assertion_line: 180
|
||||
description: Dead code code actions in /dummy-root/s0.typ
|
||||
expression: "JsonRepr::new_pure(ordered_entries)"
|
||||
input_file: crates/tinymist-query/src/fixtures/dead_code/unused_parameter.typ
|
||||
|
|
@ -22,21 +21,6 @@ input_file: crates/tinymist-query/src/fixtures/dead_code/unused_parameter.typ
|
|||
},
|
||||
"kind": "quickfix",
|
||||
"title": "Prefix `_` to `unused_param`"
|
||||
},
|
||||
{
|
||||
"edit": {
|
||||
"changes": {
|
||||
"s0.typ": [
|
||||
{
|
||||
"insertTextFormat": 1,
|
||||
"newText": "_",
|
||||
"range": "1:22:1:34"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"kind": "quickfix",
|
||||
"title": "Replace with `_`"
|
||||
}
|
||||
],
|
||||
"message": "unused variable: `unused_param`\nHint: if this parameter is intentionally unused, prefix it with underscore: `_unused_param`",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue