language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Don't mess with cursor position when adding hashes

Browse source
This commit is contained in:
Aleksey Kladov 2020-07-09 19:21:41 +02:00
parent 1fb92d791e
commit 68706b59c9
4 changed files with 34 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/ra_syntax/src/ast/tokens.rs
View file

@ -1,6 +1,9 @@
//! There are many AstNodes, but only a few tokens, so we hand-write them here.
use std::convert::{TryFrom, TryInto};
use std::{
borrow::Cow,
convert::{TryFrom, TryInto},
};
use crate::{
ast::{AstToken, Comment, RawString, String, Whitespace},
@ -138,11 +141,11 @@ impl HasQuotes for String {}
impl HasQuotes for RawString {}
pub trait HasStringValue: HasQuotes {
fn value(&self) -> Option<std::string::String>;
fn value(&self) -> Option<Cow<'_, str>>;
}
impl HasStringValue for String {
fn value(&self) -> Option<std::string::String> {
fn value(&self) -> Option<Cow<'_, str>> {
let text = self.text().as_str();
let text = &text[self.text_range_between_quotes()? - self.syntax().text_range().start()];
@ -156,15 +159,17 @@ impl HasStringValue for String {
if has_error {
return None;
}
Some(buf)
// FIXME: don't actually allocate for borrowed case
let res = if buf == text { Cow::Borrowed(text) } else { Cow::Owned(buf) };
Some(res)
}
}
impl HasStringValue for RawString {
fn value(&self) -> Option<std::string::String> {
fn value(&self) -> Option<Cow<'_, str>> {
let text = self.text().as_str();
let text = &text[self.text_range_between_quotes()? - self.syntax().text_range().start()];
Some(text.to_string())
Some(Cow::Borrowed(text))
}
}