Skip to content

Commit

Permalink
Avoid extra indentation on Go switches (#6817)
Browse files Browse the repository at this point in the history
Unlike other languages, in Go, switches themselves are not indented;
it's just each case body which is indented by one level:

   switch foo {
   case "bar":
      baz()
   }

As such, we shouldn't `@indent` for type_switch_statement nor
expression_switch_statement, as otherwise inserted lines show up as:

   switch foo {
      // inserted with "o"
   case "bar":
         // inserted with "o"
      baz()
   }

With the fix, the inserted lines are indented properly:

   switch foo {
   // inserted with "o"
   case "bar":
      // inserted with "o"
      baz()
   }

I also verified that indentation on selects similarly works well.

Thanks to Triton171 for helping with this fix.
  • Loading branch information
mvdan authored Apr 25, 2023
1 parent 096ed0c commit e7f25d8
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions runtime/queries/go/indents.scm
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
(argument_list)
(field_declaration_list)
(block)
(type_switch_statement)
(expression_switch_statement)
(var_declaration)
] @indent

Expand All @@ -24,5 +22,19 @@
")"
] @outdent

((_ "}" @outdent) @outer (#not-kind-eq? @outer "select_statement"))
(communication_case) @extend
; Switches and selects aren't indented, only their case bodies are.
; Outdent all closing braces except those closing switches or selects.
(
(_ "}" @outdent) @outer
(#not-kind-eq? @outer "select_statement")
(#not-kind-eq? @outer "type_switch_statement")
(#not-kind-eq? @outer "expression_switch_statement")
)

; Starting a line after a new case should indent.
[
(communication_case)
(expression_case)
(default_case)
(type_case)
] @extend

0 comments on commit e7f25d8

Please sign in to comment.