Auto merge of rust-lang#15227 - DropDemBits:indent-on-blank-line, r=lnicola

bors · bors · commit 09f666b51b84 · 2023-07-07T09:06:56.000Z
fix: Indent after pressing enter on a blank line Regressed after rust-lang/rust-analyzer#13975 (whoops).
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
@@ -99,7 +99,8 @@ export class Config {
         let onEnterRules: vscode.OnEnterRule[] = [
             {
                 // Carry indentation from the previous line
-                beforeText: /^\s*$/,
+                // if it's only whitespace
+                beforeText: /^\s+$/,
                 action: { indentAction: vscode.IndentAction.None },
             },
             {

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,8 @@ export class Config {`
`99`	`99`	`let onEnterRules: vscode.OnEnterRule[] = [`
`100`	`100`	`{`
`101`	`101`	`// Carry indentation from the previous line`
`102`		`- beforeText: /^\s*$/,`
	`102`	`+ // if it's only whitespace`
	`103`	`+ beforeText: /^\s+$/,`
`103`	`104`	`action: { indentAction: vscode.IndentAction.None },`
`104`	`105`	`},`
`105`	`106`	`{`