Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-31 23:38:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make ModPath display escaped path

Browse source
This commit is contained in:
Ryo Yoshida 2022-08-11 02:17:15 +09:00
parent 8fe73a2240
commit 018266a7ff
No known key found for this signature in database
GPG key ID: E25698A930586171
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/hir-expand/src/mod_path.rs
View file

@ -22,7 +22,7 @@ pub struct ModPath {
} }
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct EscapedModPath<'a>(&'a ModPath); pub struct UnescapedModPath<'a>(&'a ModPath);
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub enum PathKind { pub enum PathKind {
@ -102,8 +102,8 @@ impl ModPath {
} }
} }
pub fn escaped(&self) -> EscapedModPath<'_> { pub fn unescaped(&self) -> UnescapedModPath<'_> {
EscapedModPath(self) UnescapedModPath(self)
} }
fn _fmt(&self, f: &mut fmt::Formatter<'_>, escaped: bool) -> fmt::Result { fn _fmt(&self, f: &mut fmt::Formatter<'_>, escaped: bool) -> fmt::Result {
@ -145,13 +145,13 @@ impl ModPath {
impl Display for ModPath { impl Display for ModPath {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self._fmt(f, false) self._fmt(f, true)
} }
} }
impl<'a> Display for EscapedModPath<'a> { impl<'a> Display for UnescapedModPath<'a> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0._fmt(f, true) self.0._fmt(f, false)
} }
} }

2
crates/ide-completion/src/render/literal.rs
View file

@ -73,7 +73,7 @@ fn render(
None => (name.clone().into(), name.into(), false), None => (name.clone().into(), name.into(), false),
}; };
let (qualified_name, escaped_qualified_name) = let (qualified_name, escaped_qualified_name) =
(qualified_name.to_string(), qualified_name.escaped().to_string()); (qualified_name.unescaped().to_string(), qualified_name.to_string());
let snippet_cap = ctx.snippet_cap(); let snippet_cap = ctx.snippet_cap();
let mut rendered = match kind { let mut rendered = match kind {

2
crates/ide-completion/src/render/pattern.rs
View file

@ -53,7 +53,7 @@ pub(crate) fn render_variant_pat(
let (visible_fields, fields_omitted) = visible_fields(ctx.completion, &fields, variant)?; let (visible_fields, fields_omitted) = visible_fields(ctx.completion, &fields, variant)?;
let (name, escaped_name) = match path { let (name, escaped_name) = match path {
Some(path) => (path.to_string().into(), path.escaped().to_string().into()), Some(path) => (path.unescaped().to_string().into(), path.to_string().into()),
None => { None => {
let name = local_name.unwrap_or_else(|| variant.name(ctx.db())); let name = local_name.unwrap_or_else(|| variant.name(ctx.db()));
(name.unescaped().to_smol_str(), name.to_smol_str()) (name.unescaped().to_smol_str(), name.to_smol_str())

2
crates/ide-completion/src/render/union_literal.rs
View file

@ -21,7 +21,7 @@ pub(crate) fn render_union_literal(
let name = local_name.unwrap_or_else(|| un.name(ctx.db())); let name = local_name.unwrap_or_else(|| un.name(ctx.db()));
let (qualified_name, escaped_qualified_name) = match path { let (qualified_name, escaped_qualified_name) = match path {
Some(p) => (p.to_string(), p.escaped().to_string()), Some(p) => (p.unescaped().to_string(), p.to_string()),
None => (name.unescaped().to_string(), name.to_string()), None => (name.unescaped().to_string(), name.to_string()),
}; };