Refactor MoveMembersToExtension

Sources/SwiftRefactor/MoveMembersToExtension.swift

@@ -0,0 +1,98 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2026 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#if compiler(>=6)
+public import SwiftSyntax
+#else
+import SwiftSyntax
+#endif
+
+public struct MoveMembersToExtension: SyntaxRefactoringProvider {
+
+  public struct Context {
+    public let range: Range<AbsolutePosition>
+
+    public init(range: Range<AbsolutePosition>) {
+      self.range = range
+    }
+  }
+
+  public static func refactor(syntax: SourceFileSyntax, in context: Context) throws -> SourceFileSyntax {
+
+    guard
+      let statement = syntax.statements.first(where: { $0.item.range.contains(context.range) }),
+      let decl = statement.item.asProtocol(NamedDeclSyntax.self),
+      let declGroup = statement.item.asProtocol(DeclGroupSyntax.self),
+      let index = syntax.statements.index(of: statement)
+    else {
+      throw RefactoringNotApplicableError("Type declaration not found")
+    }
+
+    let selectedMembers = declGroup.memberBlock.members.filter { context.range.contains($0.range) }
+
+    guard !selectedMembers.isEmpty else {
+      throw RefactoringNotApplicableError("No members to move")
+    }
+
+    for member in selectedMembers {
+      try validateMember(member)
+    }
+
+    let remainingMembers = declGroup.memberBlock.members.filter { !context.range.contains($0.range) }
+
+    let updatedMemberBlock = declGroup.memberBlock.with(\.members, remainingMembers)
+    let updatedDeclGroup = declGroup.with(\.memberBlock, updatedMemberBlock)
+    let updatedItem = statement.with(\.item, .decl(DeclSyntax(updatedDeclGroup)))
+
+    let extensionMemberBlockSyntax = declGroup.memberBlock.with(\.members, selectedMembers)
+
+    var declName = decl.name
+
+    // e.g, after `Outer<T>` trailing trivia is empty
+    if declName.trailingTrivia.isEmpty {
+      declName = declName.with(\.trailingTrivia, .space)
+    }
+
+    let extensionDecl = ExtensionDeclSyntax(
+      leadingTrivia: .newlines(2),
+      extendedType: IdentifierTypeSyntax(
+        leadingTrivia: .space,
+        name: declName
+      ),
+      memberBlock: extensionMemberBlockSyntax
+    )
+
+    var updatedStatements = syntax.statements
+    updatedStatements.remove(at: index)
+    updatedStatements.insert(updatedItem, at: index)
+    updatedStatements.insert(
+      CodeBlockItemSyntax(item: .decl(DeclSyntax(extensionDecl))),
+      at: syntax.statements.index(after: index)
+    )
+    return syntax.with(\.statements, updatedStatements)
+  }
+
+  private static func validateMember(_ member: MemberBlockItemSyntax) throws {
+
+    if member.decl.is(AccessorDeclSyntax.self) || member.decl.is(DeinitializerDeclSyntax.self)
+      || member.decl.is(EnumCaseDeclSyntax.self)
+    {
+      throw RefactoringNotApplicableError("Cannot move this type of declaration")
+    }
+
+    if let varDecl = member.decl.as(VariableDeclSyntax.self),
+      varDecl.bindings.contains(where: { $0.accessorBlock == nil || $0.initializer != nil })
+    {
+      throw RefactoringNotApplicableError("Cannot move stored properties to extension")
+    }
+  }
+}

Tests/SwiftRefactorTest/MoveMembersToExtensionTests.swift

