Skip to content

Commit

Permalink
Fix regression when renaming commands (#937)
Browse files Browse the repository at this point in the history
  • Loading branch information
pfoerster authored Oct 10, 2023
1 parent 8557e48 commit 1efb89b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
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

0 comments on commit 1efb89b

Please sign in to comment.