language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Do not add any new configuration parameters

Browse source
This commit is contained in:
Kirill Bulatov 2019-12-19 16:18:09 +02:00
parent 3969c7c853
commit 4fb25ef43b
8 changed files with 12 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

44
crates/ra_ide/src/inlay_hints.rs
View file

@ -160,7 +160,7 @@ mod tests {
use crate::mock_analysis::single_file;
#[test]
fn default_generic_types_disabled() {
fn default_generic_types_should_not_be_displayed() {
let (analysis, file_id) = single_file(
r#"
struct Test<K, T = u8> {
@ -173,7 +173,7 @@ fn main() {
}"#,
);
assert_debug_snapshot!(analysis.inlay_hints(file_id, None, false).unwrap(), @r###"
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
[
InlayHint {
range: [69; 71),
@ -185,32 +185,6 @@ fn main() {
);
}
#[test]
fn default_generic_types_enabled() {
let (analysis, file_id) = single_file(
r#"
struct Test<K, T = u8> {
k: K,
t: T,
}
fn main() {
let zz = Test { t: 23, k: 33 };
}"#,
);
assert_debug_snapshot!(analysis.inlay_hints(file_id, None, true).unwrap(), @r###"
[
InlayHint {
range: [69; 71),
kind: TypeHint,
label: "Test<i32, u8>",
},
]
"###
);
}
#[test]
fn let_statement() {
let (analysis, file_id) = single_file(
@ -251,7 +225,7 @@ fn main() {
}"#,
);
assert_debug_snapshot!(analysis.inlay_hints(file_id, None, true).unwrap(), @r###"
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
[
InlayHint {
range: [193; 197),
@ -325,7 +299,7 @@ fn main() {
}"#,
);
assert_debug_snapshot!(analysis.inlay_hints(file_id, None, true).unwrap(), @r###"
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
[
InlayHint {
range: [21; 30),
@ -354,7 +328,7 @@ fn main() {
}"#,
);
assert_debug_snapshot!(analysis.inlay_hints(file_id, None, true).unwrap(), @r###"
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
[
InlayHint {
range: [21; 30),
@ -402,7 +376,7 @@ fn main() {
}"#,
);
assert_debug_snapshot!(analysis.inlay_hints(file_id, None, true).unwrap(), @r###"
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
[
InlayHint {
range: [166; 170),
@ -465,7 +439,7 @@ fn main() {
}"#,
);
assert_debug_snapshot!(analysis.inlay_hints(file_id, None, true).unwrap(), @r###"
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
[
InlayHint {
range: [166; 170),
@ -528,7 +502,7 @@ fn main() {
}"#,
);
assert_debug_snapshot!(analysis.inlay_hints(file_id, None, true).unwrap(), @r###"
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
[
InlayHint {
range: [311; 315),
@ -570,7 +544,7 @@ fn main() {
}"#,
);
assert_debug_snapshot!(analysis.inlay_hints(file_id, Some(8), true).unwrap(), @r###"
assert_debug_snapshot!(analysis.inlay_hints(file_id, Some(8)).unwrap(), @r###"
[
InlayHint {
range: [74; 75),

7
crates/ra_ide/src/lib.rs
View file

@ -348,12 +348,9 @@ impl Analysis {
&self,
file_id: FileId,
max_inlay_hint_length: Option<usize>,
show_default_types_in_inlay_hints: bool,
) -> Cancelable<Vec<InlayHint>> {
let truncate_options = hir::TruncateOptions {
max_length: max_inlay_hint_length,
show_default_types: show_default_types_in_inlay_hints,
};
let truncate_options =
hir::TruncateOptions { max_length: max_inlay_hint_length, show_default_types: false };
self.with_db(|db| {
inlay_hints::inlay_hints(db, file_id, &db.parse(file_id).tree(), &truncate_options)
})