rust-analyzer

diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 9fef3e0575..85f33a10fc 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs

@@ -2564,6 +2564,15 @@ impl HasVisibility for TypeAlias {

}

#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]

+pub struct StaticLifetime;

+impl StaticLifetime {

+ pub fn name(self) -> Name {

+ known::STATIC_LIFETIME

+ }

+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]

pub struct BuiltinType {

pub(crate) inner: hir_def::builtin_type::BuiltinType,

}

diff --git a/crates/ide-db/src/defs.rs b/crates/ide-db/src/defs.rs
index c0f0faba35..634277e869 100644
--- a/crates/ide-db/src/defs.rs
+++ b/crates/ide-db/src/defs.rs

@@ -11,8 +11,8 @@ use hir::{

Adt, AsAssocItem, AsExternAssocItem, AssocItem, AttributeTemplate, BuiltinAttr, BuiltinType,

Const, Crate, DefWithBody, DeriveHelper, DocLinkDef, ExternAssocItem, ExternCrateDecl, Field,

Function, GenericParam, HasVisibility, HirDisplay, Impl, Label, Local, Macro, Module,

- ModuleDef, Name, PathResolution, Semantics, Static, ToolModule, Trait, TraitAlias, TupleField,

- TypeAlias, Variant, VariantDef, Visibility,

+ ModuleDef, Name, PathResolution, Semantics, Static, StaticLifetime, ToolModule, Trait,

+ TraitAlias, TupleField, TypeAlias, Variant, VariantDef, Visibility,

};

use stdx::{format_to, impl_from};

