Skip to content

Don't expose SyntaxKind from IDE API #6930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 18, 2020
Merged

Don't expose SyntaxKind from IDE API #6930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2465fa0
Cleaup imports
matklad Dec 17, 2020
55ba353
Don't expose SyntaxKind from IDE API
matklad Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions crates/ide/src/call_hierarchy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ fn caller() {
call<|>ee();
}
"#,
"callee FN FileId(0) 0..14 3..9",
&["caller FN FileId(0) 15..44 18..24 : [33..39]"],
"callee Function FileId(0) 0..14 3..9",
&["caller Function FileId(0) 15..44 18..24 : [33..39]"],
&[],
);
}
Expand All @@ -197,8 +197,8 @@ fn caller() {
callee();
}
"#,
"callee FN FileId(0) 0..14 3..9",
&["caller FN FileId(0) 15..44 18..24 : [33..39]"],
"callee Function FileId(0) 0..14 3..9",
&["caller Function FileId(0) 15..44 18..24 : [33..39]"],
&[],
);
}
Expand All @@ -214,8 +214,8 @@ fn caller() {
callee();
}
"#,
"callee FN FileId(0) 0..14 3..9",
&["caller FN FileId(0) 15..58 18..24 : [33..39, 47..53]"],
"callee Function FileId(0) 0..14 3..9",
&["caller Function FileId(0) 15..58 18..24 : [33..39, 47..53]"],
&[],
);
}
Expand All @@ -234,10 +234,10 @@ fn caller2() {
callee();
}
"#,
"callee FN FileId(0) 0..14 3..9",
"callee Function FileId(0) 0..14 3..9",
&[
"caller1 FN FileId(0) 15..45 18..25 : [34..40]",
"caller2 FN FileId(0) 47..77 50..57 : [66..72]",
"caller1 Function FileId(0) 15..45 18..25 : [34..40]",
"caller2 Function FileId(0) 47..77 50..57 : [66..72]",
],
&[],
);
Expand All @@ -263,10 +263,10 @@ mod tests {
}
}
"#,
"callee FN FileId(0) 0..14 3..9",
"callee Function FileId(0) 0..14 3..9",
&[
"caller1 FN FileId(0) 15..45 18..25 : [34..40]",
"test_caller FN FileId(0) 95..149 110..121 : [134..140]",
"caller1 Function FileId(0) 15..45 18..25 : [34..40]",
"test_caller Function FileId(0) 95..149 110..121 : [134..140]",
],
&[],
);
Expand All @@ -287,8 +287,8 @@ fn caller() {
//- /foo/mod.rs
pub fn callee() {}
"#,
"callee FN FileId(1) 0..18 7..13",
&["caller FN FileId(0) 27..56 30..36 : [45..51]"],
"callee Function FileId(1) 0..18 7..13",
&["caller Function FileId(0) 27..56 30..36 : [45..51]"],
&[],
);
}
Expand All @@ -304,9 +304,9 @@ fn call<|>er() {
callee();
}
"#,
"caller FN FileId(0) 15..58 18..24",
"caller Function FileId(0) 15..58 18..24",
&[],
&["callee FN FileId(0) 0..14 3..9 : [33..39, 47..53]"],
&["callee Function FileId(0) 0..14 3..9 : [33..39, 47..53]"],
);
}

Expand All @@ -325,9 +325,9 @@ fn call<|>er() {
//- /foo/mod.rs
pub fn callee() {}
"#,
"caller FN FileId(0) 27..56 30..36",
"caller Function FileId(0) 27..56 30..36",
&[],
&["callee FN FileId(1) 0..18 7..13 : [45..51]"],
&["callee Function FileId(1) 0..18 7..13 : [45..51]"],
);
}

Expand All @@ -348,9 +348,9 @@ fn caller3() {

}
"#,
"caller2 FN FileId(0) 33..64 36..43",
&["caller1 FN FileId(0) 0..31 3..10 : [19..26]"],
&["caller3 FN FileId(0) 66..83 69..76 : [52..59]"],
"caller2 Function FileId(0) 33..64 36..43",
&["caller1 Function FileId(0) 0..31 3..10 : [19..26]"],
&["caller3 Function FileId(0) 66..83 69..76 : [52..59]"],
);
}

Expand All @@ -368,9 +368,9 @@ fn main() {
a<|>()
}
"#,
"a FN FileId(0) 0..18 3..4",
&["main FN FileId(0) 31..52 34..38 : [47..48]"],
&["b FN FileId(0) 20..29 23..24 : [13..14]"],
"a Function FileId(0) 0..18 3..4",
&["main Function FileId(0) 31..52 34..38 : [47..48]"],
&["b Function FileId(0) 20..29 23..24 : [13..14]"],
);

check_hierarchy(
Expand All @@ -385,8 +385,8 @@ fn main() {
a()
}
"#,
"b FN FileId(0) 20..29 23..24",
&["a FN FileId(0) 0..18 3..4 : [13..14]"],
"b Function FileId(0) 20..29 23..24",
&["a Function FileId(0) 0..18 3..4 : [13..14]"],
&[],
);
}
Expand Down
3 changes: 1 addition & 2 deletions crates/ide/src/display.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
//! This module contains utilities for turning SyntaxNodes and HIR types
//! into types that may be used to render in a UI.

mod navigation_target;
pub(crate) mod navigation_target;
mod short_label;

pub use navigation_target::NavigationTarget;
pub(crate) use navigation_target::{ToNav, TryToNav};
pub(crate) use short_label::ShortLabel;

Expand Down
Loading