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

Suppress extra indent after the end of dot chains

Browse source
This commit is contained in:
DropDemBits 2023-01-17 15:29:52 -05:00
parent 492b3deba7
commit 1c454736a4
No known key found for this signature in database
GPG key ID: D550F8DFBB392533
1 changed files with 70 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

40
editors/code/src/config.ts
View file

@ -86,11 +86,34 @@ export class Config {
* [1]: https://github.com/Microsoft/vscode/issues/11514#issuecomment-244707076 * [1]: https://github.com/Microsoft/vscode/issues/11514#issuecomment-244707076
*/ */
private configureLanguage() { private configureLanguage() {
if (this.typingContinueCommentsOnNewline && !this.configureLang) { if (this.configureLang) return;
let onEnterRules: vscode.OnEnterRule[] = [
{
// Carry indentation from the previous line
beforeText: /^\s*$/,
action: { indentAction: vscode.IndentAction.None },
},
{
// After the end of a function/field chain,
// with the semicolon on the same line
beforeText: /^\s+\..*;/,
action: { indentAction: vscode.IndentAction.Outdent },
},
{
// After the end of a function/field chain,
// with semicolon detached from the rest
beforeText: /^\s+;/,
previousLineText: /^\s+\..*/,
action: { indentAction: vscode.IndentAction.Outdent },
},
];
if (this.typingContinueCommentsOnNewline) {
const indentAction = vscode.IndentAction.None; const indentAction = vscode.IndentAction.None;
this.configureLang = vscode.languages.setLanguageConfiguration("rust", { onEnterRules = [
onEnterRules: [ ...onEnterRules,
{ {
// Doc single-line comment // Doc single-line comment
// e.g. ///| // e.g. ///|
@ -131,14 +154,13 @@ export class Config {
beforeText: /^(\ \ )*\ \*\/\s*$/, beforeText: /^(\ \ )*\ \*\/\s*$/,
action: { indentAction, removeText: 1 }, action: { indentAction, removeText: 1 },
}, },
], ];
}
this.configureLang = vscode.languages.setLanguageConfiguration("rust", {
onEnterRules,
}); });
} }
if (!this.typingContinueCommentsOnNewline && this.configureLang) {
this.configureLang.dispose();
this.configureLang = undefined;
}
}
// We don't do runtime config validation here for simplicity. More on stackoverflow: // We don't do runtime config validation here for simplicity. More on stackoverflow:
// https://stackoverflow.com/questions/60135780/what-is-the-best-way-to-type-check-the-configuration-for-vscode-extension // https://stackoverflow.com/questions/60135780/what-is-the-best-way-to-type-check-the-configuration-for-vscode-extension