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 regression when renaming commands #937

Merged
merged 1 commit into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Fixed

- Fix regression when renaming commands ([#936](https://github.com/latex-lsp/texlab/issues/936))

## [5.10.0] - 2023-09-30

### Added
Expand Down
11 changes: 8 additions & 3 deletions crates/rename/src/command.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use base_db::{semantics::Span, DocumentData};
use rowan::TextRange;
use rowan::{TextRange, TextSize};
use syntax::latex;

use crate::{RenameBuilder, RenameParams};
Expand All @@ -11,7 +11,12 @@ pub(super) fn prepare_rename(params: &RenameParams) -> Option<Span> {
.token_at_offset(params.offset)
.find(|token| token.kind() == latex::COMMAND_NAME)?;

Some(Span::from(&token))
let range = token.text_range();
let text = token.text()[1..].into();
Some(Span::new(
text,
TextRange::new(range.start() + TextSize::of('\\'), range.end()),
))
}

pub(super) fn rename<'a>(builder: &mut RenameBuilder) -> Option<()> {
Expand All @@ -24,7 +29,7 @@ pub(super) fn rename<'a>(builder: &mut RenameBuilder) -> Option<()> {

let mut edits = Vec::new();
for command in &data.semantics.commands {
if command.text == &name.text[1..] {
if command.text == name.text {
let range = TextRange::new(command.range.start(), command.range.end());
edits.push(range);
}
Expand Down