From c0a9df7f76d3d90ecf8cac71225936462356d4d5 Mon Sep 17 00:00:00 2001 From: Kaida Masaki Date: Mon, 15 Jul 2019 13:33:27 -0700 Subject: [PATCH] Update `decreaseIndentPattern` to match Atom Atom's [decrease regexp](https://github.com/atom/language-ruby/blob/d88a4cfb32876295ec5b090a2994957e62130f4a/settings/language-ruby.cson) handles cases like this: ``` @date = Date.today() @name = "Test Name" @data = { id: 8, foo: Foo.new( id: 1, phone_number: "412-555-7640" ), bar: Bar.new( id: 1, name: "Valentine", vin: "DF5S6HFG365HGDCVG", status: :AVAILABLE ), start_time: start_time.to_s, end_time: end_time.to_s, cost: 23.45, rating: 3, } ``` --- src/languageConfiguration.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languageConfiguration.ts b/src/languageConfiguration.ts index a826f317f..8281d63ef 100644 --- a/src/languageConfiguration.ts +++ b/src/languageConfiguration.ts @@ -1,7 +1,7 @@ const languageConfiguration = { indentationRules: { increaseIndentPattern: /^(\s*(module|class|((private|protected)\s+)?def|unless|if|else|elsif|case|when|begin|rescue|ensure|for|while|until|(?=.*?\b(do|begin|case|if|unless)\b)("(\\.|[^\\"])*"|'(\\.|[^\\'])*'|[^#"'])*(\s(do|begin|case)|[-+=&|*/~%^<>~]\s*(if|unless)))\b(?![^;]*;.*?\bend\b)|("(\\.|[^\\"])*"|'(\\.|[^\\'])*'|[^#"'])*(\((?![^\)]*\))|\{(?![^\}]*\})|\[(?![^\]]*\]))).*$/, - decreaseIndentPattern: /^\s*([}\]]([,)]?\s*(#|$)|\.[a-zA-Z_]\w*\b)|(end|rescue|ensure|else|elsif|when)\b)/, + decreaseIndentPattern: /^\s*([}\])](,?\s*(#|$)|\.[a-zA-Z_]\w*\b)|(end|rescue|ensure|else|elsif|when)\b)/, }, wordPattern: /(-?\d+(?:\.\d+))|([A-Za-z][^-`~@#%^&()=+[{}|;:'",<>/.*\]\s\\!?]*[!?]?)/, };