Simplified formatting rules: if list's first form is a symbol, indent 2, in other cases, indent to opening paren

Author: tonsky

CHANGELOG.md

@@ -3,6 +3,7 @@
 - Highlight namespace name as `entity.name`, same as defs
 - No exceptions on disconnect
 - Removed background on unused symbols inside quotes
+- Simplified formatting rules: if list's first form is a symbol, indent next line by +2 spaces, in all other cases, indent to opening paren (1 space)
 
 ### 4.1.1 - Sep 6, 2024
 

cs_indent.py

@@ -57,17 +57,10 @@ def indent(view, point, parsed = None):
         if node.name == 'string':
             return ('string', row, col)
         elif node.name == 'parens' or (node.name == 'error' and node.text == '('):
-            # no first form -- indent to paren 
-            if not first_form:
-                offset = 0
-            # first form is a list/map/vector -- indent to paren
-            elif first_form.end <= point and first_form.name in ['parens', 'braces', 'brackets']:
-                offset = 0
-            # form itself is a reader conditional
-            elif node.open and node.open.text in ['#?(', '#?@(']:
-                offset = 0
-            else:
+            if first_form and cs_parser.is_symbol(first_form):
                 offset = 1
+            else:
+                offset = 0
         return ('indent', row, col + offset)
 
 def newline_indent(view, point):

test_repl/indent.clj

@@ -34,12 +34,26 @@ body)
 
 {::key-1 v1
 :key-2 v2}
- 
+
+(1 2
+3 4)
+
+(ns abc
+(:require
+a b
+c))
+
 #{a b c
 d e f}
 
 #:ns{:key v}
 
+#?(:clj 1
+:cljs 2)
+
+#?@(:clj [1]
+:cljs [2])
+
 (abcdef abcde abcd abc ab a)
 
 (a ab abc abcd abcde abcdef)