Fix auto-indent regex rules (microsoft#562)

Mikhail Arkhipov · web-flow · commit fb99423a3291 · 2018-01-10T10:20:20.000-08:00
* Basic tokenizer * Fixed property names * Tests, round I * Tests, round II * tokenizer test * Remove temorary change * Fix merge issue * Merge conflict * Merge conflict * Completion test * Fix last line * Fix javascript math * Make test await for results * Add license headers * Rename definitions to types * License headers * Fix typo in completion details (typo) * Fix hover test * Russian translations * Update to better translation * Fix typo * microsoft#70 How to get all parameter info when filling in a function param list * Fix microsoft#70 How to get all parameter info when filling in a function param list * Clean up * Clean imports * CR feedback * Trim whitespace for test stability * More tests * Better handle no-parameters documentation * Better handle ellipsis and Python3 * microsoft#385 Auto-Indentation doesn't work after comment * microsoft#141 Auto indentation broken when return keyword involved * Undo changes
diff --git a/src/client/extension.ts b/src/client/extension.ts
@@ -121,16 +121,17 @@ export async function activate(context: vscode.ExtensionContext) {
     vscode.languages.setLanguageConfiguration(PYTHON.language!, {
         onEnterRules: [
             {
-                beforeText: /^\s*(?:def|class|for|if|elif|else|while|try|with|finally|except|async).*?:\s*$/,
+                beforeText: /^\s*(?:def|class|for|if|elif|else|while|try|with|finally|except|async)\b.*/,
                 action: { indentAction: vscode.IndentAction.Indent }
             },
             {
-                beforeText: /^ *#.*$/,
+                beforeText: /^\s*#.*/,
                 afterText: /.+$/,
                 action: { indentAction: vscode.IndentAction.None, appendText: '# ' }
             },
             {
-                beforeText: /^\s+(continue|break|return)\b.*$/,
+                beforeText: /^\s+(continue|break|return)\b.*/,
+                afterText: /\s+$/,
                 action: { indentAction: vscode.IndentAction.Outdent }
             }
         ]

Original file line number	Diff line number	Diff line change
`@@ -121,16 +121,17 @@ export async function activate(context: vscode.ExtensionContext) {`
`121`	`121`	`vscode.languages.setLanguageConfiguration(PYTHON.language!, {`
`122`	`122`	`onEnterRules: [`
`123`	`123`	`{`
`124`		`- beforeText: /^\s(?:def\|class\|for\|if\|elif\|else\|while\|try\|with\|finally\|except\|async).?:\s*$/,`
	`124`	`+ beforeText: /^\s(?:def\|class\|for\|if\|elif\|else\|while\|try\|with\|finally\|except\|async)\b./,`
`125`	`125`	`action: { indentAction: vscode.IndentAction.Indent }`
`126`	`126`	`},`
`127`	`127`	`{`
`128`		`- beforeText: /^ #.$/,`
	`128`	`+ beforeText: /^\s#./,`
`129`	`129`	`afterText: /.+$/,`
`130`	`130`	`action: { indentAction: vscode.IndentAction.None, appendText: '# ' }`
`131`	`131`	`},`
`132`	`132`	`{`
`133`		`- beforeText: /^\s+(continue\|break\|return)\b.*$/,`
	`133`	`+ beforeText: /^\s+(continue\|break\|return)\b.*/,`
	`134`	`+ afterText: /\s+$/,`
`134`	`135`	`action: { indentAction: vscode.IndentAction.Outdent }`
`135`	`136`	`}`
`136`	`137`	`]`