bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Move check_expect and check_expect_clear_loc to `inlayhints::chaining`
Browse Source
Johann Hemmann 2024-01-04
parent 594e0a5 · commit 61b5521
Diffstat
-rw-r--r--crates/ide/src/inlay_hints.rs28
-rw-r--r--crates/ide/src/inlay_hints/chaining.rs35
2 files changed, 31 insertions, 32 deletions
diff --git a/crates/ide/src/inlay_hints.rs b/crates/ide/src/inlay_hints.rs
index 01ada25e1d..6d8d103205 100644
--- a/crates/ide/src/inlay_hints.rs
+++ b/crates/ide/src/inlay_hints.rs
@@ -593,7 +593,6 @@ mod tests {
use hir::ClosureStyle;
use itertools::Itertools;
use test_utils::extract_annotations;
- use text_edit::{TextRange, TextSize};
use crate::inlay_hints::{AdjustmentHints, AdjustmentHintsMode};
use crate::DiscriminantHints;
@@ -654,33 +653,6 @@ mod tests {
assert_eq!(expected, actual, "\nExpected:\n{expected:#?}\n\nActual:\n{actual:#?}");
}
- #[track_caller]
- pub(super) fn check_expect(config: InlayHintsConfig, ra_fixture: &str, expect: Expect) {
- let (analysis, file_id) = fixture::file(ra_fixture);
- let inlay_hints = analysis.inlay_hints(&config, file_id, None).unwrap();
- let filtered =
- inlay_hints.into_iter().map(|hint| (hint.range, hint.label)).collect::<Vec<_>>();
- expect.assert_debug_eq(&filtered)
- }
-
- #[track_caller]
- pub(super) fn check_expect_clear_loc(
- config: InlayHintsConfig,
- ra_fixture: &str,
- expect: Expect,
- ) {
- let (analysis, file_id) = fixture::file(ra_fixture);
- let mut inlay_hints = analysis.inlay_hints(&config, file_id, None).unwrap();
- inlay_hints.iter_mut().flat_map(|hint| &mut hint.label.parts).for_each(|hint| {
- if let Some(loc) = &mut hint.linked_location {
- loc.range = TextRange::empty(TextSize::from(0));
- }
- });
- let filtered =
- inlay_hints.into_iter().map(|hint| (hint.range, hint.label)).collect::<Vec<_>>();
- expect.assert_debug_eq(&filtered)
- }
-
/// Computes inlay hints for the fixture, applies all the provided text edits and then runs
/// expect test.
#[track_caller]
diff --git a/crates/ide/src/inlay_hints/chaining.rs b/crates/ide/src/inlay_hints/chaining.rs
index f14687fc9e..b6063978e9 100644
--- a/crates/ide/src/inlay_hints/chaining.rs
+++ b/crates/ide/src/inlay_hints/chaining.rs
@@ -75,12 +75,12 @@ pub(super) fn hints(
#[cfg(test)]
mod tests {
- use expect_test::expect;
+ use expect_test::{expect, Expect};
+ use text_edit::{TextRange, TextSize};
use crate::{
- inlay_hints::tests::{
- check_expect, check_expect_clear_loc, check_with_config, DISABLED_CONFIG, TEST_CONFIG,
- },
+ fixture,
+ inlay_hints::tests::{check_with_config, DISABLED_CONFIG, TEST_CONFIG},
InlayHintsConfig,
};
@@ -89,6 +89,33 @@ mod tests {
check_with_config(InlayHintsConfig { chaining_hints: true, ..DISABLED_CONFIG }, ra_fixture);
}
+ #[track_caller]
+ pub(super) fn check_expect(config: InlayHintsConfig, ra_fixture: &str, expect: Expect) {
+ let (analysis, file_id) = fixture::file(ra_fixture);
+ let inlay_hints = analysis.inlay_hints(&config, file_id, None).unwrap();
+ let filtered =
+ inlay_hints.into_iter().map(|hint| (hint.range, hint.label)).collect::<Vec<_>>();
+ expect.assert_debug_eq(&filtered)
+ }
+
+ #[track_caller]
+ pub(super) fn check_expect_clear_loc(
+ config: InlayHintsConfig,
+ ra_fixture: &str,
+ expect: Expect,
+ ) {
+ let (analysis, file_id) = fixture::file(ra_fixture);
+ let mut inlay_hints = analysis.inlay_hints(&config, file_id, None).unwrap();
+ inlay_hints.iter_mut().flat_map(|hint| &mut hint.label.parts).for_each(|hint| {
+ if let Some(loc) = &mut hint.linked_location {
+ loc.range = TextRange::empty(TextSize::from(0));
+ }
+ });
+ let filtered =
+ inlay_hints.into_iter().map(|hint| (hint.range, hint.label)).collect::<Vec<_>>();
+ expect.assert_debug_eq(&filtered)
+ }
+
#[test]
fn chaining_hints_ignore_comments() {
check_expect(