Merge pull request #25042 from akyrtzi/5.1-sourcekitd-expose-indent-switch-option

Author: swift-ci

test/SourceKit/CodeFormat/indent-switch.swift

@@ -41,6 +41,19 @@ func foo3() {
         println("It's something else")
     }
 }
+
+func foo4() {
+    var test : Int = 1
+    switch test {
+        case 0:
+            print()
+        case 1:
+            break
+        default:
+            break
+    }
+}
+
 // RUN: %sourcekitd-test -req=format -line=3 -length=1 %s >%t.response
 // RUN: %sourcekitd-test -req=format -line=4 -length=1 %s >>%t.response
 // RUN: %sourcekitd-test -req=format -line=5 -length=1 %s >>%t.response
@@ -76,6 +89,15 @@ func foo3() {
 // RUN: %sourcekitd-test -req=format -line=41 -length=1 %s >>%t.response
 // RUN: %sourcekitd-test -req=format -line=42 -length=1 %s >>%t.response
 
+// RUN: %sourcekitd-test -req=format -req-opts=indent_switch_case=1 -line=47 -length=1 %s >>%t.response
+// RUN: %sourcekitd-test -req=format -req-opts=indent_switch_case=1 -line=48 -length=1 %s >>%t.response
+// RUN: %sourcekitd-test -req=format -req-opts=indent_switch_case=1 -line=49 -length=1 %s >>%t.response
+// RUN: %sourcekitd-test -req=format -req-opts=indent_switch_case=1 -line=50 -length=1 %s >>%t.response
+// RUN: %sourcekitd-test -req=format -req-opts=indent_switch_case=1 -line=51 -length=1 %s >>%t.response
+// RUN: %sourcekitd-test -req=format -req-opts=indent_switch_case=1 -line=52 -length=1 %s >>%t.response
+// RUN: %sourcekitd-test -req=format -req-opts=indent_switch_case=1 -line=53 -length=1 %s >>%t.response
+// RUN: %sourcekitd-test -req=format -req-opts=indent_switch_case=1 -line=54 -length=1 %s >>%t.response
+
 // RUN: %FileCheck --strict-whitespace %s <%t.response
 
 // CHECK: key.sourcetext: "    switch (test) {"
@@ -112,3 +134,12 @@ func foo3() {
 // CHECK: key.sourcetext: "    default:"
 // CHECK: key.sourcetext: "        println(\"It's something else\")"
 // CHECK: key.sourcetext: "    }"
+
+// CHECK: key.sourcetext: "    switch test {"
+// CHECK: key.sourcetext: "        case 0:"
+// CHECK: key.sourcetext: "            print()"
+// CHECK: key.sourcetext: "        case 1:"
+// CHECK: key.sourcetext: "            break"
+// CHECK: key.sourcetext: "        default:"
+// CHECK: key.sourcetext: "            break"
+// CHECK: key.sourcetext: "    }"

tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp

@@ -1887,10 +1887,12 @@ void SwiftEditorDocument::applyFormatOptions(OptionsDictionary &FmtOptions) {
   static UIdent KeyUseTabs("key.editor.format.usetabs");
   static UIdent KeyIndentWidth("key.editor.format.indentwidth");
   static UIdent KeyTabWidth("key.editor.format.tabwidth");
+  static UIdent KeyIndentSwitchCase("key.editor.format.indent_switch_case");
 
   FmtOptions.valueForOption(KeyUseTabs, Impl.FormatOptions.UseTabs);
   FmtOptions.valueForOption(KeyIndentWidth, Impl.FormatOptions.IndentWidth);
   FmtOptions.valueForOption(KeyTabWidth, Impl.FormatOptions.TabWidth);
+  FmtOptions.valueForOption(KeyIndentSwitchCase, Impl.FormatOptions.IndentSwitchCase);
 }
 
 const CodeFormatOptions &SwiftEditorDocument::getFormatOptions() {