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

Fix renaming for Zed #4203

Merged
merged 1 commit into from
Feb 3, 2025
Merged
Changes from all commits
Commits
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
Fix renaming for Zed
GearsDatapacks committed Jan 26, 2025
commit 1b90b0d4ce9c513f95aeed32504bf704db15351b
31 changes: 20 additions & 11 deletions compiler-core/src/language_server/engine.rs
Original file line number Diff line number Diff line change
@@ -501,44 +501,53 @@ where
params: lsp::TextDocumentPositionParams,
) -> Response<Option<PrepareRenameResponse>> {
self.respond(|this| {
let (_, found) = match this.node_at_position(&params) {
let (lines, found) = match this.node_at_position(&params) {
Some(value) => value,
None => return Ok(None),
};

let success_response = Some(PrepareRenameResponse::DefaultBehavior {
default_behavior: true,
});
let success_response = |location| {
Some(PrepareRenameResponse::Range(src_span_to_lsp_range(
location, &lines,
)))
};

Ok(match found {
Located::Expression(TypedExpr::Var {
constructor:
ValueConstructor {
variant: ValueConstructorVariant::LocalVariable { origin, .. },
variant: ValueConstructorVariant::LocalVariable { origin, location },
..
},
..
})
| Located::Pattern(Pattern::Variable { origin, .. }) => match origin {
| Located::Pattern(Pattern::Variable {
origin, location, ..
}) => match origin {
VariableOrigin::Variable(_)
| VariableOrigin::AssignmentPattern
| VariableOrigin::LabelShorthand(_) => success_response,
| VariableOrigin::LabelShorthand(_) => success_response(*location),
VariableOrigin::Generated => None,
},
Located::Pattern(Pattern::VarUsage { constructor, .. }) => constructor
.as_ref()
.and_then(|constructor| match &constructor.variant {
ValueConstructorVariant::LocalVariable { origin, .. } => match origin {
ValueConstructorVariant::LocalVariable { origin, location } => match origin
{
VariableOrigin::Variable(_)
| VariableOrigin::AssignmentPattern
| VariableOrigin::LabelShorthand(_) => success_response,
| VariableOrigin::LabelShorthand(_) => success_response(*location),
VariableOrigin::Generated => None,
},
_ => None,
}),
Located::Pattern(Pattern::Assign { .. }) => success_response,
Located::Pattern(Pattern::Assign { location, .. }) => success_response(*location),
Located::Arg(arg) => match &arg.names {
ArgNames::Named { .. } | ArgNames::NamedLabelled { .. } => success_response,
ArgNames::Named { location, .. }
| ArgNames::NamedLabelled {
name_location: location,
..
} => success_response(*location),
ArgNames::Discard { .. } | ArgNames::LabelledDiscard { .. } => None,
},
_ => None,