Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-12 05:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify

Browse source
This commit is contained in:
Aleksey Kladov 2020-11-06 22:30:58 +01:00
parent 5ba4f949c2
commit 6158304f8b
6 changed files with 25 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/assists/src/handlers/raw_string.rs
View file

@ -1,9 +1,6 @@
use std::borrow::Cow;
use syntax::{
ast::{self, HasQuotes, HasStringValue},
AstToken, TextRange, TextSize,
};
use syntax::{ast, AstToken, TextRange, TextSize};
use test_utils::mark;
use crate::{AssistContext, AssistId, AssistKind, Assists};

6
crates/assists/src/handlers/replace_string_with_char.rs
View file

@ -1,8 +1,4 @@
use syntax::{
ast::{self, HasStringValue},
AstToken,
SyntaxKind::STRING,
};
use syntax::{ast, AstToken, SyntaxKind::STRING};
use crate::{AssistContext, AssistId, AssistKind, Assists};

2
crates/hir_expand/src/builtin_macro.rs
View file

@ -8,7 +8,7 @@ use base_db::FileId;
use either::Either;
use mbe::parse_to_token_tree;
use parser::FragmentKind;
use syntax::ast::{self, AstToken, HasStringValue};
use syntax::ast::{self, AstToken};
macro_rules! register_builtin {
( LAZY: $(($name:ident, $kind: ident) => $expand:ident),* , EAGER: $(($e_name:ident, $e_kind: ident) => $e_expand:ident),* ) => {

1
crates/ide/src/syntax_highlighting/injection.rs
View file

@ -2,7 +2,6 @@
use std::{collections::BTreeMap, convert::TryFrom};
use ast::{HasQuotes, HasStringValue};
use hir::Semantics;
use ide_db::call_info::ActiveParameter;
use itertools::Itertools;

2
crates/syntax/src/ast/node_ext.rs
View file

@ -7,7 +7,7 @@ use itertools::Itertools;
use parser::SyntaxKind;
use crate::{
ast::{self, support, token_ext::HasStringValue, AstNode, AstToken, NameOwner, SyntaxNode},
ast::{self, support, AstNode, AstToken, NameOwner, SyntaxNode},
SmolStr, SyntaxElement, SyntaxToken, T,
};

54
crates/syntax/src/ast/token_ext.rs
View file

@ -114,36 +114,6 @@ impl QuoteOffsets {
}
}
pub trait HasQuotes: AstToken {
fn quote_offsets(&self) -> Option<QuoteOffsets> {
let text = self.text().as_str();
let offsets = QuoteOffsets::new(text)?;
let o = self.syntax().text_range().start();
let offsets = QuoteOffsets {
quotes: (offsets.quotes.0 + o, offsets.quotes.1 + o),
contents: offsets.contents + o,
};
Some(offsets)
}
fn open_quote_text_range(&self) -> Option<TextRange> {
self.quote_offsets().map(|it| it.quotes.0)
}
fn close_quote_text_range(&self) -> Option<TextRange> {
self.quote_offsets().map(|it| it.quotes.1)
}
fn text_range_between_quotes(&self) -> Option<TextRange> {
self.quote_offsets().map(|it| it.contents)
}
}
impl HasQuotes for ast::String {}
pub trait HasStringValue: HasQuotes {
fn value(&self) -> Option<Cow<'_, str>>;
}
impl ast::String {
pub fn is_raw(&self) -> bool {
self.text().starts_with('r')
@ -153,10 +123,8 @@ impl ast::String {
assert!(TextRange::up_to(contents_range.len()).contains_range(range));
Some(range + contents_range.start())
}
}
impl HasStringValue for ast::String {
fn value(&self) -> Option<Cow<'_, str>> {
pub fn value(&self) -> Option<Cow<'_, str>> {
if self.is_raw() {
let text = self.text().as_str();
let text =
@ -181,6 +149,26 @@ impl HasStringValue for ast::String {
let res = if buf == text { Cow::Borrowed(text) } else { Cow::Owned(buf) };
Some(res)
}
pub fn quote_offsets(&self) -> Option<QuoteOffsets> {
let text = self.text().as_str();
let offsets = QuoteOffsets::new(text)?;
let o = self.syntax().text_range().start();
let offsets = QuoteOffsets {
quotes: (offsets.quotes.0 + o, offsets.quotes.1 + o),
contents: offsets.contents + o,
};
Some(offsets)
}
pub fn text_range_between_quotes(&self) -> Option<TextRange> {
self.quote_offsets().map(|it| it.contents)
}
pub fn open_quote_text_range(&self) -> Option<TextRange> {
self.quote_offsets().map(|it| it.quotes.0)
}
pub fn close_quote_text_range(&self) -> Option<TextRange> {
self.quote_offsets().map(|it| it.quotes.1)
}
}
impl ast::ByteString {