foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 15:24:46 -05:00
Code Issues Packages 1 Wiki Activity

fix(lsp): correct parameterNames.suppressWhenArgumentMatchesName and variableTypes.suppressWhenTypeMatchesName (#16469)

Browse source 
Closes #16468
This commit is contained in:
David Sherret 2022-10-28 14:48:14 -04:00 committed by GitHub
parent d1d42e6ba7
commit 7c80f15020
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/lsp/config.rs
View file

@ -168,14 +168,14 @@ pub struct InlayHintsVarTypesOptions {
#[serde(default)]
pub enabled: bool,
#[serde(default = "is_true")]
pub suppress_when_argument_matches_name: bool,
pub suppress_when_type_matches_name: bool,
}
impl Default for InlayHintsVarTypesOptions {
fn default() -> Self {
Self {
enabled: false,
suppress_when_argument_matches_name: true,
suppress_when_type_matches_name: true,
}
}
}
@ -685,7 +685,7 @@ mod tests {
parameter_types: InlayHintsParamTypesOptions { enabled: false },
variable_types: InlayHintsVarTypesOptions {
enabled: false,
suppress_when_argument_matches_name: true
suppress_when_type_matches_name: true
},
property_declaration_types: InlayHintsPropDeclTypesOptions {
enabled: false

30
cli/lsp/tsc.rs
View file

@ -3009,7 +3009,7 @@ impl From<&config::WorkspaceSettings> for UserPreferences {
(&inlay_hints.parameter_names.enabled).into(),
),
include_inlay_parameter_name_hints_when_argument_matches_name: Some(
inlay_hints
!inlay_hints
.parameter_names
.suppress_when_argument_matches_name,
),
@ -3020,9 +3020,7 @@ impl From<&config::WorkspaceSettings> for UserPreferences {
inlay_hints.variable_types.enabled,
),
include_inlay_variable_type_hints_when_type_matches_name: Some(
inlay_hints
.variable_types
.suppress_when_argument_matches_name,
!inlay_hints.variable_types.suppress_when_type_matches_name,
),
include_inlay_property_declaration_type_hints: Some(
inlay_hints.property_declaration_types.enabled,
@ -3447,6 +3445,7 @@ mod tests {
use super::*;
use crate::http_cache::HttpCache;
use crate::http_util::HeadersMap;
use crate::lsp::config::WorkspaceSettings;
use crate::lsp::documents::Documents;
use crate::lsp::documents::LanguageId;
use crate::lsp::text::LineIndex;
@ -4306,4 +4305,27 @@ mod tests {
);
}
}
#[test]
fn include_supress_inlay_hit_settings() {
let mut settings = WorkspaceSettings::default();
settings
.inlay_hints
.parameter_names
.suppress_when_argument_matches_name = true;
settings
.inlay_hints
.variable_types
.suppress_when_type_matches_name = true;
let user_preferences: UserPreferences = (&settings).into();
assert_eq!(
user_preferences.include_inlay_variable_type_hints_when_type_matches_name,
Some(false)
);
assert_eq!(
user_preferences
.include_inlay_parameter_name_hints_when_argument_matches_name,
Some(false)
);
}
}