use syntax::{

@@ -39,12 +39,13 @@ pub enum Definition {

Trait(Trait),

TraitAlias(TraitAlias),

TypeAlias(TypeAlias),

- BuiltinType(BuiltinType),

SelfType(Impl),

GenericParam(GenericParam),

Local(Local),

Label(Label),

DeriveHelper(DeriveHelper),

+ BuiltinType(BuiltinType),

+ BuiltinLifetime(StaticLifetime),

BuiltinAttr(BuiltinAttr),

ToolModule(ToolModule),

ExternCrateDecl(ExternCrateDecl),

@@ -83,6 +84,7 @@ impl Definition {

Definition::DeriveHelper(it) => it.derive().module(db),

Definition::BuiltinAttr(_)

| Definition::BuiltinType(_)

+ | Definition::BuiltinLifetime(_)

| Definition::TupleField(_)

| Definition::ToolModule(_) => return None,

};

@@ -112,6 +114,7 @@ impl Definition {

Definition::BuiltinType(_) | Definition::TupleField(_) => Visibility::Public,

Definition::Macro(_) => return None,

Definition::BuiltinAttr(_)

+ | Definition::BuiltinLifetime(_)

| Definition::ToolModule(_)

| Definition::SelfType(_)

| Definition::Local(_)

@@ -141,6 +144,7 @@ impl Definition {

Definition::Local(it) => it.name(db),

Definition::GenericParam(it) => it.name(db),

Definition::Label(it) => it.name(db),

+ Definition::BuiltinLifetime(StaticLifetime) => hir::known::STATIC_LIFETIME,

Definition::BuiltinAttr(_) => return None, // FIXME

Definition::ToolModule(_) => return None, // FIXME

Definition::DeriveHelper(it) => it.name(db),

@@ -174,6 +178,7 @@ impl Definition {

doc_owner.docs(fd.0.db)

})

}

+ Definition::BuiltinLifetime(StaticLifetime) => None,

Definition::Local(_) => None,

Definition::SelfType(impl_def) => {

impl_def.self_ty(db).as_adt().map(|adt| adt.docs(db))?

@@ -228,6 +233,7 @@ impl Definition {

Definition::TraitAlias(it) => it.display(db).to_string(),

Definition::TypeAlias(it) => it.display(db).to_string(),

Definition::BuiltinType(it) => it.name().display(db).to_string(),

+ Definition::BuiltinLifetime(it) => it.name().display(db).to_string(),

Definition::Local(it) => {

let ty = it.ty(db);

let ty_display = ty.display_truncated(db, None);

@@ -693,6 +699,9 @@ impl NameRefClass {

) -> Option<NameRefClass> {

let _p = tracing::span!(tracing::Level::INFO, "NameRefClass::classify_lifetime", ?lifetime)

.entered();

+ if lifetime.text() == "'static" {

+ return Some(NameRefClass::Definition(Definition::BuiltinLifetime(StaticLifetime)));

+ }

let parent = lifetime.syntax().parent()?;

match parent.kind() {

SyntaxKind::BREAK_EXPR | SyntaxKind::CONTINUE_EXPR => {

diff --git a/crates/ide-db/src/rename.rs b/crates/ide-db/src/rename.rs
index 6a7042988a..288d56b534 100644
--- a/crates/ide-db/src/rename.rs
+++ b/crates/ide-db/src/rename.rs

@@ -196,11 +196,12 @@ impl Definition {

.and_then(syn_ctx_is_root)

}

- Definition::BuiltinType(_) => return None,

- Definition::SelfType(_) => return None,

- Definition::BuiltinAttr(_) => return None,

- Definition::ToolModule(_) => return None,

- Definition::TupleField(_) => return None,

+ Definition::BuiltinType(_)

+ | Definition::BuiltinLifetime(_)

+ | Definition::BuiltinAttr(_)

+ | Definition::SelfType(_)

+ | Definition::ToolModule(_)

+ | Definition::TupleField(_) => return None,

// FIXME: This should be doable in theory

Definition::DeriveHelper(_) => return None,

};

diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs
index 64b4ccc5bd..8d765dfc91 100644
--- a/crates/ide/src/doc_links.rs
+++ b/crates/ide/src/doc_links.rs

@@ -214,8 +214,9 @@ pub(crate) fn resolve_doc_path_for_def(

Definition::SelfType(it) => it.resolve_doc_path(db, link, ns),

Definition::ExternCrateDecl(it) => it.resolve_doc_path(db, link, ns),

Definition::BuiltinAttr(_)

- | Definition::ToolModule(_)

| Definition::BuiltinType(_)

+ | Definition::BuiltinLifetime(_)

+ | Definition::ToolModule(_)

| Definition::TupleField(_)

| Definition::Local(_)

| Definition::GenericParam(_)

@@ -648,6 +649,7 @@ fn filename_and_frag_for_def(

| Definition::TupleField(_)

| Definition::Label(_)

| Definition::BuiltinAttr(_)

+ | Definition::BuiltinLifetime(_)

| Definition::ToolModule(_)

| Definition::DeriveHelper(_) => return None,

};

diff --git a/crates/ide/src/hover/render.rs b/crates/ide/src/hover/render.rs
index a166bab37c..3bc17f95e7 100644
--- a/crates/ide/src/hover/render.rs
+++ b/crates/ide/src/hover/render.rs

@@ -756,15 +756,7 @@ fn closure_ty(

}

fn definition_mod_path(db: &RootDatabase, def: &Definition) -> Option<String> {

- if matches!(

- def,

- Definition::GenericParam(_)

- | Definition::BuiltinType(_)

- | Definition::Local(_)

- | Definition::Label(_)

- | Definition::BuiltinAttr(_)

- | Definition::ToolModule(_)

- ) {

+ if matches!(def, Definition::GenericParam(_) | Definition::Local(_) | Definition::Label(_)) {

return None;

}

def.module(db).map(|module| path(db, module, definition_owner_name(db, def)))

diff --git a/crates/ide/src/hover/tests.rs b/crates/ide/src/hover/tests.rs
index 76d86f8ede..20d07bf991 100644
--- a/crates/ide/src/hover/tests.rs
+++ b/crates/ide/src/hover/tests.rs

@@ -4441,7 +4441,7 @@ fn foo() {

```rust

'label

```

- "#]],

+ "#]],

);

}

@@ -4455,7 +4455,17 @@ fn hover_lifetime() {

```rust

'lifetime

```

- "#]],

+ "#]],

+ );

+ check(

+ r#"fn foo(_: &'static$0 ()) {}"#,

+ expect![[r#"

+ *'static*

+ ```rust

+ 'static

+ ```

+ "#]],

);

}

diff --git a/crates/ide/src/moniker.rs b/crates/ide/src/moniker.rs
index 08760c0d88..68854c33ce 100644
--- a/crates/ide/src/moniker.rs
+++ b/crates/ide/src/moniker.rs

@@ -211,6 +211,7 @@ pub(crate) fn def_to_kind(db: &RootDatabase, def: Definition) -> SymbolInformati

}

Definition::BuiltinType(..) => Type,

+ Definition::BuiltinLifetime(_) => TypeParameter,

Definition::SelfType(..) => TypeAlias,

Definition::GenericParam(..) => TypeParameter,

Definition::Local(it) => {

@@ -316,6 +317,7 @@ pub(crate) fn def_to_moniker(

Definition::GenericParam(_)

| Definition::Label(_)

| Definition::DeriveHelper(_)

+ | Definition::BuiltinLifetime(_)

| Definition::BuiltinAttr(_)

| Definition::ToolModule(_) => return None,

diff --git a/crates/ide/src/navigation_target.rs b/crates/ide/src/navigation_target.rs
index 2123c98605..fc836d5540 100644
--- a/crates/ide/src/navigation_target.rs
+++ b/crates/ide/src/navigation_target.rs

@@ -235,9 +235,11 @@ impl TryToNav for Definition {

Definition::TraitAlias(it) => it.try_to_nav(db),

Definition::TypeAlias(it) => it.try_to_nav(db),

Definition::ExternCrateDecl(it) => Some(it.try_to_nav(db)?),

- Definition::BuiltinType(_) | Definition::TupleField(_) => None,

- Definition::ToolModule(_) => None,

- Definition::BuiltinAttr(_) => None,

+ Definition::BuiltinLifetime(_)

+ | Definition::BuiltinType(_)

+ | Definition::TupleField(_)

+ | Definition::ToolModule(_)

+ | Definition::BuiltinAttr(_) => None,

// FIXME: The focus range should be set to the helper declaration

Definition::DeriveHelper(it) => it.derive().try_to_nav(db),

}

diff --git a/crates/ide/src/syntax_highlighting/highlight.rs b/crates/ide/src/syntax_highlighting/highlight.rs
index a72f505eb8..3b784ebec3 100644
--- a/crates/ide/src/syntax_highlighting/highlight.rs
+++ b/crates/ide/src/syntax_highlighting/highlight.rs

@@ -484,6 +484,7 @@ pub(super) fn highlight_def(

}

Definition::BuiltinType(_) => Highlight::new(HlTag::BuiltinType),

+ Definition::BuiltinLifetime(_) => Highlight::new(HlTag::Symbol(SymbolKind::LifetimeParam)),

Definition::Static(s) => {

let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Static));

@@ -542,13 +543,14 @@ pub(super) fn highlight_def(

let def_crate = def.krate(db);

let is_from_other_crate = def_crate != Some(krate);

let is_from_builtin_crate = def_crate.map_or(false, |def_crate| def_crate.is_builtin(db));

- let is_builtin_type = matches!(def, Definition::BuiltinType(_));

- let is_public = def.visibility(db) == Some(hir::Visibility::Public);

- match (is_from_other_crate, is_builtin_type, is_public) {

- (true, false, _) => h |= HlMod::Library,

- (false, _, true) => h |= HlMod::Public,

- _ => {}

+ let is_builtin = matches!(

+ def,

+ Definition::BuiltinType(_) | Definition::BuiltinLifetime(_) | Definition::BuiltinAttr(_)

+ );

+ match is_from_other_crate {

+ true if !is_builtin => h |= HlMod::Library,

+ false if def.visibility(db) == Some(hir::Visibility::Public) => h |= HlMod::Public,

+ _ => (),

}

if is_from_builtin_crate {

diff --git a/crates/ide/src/syntax_highlighting/inject.rs b/crates/ide/src/syntax_highlighting/inject.rs
index 10d867fe2b..f9b8a22a3c 100644
--- a/crates/ide/src/syntax_highlighting/inject.rs
+++ b/crates/ide/src/syntax_highlighting/inject.rs

@@ -299,6 +299,7 @@ fn module_def_to_hl_tag(def: Definition) -> HlTag {

Definition::Trait(_) => SymbolKind::Trait,

Definition::TraitAlias(_) => SymbolKind::TraitAlias,

Definition::TypeAlias(_) => SymbolKind::TypeAlias,

+ Definition::BuiltinLifetime(_) => SymbolKind::LifetimeParam,

Definition::BuiltinType(_) => return HlTag::BuiltinType,

Definition::Macro(_) => SymbolKind::Macro,

Definition::Field(_) | Definition::TupleField(_) => SymbolKind::Field,

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_attributes.html b/crates/ide/src/syntax_highlighting/test_data/highlight_attributes.html
index de902b5137..cad5a8b593 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_attributes.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_attributes.html

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

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

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

</style>

-<pre><code>#[allow(dead_code)]

+<pre><code>#[allow(dead_code)]

#[rustfmt::skip]

#[proc_macros::identity]

#[derive(Default)]

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 b2ca6e1ca4..35650bbe87 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html

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

/// # Examples

///

/// ```

- /// # #![allow(unused_mut)]

+ /// # #![allow(unused_mut)]

/// let mut foo: Foo = Foo::new();

/// ```

pub const fn new() -> Foo {

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

///

/// ```

/// loop {}

-#[cfg_attr(not(feature = "false"), doc = "loop {}")]

-#[doc = "loop {}"]

+#[cfg_attr(not(feature = "false"), doc = "loop {}")]

+#[doc = "loop {}"]

/// ```

///

-#[cfg_attr(not(feature = "alloc"), doc = "```ignore")]

+#[cfg_attr(not(feature = "alloc"), doc = "```ignore")]

/// let _ = example(&alloc::vec![1, 2, 3]);

/// ```

pub fn mix_and_match() {}

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 5234d362c2..413edb6d65 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_general.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_general.html

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

mod inner {}

pub mod ops {

- #[lang = "fn_once"]

+ #[lang = "fn_once"]

pub trait FnOnce<Args> {}

- #[lang = "fn_mut"]

+ #[lang = "fn_mut"]

pub trait FnMut<Args>: FnOnce<Args> {}

- #[lang = "fn"]

+ #[lang = "fn"]

pub trait Fn<Args>: FnMut<Args> {}

}

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 15d6be6334..be6176894b 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html

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

unsafe fn unsafe_method(&self) {}

}

-#[repr(packed)]

+#[repr(packed)]

struct Packed {

a: u16,

}