mirror of
https://github.com/rust-lang/rust-analyzer
synced 2025-01-13 13:48:50 +00:00
chore: deprecate typing.autoClosingAngleBrackets
configuration
Signed-off-by: Tarek <tareknaser360@gmail.com>
This commit is contained in:
parent
d6b701e251
commit
9aff46632e
5 changed files with 1 additions and 31 deletions
|
@ -410,16 +410,12 @@ impl Analysis {
|
||||||
&self,
|
&self,
|
||||||
position: FilePosition,
|
position: FilePosition,
|
||||||
char_typed: char,
|
char_typed: char,
|
||||||
autoclose: bool,
|
|
||||||
chars_to_exclude: Option<String>,
|
chars_to_exclude: Option<String>,
|
||||||
) -> Cancellable<Option<SourceChange>> {
|
) -> Cancellable<Option<SourceChange>> {
|
||||||
// Fast path to not even parse the file.
|
// Fast path to not even parse the file.
|
||||||
if !typing::TRIGGER_CHARS.contains(char_typed) {
|
if !typing::TRIGGER_CHARS.contains(char_typed) {
|
||||||
return Ok(None);
|
return Ok(None);
|
||||||
}
|
}
|
||||||
if char_typed == '<' && !autoclose {
|
|
||||||
return Ok(None);
|
|
||||||
}
|
|
||||||
if let Some(chars_to_exclude) = chars_to_exclude {
|
if let Some(chars_to_exclude) = chars_to_exclude {
|
||||||
if chars_to_exclude.contains(char_typed) {
|
if chars_to_exclude.contains(char_typed) {
|
||||||
return Ok(None);
|
return Ok(None);
|
||||||
|
|
|
@ -308,8 +308,6 @@ config_data! {
|
||||||
/// Show documentation.
|
/// Show documentation.
|
||||||
signatureInfo_documentation_enable: bool = true,
|
signatureInfo_documentation_enable: bool = true,
|
||||||
|
|
||||||
/// Whether to insert closing angle brackets when typing an opening angle bracket of a generic argument list.
|
|
||||||
typing_autoClosingAngleBrackets_enable: bool = false,
|
|
||||||
/// Specify the characters to exclude from triggering typing assists. The default trigger characters are `.`, `=`, `<`, `>`, `{`, and `(`. Setting this to a string will disable typing assists for the specified characters.
|
/// Specify the characters to exclude from triggering typing assists. The default trigger characters are `.`, `=`, `<`, `>`, `{`, and `(`. Setting this to a string will disable typing assists for the specified characters.
|
||||||
typing_excludeChars: Option<String> = None,
|
typing_excludeChars: Option<String> = None,
|
||||||
|
|
||||||
|
@ -2158,10 +2156,6 @@ impl Config {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn typing_autoclose_angle(&self) -> bool {
|
|
||||||
*self.typing_autoClosingAngleBrackets_enable()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn typing_exclude_chars(&self) -> Option<String> {
|
pub fn typing_exclude_chars(&self) -> Option<String> {
|
||||||
self.typing_excludeChars().clone()
|
self.typing_excludeChars().clone()
|
||||||
}
|
}
|
||||||
|
|
|
@ -461,12 +461,7 @@ pub(crate) fn handle_on_type_formatting(
|
||||||
}
|
}
|
||||||
let chars_to_exclude = snap.config.typing_exclude_chars();
|
let chars_to_exclude = snap.config.typing_exclude_chars();
|
||||||
|
|
||||||
let edit = snap.analysis.on_char_typed(
|
let edit = snap.analysis.on_char_typed(position, char_typed, chars_to_exclude)?;
|
||||||
position,
|
|
||||||
char_typed,
|
|
||||||
snap.config.typing_autoclose_angle(),
|
|
||||||
chars_to_exclude,
|
|
||||||
)?;
|
|
||||||
let edit = match edit {
|
let edit = match edit {
|
||||||
Some(it) => it,
|
Some(it) => it,
|
||||||
None => return Ok(None),
|
None => return Ok(None),
|
||||||
|
|
|
@ -992,11 +992,6 @@ Show full signature of the callable. Only shows parameters if disabled.
|
||||||
--
|
--
|
||||||
Show documentation.
|
Show documentation.
|
||||||
--
|
--
|
||||||
[[rust-analyzer.typing.autoClosingAngleBrackets.enable]]rust-analyzer.typing.autoClosingAngleBrackets.enable (default: `false`)::
|
|
||||||
+
|
|
||||||
--
|
|
||||||
Whether to insert closing angle brackets when typing an opening angle bracket of a generic argument list.
|
|
||||||
--
|
|
||||||
[[rust-analyzer.typing.excludeChars]]rust-analyzer.typing.excludeChars (default: `null`)::
|
[[rust-analyzer.typing.excludeChars]]rust-analyzer.typing.excludeChars (default: `null`)::
|
||||||
+
|
+
|
||||||
--
|
--
|
||||||
|
|
|
@ -2602,16 +2602,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"title": "typing",
|
|
||||||
"properties": {
|
|
||||||
"rust-analyzer.typing.autoClosingAngleBrackets.enable": {
|
|
||||||
"markdownDescription": "Whether to insert closing angle brackets when typing an opening angle bracket of a generic argument list.",
|
|
||||||
"default": false,
|
|
||||||
"type": "boolean"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"title": "typing",
|
"title": "typing",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|
Loading…
Reference in a new issue