bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide/src/inlay_hints/chaining.rs')
-rw-r--r--crates/ide/src/inlay_hints/chaining.rs47
1 files changed, 24 insertions, 23 deletions
diff --git a/crates/ide/src/inlay_hints/chaining.rs b/crates/ide/src/inlay_hints/chaining.rs
index d86487d4b4..4e15213b8b 100644
--- a/crates/ide/src/inlay_hints/chaining.rs
+++ b/crates/ide/src/inlay_hints/chaining.rs
@@ -1,11 +1,12 @@
//! Implementation of "chaining" inlay hints.
use ide_db::famous_defs::FamousDefs;
+use span::EditionedFileId;
use syntax::{
ast::{self, AstNode},
Direction, NodeOrToken, SyntaxKind, T,
};
-use crate::{FileId, InlayHint, InlayHintPosition, InlayHintsConfig, InlayKind};
+use crate::{InlayHint, InlayHintPosition, InlayHintsConfig, InlayKind};
use super::label_of_ty;
@@ -13,7 +14,7 @@ pub(super) fn hints(
acc: &mut Vec<InlayHint>,
famous_defs @ FamousDefs(sema, _): &FamousDefs<'_, '_>,
config: &InlayHintsConfig,
- _file_id: FileId,
+ _file_id: EditionedFileId,
expr: &ast::Expr,
) -> Option<()> {
if !config.chaining_hints {
@@ -142,7 +143,7 @@ fn main() {
InlayHintLabelPart {
text: "B",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),
@@ -161,7 +162,7 @@ fn main() {
InlayHintLabelPart {
text: "A",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),
@@ -225,7 +226,7 @@ fn main() {
InlayHintLabelPart {
text: "C",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),
@@ -244,7 +245,7 @@ fn main() {
InlayHintLabelPart {
text: "B",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),
@@ -292,7 +293,7 @@ fn main() {
InlayHintLabelPart {
text: "C",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),
@@ -311,7 +312,7 @@ fn main() {
InlayHintLabelPart {
text: "B",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),
@@ -360,7 +361,7 @@ fn main() {
InlayHintLabelPart {
text: "B",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),
@@ -373,7 +374,7 @@ fn main() {
InlayHintLabelPart {
text: "X",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),
@@ -392,7 +393,7 @@ fn main() {
InlayHintLabelPart {
text: "A",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),
@@ -405,7 +406,7 @@ fn main() {
InlayHintLabelPart {
text: "X",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),
@@ -456,7 +457,7 @@ fn main() {
InlayHintLabelPart {
text: "Iterator",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
1,
),
@@ -469,7 +470,7 @@ fn main() {
InlayHintLabelPart {
text: "Item",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
1,
),
@@ -488,7 +489,7 @@ fn main() {
InlayHintLabelPart {
text: "Iterator",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
1,
),
@@ -501,7 +502,7 @@ fn main() {
InlayHintLabelPart {
text: "Item",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
1,
),
@@ -520,7 +521,7 @@ fn main() {
InlayHintLabelPart {
text: "Iterator",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
1,
),
@@ -533,7 +534,7 @@ fn main() {
InlayHintLabelPart {
text: "Item",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
1,
),
@@ -552,7 +553,7 @@ fn main() {
InlayHintLabelPart {
text: "MyIter",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),
@@ -600,7 +601,7 @@ fn main() {
InlayHintLabelPart {
text: "Struct",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),
@@ -619,7 +620,7 @@ fn main() {
InlayHintLabelPart {
text: "Struct",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),
@@ -638,7 +639,7 @@ fn main() {
InlayHintLabelPart {
text: "Struct",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),
@@ -656,7 +657,7 @@ fn main() {
InlayHintLabelPart {
text: "self",
linked_location: Some(
- FileRange {
+ FileRangeWrapper {
file_id: FileId(
0,
),