[Refactoring] SR-6051 Expansion of switch statement missing cases when cursor is placed on switch keyword

Author: Kacper20

include/swift/IDE/RefactoringKinds.def

@@ -34,6 +34,8 @@ CURSOR_REFACTORING(FillProtocolStub, "Add Missing Protocol Requirements", fillst
 
 CURSOR_REFACTORING(ExpandDefault, "Expand Default", expand.default)
 
+CURSOR_REFACTORING(ExpandSwitchCases, "Expand Switch Cases", expand.switch.cases)
+
 CURSOR_REFACTORING(LocalizeString, "Localize String", localize.string)
 
 CURSOR_REFACTORING(SimplifyNumberLiteral, "Simplify Long Number Literal", simplify.long.number.literal)

lib/IDE/Refactoring.cpp

@@ -0,0 +1,15 @@
+enum E {
+  case e1
+  case e2
+  case e3
+  case e4
+}
+
+func foo(e: E) -> Int {
+  switch e {
+ case .e1: <#code#>
+case .e2: <#code#>
+case .e3: <#code#>
+case .e4: <#code#>
+}
+}

test/refactoring/ExpandSwitchCases/Outputs/basic/L10.swift.expected

@@ -0,0 +1,16 @@
+enum E {
+  case e1
+  case e2
+  case e3
+  case e4
+}
+
+func foo(e: E) -> Int {
+  switch e {
+    case .e1: <#code#>
+case .e2: <#code#>
+case .e3: <#code#>
+case .e4: <#code#>
+ return 3
+   }
+}

test/refactoring/ExpandSwitchCases/Outputs/with_default/L10.swift.expected

@@ -0,0 +1,13 @@
+enum E {
+  case e1
+  case e2
+  case e3
+  case e4
+}
+
+func foo(e: E) -> Int {
+  switch e { }
+}
+// RUN: rm -rf %t.result && mkdir -p %t.result
+// RUN: %refactor -expand-switch-cases -source-filename %s -pos=9:8 >> %t.result/L10.swift
+// RUN: diff -u %S/Outputs/basic/L10.swift.expected %t.result/L10.swift

test/refactoring/ExpandSwitchCases/basic.swift

@@ -0,0 +1,13 @@
+enum E {
+  case e1
+  case e2
+  case e3
+  case e4
+}
+
+func foo(e: E) -> Int {
+  switch e { }
+}
+// RUN: rm -rf %t.result && mkdir -p %t.result
+// RUN: %refactor -expand-switch-cases -source-filename %s -pos=9:8 >> %t.result/L10.swift
+// RUN: diff -u %S/Outputs/partially_handled/L10.swift.expected %t.result/L10.swift

test/refactoring/ExpandSwitchCases/partially_handled.swift

@@ -0,0 +1,15 @@
+enum E {
+  case e1
+  case e2
+  case e3
+  case e4
+}
+
+func foo(e: E) -> Int {
+  switch e {
+    default: return 3
+   }
+}
+// RUN: rm -rf %t.result && mkdir -p %t.result
+// RUN: %refactor -expand-switch-cases -source-filename %s -pos=9:8 >> %t.result/L10.swift
+// RUN: diff -u %S/Outputs/with_default/L10.swift.expected %t.result/L10.swift

test/refactoring/ExpandSwitchCases/with_default.swift

@@ -216,6 +216,14 @@ func testForceTry() {
   func throwingFunc() throws -> Int { return 3 }
   let _ = try! throwingFunc()
 }
+
+func testSwitchExpand() {
+  enum AccountType {
+    case savings, checking
+  }
+  let account: AccountType = .savings
+  switch account { }
+}
 // RUN: %refactor -source-filename %s -pos=2:1 -end-pos=5:13 | %FileCheck %s -check-prefix=CHECK1
 // RUN: %refactor -source-filename %s -pos=3:1 -end-pos=5:13 | %FileCheck %s -check-prefix=CHECK1
 // RUN: %refactor -source-filename %s -pos=4:1 -end-pos=5:13 | %FileCheck %s -check-prefix=CHECK1
@@ -301,6 +309,9 @@ func testForceTry() {
 // RUN: %refactor -source-filename %s -pos=217:13 | %FileCheck %s -check-prefix=CHECK-TRY-CATCH
 // RUN: %refactor -source-filename %s -pos=217:14 | %FileCheck %s -check-prefix=CHECK-TRY-CATCH
 
+// RUN: %refactor -source-filename %s -pos=225:3 | %FileCheck %s -check-prefix=CHECK-EXPAND-SWITCH
+
+
 // CHECK1: Action begins
 // CHECK1-NEXT: Extract Method
 // CHECK1-NEXT: Action ends
@@ -342,3 +353,4 @@ func testForceTry() {
 
 // CHECK-TRY-CATCH: Convert To Do/Catch
 
+// CHECK-EXPAND-SWITCH: Expand Switch Cases

test/refactoring/RefactoringKind/basic.swift

@@ -36,6 +36,8 @@ Action(llvm::cl::desc("kind:"), llvm::cl::init(RefactoringKind::None),
                       "fill-stub", "Perform fill protocol stub refactoring"),
            clEnumValN(RefactoringKind::ExpandDefault,
                       "expand-default", "Perform expand default statement refactoring"),
+           clEnumValN(RefactoringKind::ExpandSwitchCases,
+                      "expand-switch-cases", "Perform switch cases expand refactoring"),
            clEnumValN(RefactoringKind::LocalizeString,
                       "localize-string", "Perform string localization refactoring"),
            clEnumValN(RefactoringKind::CollapseNestedIfExpr,