Move some stuff to cleanup AutoStubbable.swift

jimmya · Aug 1, 2023 · d77a2eb · d77a2eb
1 parent c55a6b6
commit d77a2eb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/Sources/Templates/AutoStubbable.swift b/Sources/Templates/AutoStubbable.swift
@@ -42,7 +42,7 @@ extension Type {
             return lines
         }
         lines.append(contentsOf: initMethodLines.joined(separator: [.emptyLine]))
-        
+
         if initMethods.isEmpty {
             lines.append("static func \(stubMethodName(index: 0, count: 1))(".addingIndent())
             let availableVariables = storedVariables.filter { !$0.hasDefaultValue }
@@ -67,18 +67,6 @@ extension Type {
 }
 
 // TODO: Move and improve this stuff
-extension Type {
-    var initMethods: [Method] {
-        methods.filter { ($0.isInitializer || $0.isFailableInitializer) && !$0.isConvenienceInitializer }
-    }
-}
-
-extension Variable {
-    var hasDefaultValue: Bool {
-        defaultValue != nil
-    }
-}
-
 func stubMethodName(index: Int, count: Int) -> String {
     count > 1 ? "stub\(index)" : "stub"
 }

diff --git a/Sources/Templates/Extensions/Type+Extension.swift b/Sources/Templates/Extensions/Type+Extension.swift
@@ -0,0 +1,7 @@
+import SourceryRuntime
+
+extension Type {
+    var initMethods: [Method] {
+        methods.filter { ($0.isInitializer || $0.isFailableInitializer) && !$0.isConvenienceInitializer }
+    }
+}
diff --git a/Sources/Templates/Extensions/Variable+Extension.swift b/Sources/Templates/Extensions/Variable+Extension.swift
@@ -1,6 +1,10 @@
 import SourceryRuntime
 
 extension Variable {
+    var hasDefaultValue: Bool {
+        defaultValue != nil
+    }
+
     func generateMock() -> String {
         isMutable ? generateMutableMock() : generateComputedMock()
     }

diff --git a/Sources/Templates/Imports.swifttemplate b/Sources/Templates/Imports.swifttemplate
@@ -5,5 +5,6 @@
 <%- includeFile("Extensions/MethodParameter+Extension.swift") -%>
 <%- includeFile("Extensions/Protocol+Extension.swift") -%>
 <%- includeFile("Extensions/String+Extension.swift") -%>
+<%- includeFile("Extensions/Type+Extension.swift") -%>
 <%- includeFile("Extensions/TypeName+Extension.swift") -%>
 <%- includeFile("Extensions/Variable+Extension.swift") -%>