Improved indentation rules for curly braces

alsolovyev · Jan 17, 2021 · e274746 · e274746
1 parent a94f9e8
commit e274746
Showing 1 changed file with 26 additions and 14 deletions.
diff --git a/Preferences/Indents.tmPreferences b/Preferences/Indents.tmPreferences
@@ -9,23 +9,35 @@
   <dict>
     <key>increaseIndentPattern</key>
     <string><![CDATA[(?x)
-        ^\s*+
-        {%-?
-        \s*+
-        \b(if|elif|else|for|asyncEach|asyncAll|macro|block|raw|verbatim|filter|call)\b
-        .*
-        -?%}
-        \s*$
+        (
+          ^.*\{\s*$
+        )
+        |
+        (
+          ^\s*+
+            {%-?
+            \s*+
+            \b(if|elif|else|for|asyncEach|asyncAll|macro|block|raw|verbatim|filter|call)\b
+            .*
+            -?%}
+          \s*$
+        )
     ]]></string>
     <key>decreaseIndentPattern</key>
     <string><![CDATA[(?x)
-        ^\s*+
-        {%-?
-        \s*+
-        \b(endif|endfor|endeach|endall|endmacro|endblock|endraw|endverbatim|endfilter|endcall)\b
-        .*
-        -?%}
-        \s*$
+        (
+          ^.*\}\s*$
+        )
+        |
+        (
+          ^\s*+
+          {%-?
+          \s*+
+          \b(endif|endfor|endeach|endall|endmacro|endblock|endraw|endverbatim|endfilter|endcall)\b
+          .*
+          -?%}
+          \s*$
+        )
     ]]></string>
   </dict>
 </dict>