From 8748b56ec2c19f57a3f0c313e01f0730ab042bd1 Mon Sep 17 00:00:00 2001 From: Jared Wyatt Date: Tue, 21 Nov 2017 00:43:33 -0500 Subject: [PATCH] improve indentation * add private/protected keywords to increaseIndentPattern * remove when keyword from decreaseIndentPattern --- src/ruby.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ruby.ts b/src/ruby.ts index cb03de6fe..85146f2c3 100644 --- a/src/ruby.ts +++ b/src/ruby.ts @@ -15,8 +15,8 @@ export function activate(context: ExtensionContext) { // register language config vscode.languages.setLanguageConfiguration('ruby', { indentationRules: { - increaseIndentPattern: /^\s*((begin|class|def|else|elsif|ensure|for|if|module|rescue|unless|until|when|while)|(.*\sdo\b))\b[^\{;]*$/, - decreaseIndentPattern: /^\s*([}\]]([,)]?\s*(#|$)|\.[a-zA-Z_]\w*\b)|(end|rescue|ensure|else|elsif|when)\b)/ + increaseIndentPattern: /^\s*((begin|class|((private|protected)\s+)?def|else|elsif|ensure|for|if|module|rescue|unless|until|when|while)|(.*\sdo\b))\b[^\{;]*$/, + decreaseIndentPattern: /^\s*([}\]]([,)]?\s*(#|$)|\.[a-zA-Z_]\w*\b)|(end|rescue|ensure|else|elsif)\b)/ }, wordPattern: /(-?\d+(?:\.\d+))|(:?[A-Za-z][^-`~@#%^&()=+[{}|;:'",<>/.*\]\s\\!?]*[!?]?)/ });