@@ -0,0 +1,207 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2026 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import SwiftParser
+import SwiftRefactor
+import SwiftSyntax
+import SwiftSyntaxBuilder
+import XCTest
+import _SwiftSyntaxTestSupport
+
+final class MoveMembersToExtensionTests: XCTestCase {
+  func testMoveFunctionFromClass() throws {
+    let baseline: SourceFileSyntax = """
+      class Foo {
+        func foo() {
+          print("Hello world!")
+        }
+
+        func bar() {
+          print("Hello world!")
+        }
+      }
+      """
+
+    let expected: SourceFileSyntax = """
+      class Foo {
+
+        func bar() {
+          print("Hello world!")
+        }
+      }
+
+      extension Foo {
+        func foo() {
+          print("Hello world!")
+        }
+      }
+      """
+
+    let context = MoveMembersToExtension.Context(
+      range: AbsolutePosition(utf8Offset: 11)..<AbsolutePosition(utf8Offset: 56)
+    )
+    try assertRefactorConvert(baseline, expected: expected, context: context)
+  }
+
+  func testMoveFunctionFromClass2() throws {
+    let baseline: SourceFileSyntax = """
+      class Foo {
+        func foo() {
+          print("Hello world!")
+        }
+
+        func bar() {
+          print("Hello world!")
+        }
+      }
+
+      struct Bar {
+        func foo() {}
+      }
+      """
+
+    let expected: SourceFileSyntax = """
+      class Foo {
+
+        func bar() {
+          print("Hello world!")
+        }
+      }
+
+      extension Foo {
+        func foo() {
+          print("Hello world!")
+        }
+      }
+
+      struct Bar {
+        func foo() {}
+      }
+      """
+
+    let context = MoveMembersToExtension.Context(
+      range: AbsolutePosition(utf8Offset: 11)..<AbsolutePosition(utf8Offset: 56)
+    )
+    try assertRefactorConvert(baseline, expected: expected, context: context)
+  }
+
+  func testMoveNestedFromStruct() throws {
+    let baseline: SourceFileSyntax = """
+      struct Outer {
+        struct Inner {
+          func moveThis() {}
+        }
+      }
+      """
+
+    let expected: SourceFileSyntax = """
+      struct Outer {
+      }
+
+      extension Outer {
+        struct Inner {
+          func moveThis() {}
+        }
+      }
+      """
+
+    let context = MoveMembersToExtension.Context(
+      range: AbsolutePosition(utf8Offset: 14)..<AbsolutePosition(utf8Offset: 58)
+    )
+    try assertRefactorConvert(baseline, expected: expected, context: context)
+  }
+
+  func testMoveNestedFromStruct2() throws {
+    let baseline: SourceFileSyntax = """
+      struct Outer<T> {
+        struct Inner {
+          func moveThis() {}
+        }
+      }
+      """
+
+    let expected: SourceFileSyntax = """
+      struct Outer<T> {
+      }
+
+      extension Outer {
+        struct Inner {
+          func moveThis() {}
+        }
+      }
+      """
+
+    let context = MoveMembersToExtension.Context(
+      range: AbsolutePosition(utf8Offset: 17)..<AbsolutePosition(utf8Offset: 61)
+    )
+    try assertRefactorConvert(baseline, expected: expected, context: context)
+  }
+
+  func testMoveMembersFromEnum() throws {
+    let baseline: SourceFileSyntax = """
+      enum Foo {
+        func foo() {
+          print("Hello world!")
+        }
+
+        func bar() {
+          print("Hello world!")
+        }
+      }
+
+      struct Bar {
+        func foo() {}
+      }
+      """
+
+    let expected: SourceFileSyntax = """
+      enum Foo {
+
+        func bar() {
+          print("Hello world!")
+        }
+      }
+
+      extension Foo {
+        func foo() {
+          print("Hello world!")
+        }
+      }
+
+      struct Bar {
+        func foo() {}
+      }
+      """
+
+    let context = MoveMembersToExtension.Context(
+      range: AbsolutePosition(utf8Offset: 10)..<AbsolutePosition(utf8Offset: 55)
+    )
+    try assertRefactorConvert(baseline, expected: expected, context: context)
+  }
+}
+
+private func assertRefactorConvert(
+  _ callDecl: SourceFileSyntax,
+  expected: SourceFileSyntax?,
+  context: MoveMembersToExtension.Context,
+  file: StaticString = #filePath,
+  line: UInt = #line
+) throws {
+  try assertRefactor(
+    callDecl,
+    context: context,
+    provider: MoveMembersToExtension.self,
+    expected: expected,
+    file: file,
+    line: line
+  )
+}