---

yaml
---
r: 319463
b: refs/heads/master-rebranch
c: 7a978d8
h: refs/heads/master
i:
  319461: 135831d
  319459: 22f86b8
  319455: c6ecd1f

Author: dcci

[refs]

@@ -1457,4 +1457,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 433f6bf5165a16213e37e95ab79b484f3195d074
+refs/heads/master-rebranch: 7a978d8f5e13928c56818da30446a4b3318e7e0a

branches/master-rebranch/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: "    }"

branches/master-rebranch/tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp

@@ -1904,10 +1904,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() {