rust-analyzer

diff --git a/crates/ide/src/syntax_highlighting/highlight.rs b/crates/ide/src/syntax_highlighting/highlight.rs
index 9395e914c4..e7d0a8be7f 100644
--- a/crates/ide/src/syntax_highlighting/highlight.rs
+++ b/crates/ide/src/syntax_highlighting/highlight.rs

@@ -87,9 +87,9 @@ fn punctuation(

let parent = token.parent();

let parent_kind = parent.as_ref().map_or(EOF, SyntaxNode::kind);

match (kind, parent_kind) {

- (T![?], _) => HlTag::Operator(HlOperator::Other) | HlMod::ControlFlow,

+ (T![?], TRY_EXPR) => HlTag::Operator(HlOperator::Other) | HlMod::ControlFlow,

(T![&], BIN_EXPR) => HlOperator::Bitwise.into(),

- (T![&], _) => {

+ (T![&], REF_EXPR) => {

let h = HlTag::Operator(HlOperator::Other).into();

let is_unsafe = parent

.and_then(ast::RefExpr::cast)

@@ -100,7 +100,9 @@ fn punctuation(

}

- (T![::] | T![->] | T![=>] | T![..] | T![=] | T![@] | T![.], _) => HlOperator::Other.into(),

+ (T![::] | T![->] | T![=>] | T![..] | T![..=] | T![=] | T![@] | T![.], _) => {

+ HlOperator::Other.into()

+ }

(T![!], MACRO_CALL | MACRO_RULES) => HlPunct::MacroBang.into(),

(T![!], NEVER_TYPE) => HlTag::BuiltinType.into(),

(T![!], PREFIX_EXPR) => HlOperator::Logical.into(),

@@ -129,7 +131,7 @@ fn punctuation(

(T![+=] | T![-=] | T![*=] | T![/=] | T![%=], BIN_EXPR) => {

Highlight::from(HlOperator::Arithmetic) | HlMod::Mutable

}

- (T![|] | T![&] | T![!] | T![^] | T![>>] | T![<<], BIN_EXPR) => HlOperator::Bitwise.into(),

+ (T![|] | T![&] | T![^] | T![>>] | T![<<], BIN_EXPR) => HlOperator::Bitwise.into(),

(T![|=] | T![&=] | T![^=] | T![>>=] | T![<<=], BIN_EXPR) => {

Highlight::from(HlOperator::Bitwise) | HlMod::Mutable

}

@@ -137,7 +139,6 @@ fn punctuation(

(T![>] | T![<] | T![==] | T![>=] | T![<=] | T![!=], BIN_EXPR) => {

HlOperator::Comparison.into()

}

- (_, PREFIX_EXPR | BIN_EXPR | RANGE_EXPR | RANGE_PAT | REST_PAT) => HlOperator::Other.into(),

(_, ATTR) => HlTag::AttributeBracket.into(),

(kind, _) => match kind {

T!['['] | T![']'] => HlPunct::Bracket,

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html b/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html
index e07fd3925c..9ed65fbc85 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html

@@ -48,15 +48,15 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

impl foo {

pub fn is_static() {}

- pub fn is_not_static(&self) {}

+ pub fn is_not_static(&self) {}

}

trait t {

fn t_is_static() {}

- fn t_is_not_static(&self) {}

+ fn t_is_not_static(&self) {}

}

impl t for foo {

pub fn is_static() {}

- pub fn is_not_static(&self) {}

+ pub fn is_not_static(&self) {}

}</code></pre> \ No newline at end of file

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html
index eef5baea98..18045f1f55 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html

@@ -125,7 +125,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

/// ```sh

/// echo 1

/// ```

- pub fn foo(&self) -> bool {

+ pub fn foo(&self) -> bool {

true

}

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_general.html b/crates/ide/src/syntax_highlighting/test_data/highlight_general.html
index a97802cbbd..9f2b1926b5 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_general.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_general.html

@@ -61,11 +61,11 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

}

trait Bar {

- fn bar(&self) -> i32;

+ fn bar(&self) -> i32;

}

impl Bar for Foo {

self.x

}

@@ -75,11 +75,11 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

f.baz(self)

}

- fn qux(&mut self) {

+ fn qux(&mut self) {

self.x = 0;

}

- fn quop(&self) -> i32 {

+ fn quop(&self) -> i32 {

self.x

}

@@ -96,11 +96,11 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

f.baz(self)

}

self.x

}

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html b/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html
index ced7d22f03..abcd80c280 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html

@@ -42,7 +42,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }

</style>

-<pre><code>fn fixture(ra_fixture: &str) {}

+<pre><code>fn fixture(ra_fixture: &str) {}

fn main() {

fixture(r#"

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_lifetimes.html b/crates/ide/src/syntax_highlighting/test_data/highlight_lifetimes.html
index 2d85fc8c92..f98e0b1cda 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_lifetimes.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_lifetimes.html

@@ -45,8 +45,8 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

#[derive()]

struct Foo<'a, 'b, 'c> where 'a: 'a, 'static: 'static {

- field: &'a (),

- field2: &'static (),

+ field: &'a (),

+ field2: &'static (),

}

impl<'a> Foo<'_, 'a, 'static>

where

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html b/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html
index c627bc9b09..a626cda3fe 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html

@@ -62,16 +62,16 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

() => (

),

- ($msg:literal $(,)?) => (

+ ($msg:literal $(,)?) => (

),

// Use `panic_str` instead of `panic_display::<&str>` for non_fmt_panic lint.

- ($msg:expr $(,)?) => (

+ ($msg:expr $(,)?) => (

),

// Special-case the single-argument case for const_panic.

- ("{}", $arg:expr $(,)?) => (

- $crate::panicking::panic_display(&$arg)

+ ("{}", $arg:expr $(,)?) => (

+ $crate::panicking::panic_display(&$arg)

),

($fmt:expr, $($arg:tt)+) => (

$crate::panicking::panic_fmt($crate::const_format_args!($fmt, $($arg)+))

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html b/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html
index 0716bae751..1992bdc6ae 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html

@@ -49,7 +49,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

}

macro_rules! unsafe_deref {

() => {

- *(&() as *const ())

+ *(&() as *const ())

};

}

static mut MUT_GLOBAL: Struct = Struct { field: 0 };

@@ -63,7 +63,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

struct Struct { field: i32 }

impl Struct {

- unsafe fn unsafe_method(&self) {}

+ unsafe fn unsafe_method(&self) {}

}

#[repr(packed)]

@@ -78,11 +78,11 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

fn unsafe_trait_bound<T: UnsafeTrait>(_: T) {}

trait DoTheAutoref {

- fn calls_autoref(&self);

+ fn calls_autoref(&self);

}

impl DoTheAutoref for u16 {

}

fn main() {