Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sort code generation related lists. #45

Merged
merged 1 commit into from
Mar 7, 2018
Merged

Sort code generation related lists. #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/DIGenKit/CodeGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ public final class CodeGenerator {
}

context = [
"moduleNames": imports.map { $0.moduleName },
"resolvers": resolvers,
"moduleNames": imports.map({ $0.moduleName }).sorted(by: <),
"resolvers": resolvers.sorted { (lhs, rhs) in return lhs.name < rhs.name },
]
}

Expand All @@ -64,7 +64,7 @@ public final class CodeGenerator {
{% endif %}{% endfor %}
{% for resolver in resolvers %}
extension {{ resolver.name }} {
{% for method in resolver.generatedMethods %}
{% for method in resolver.sortedGeneratedMethods %}
func {{ method.name }}({{ method.parametersDeclaration }}) -> {{ method.returnTypeName }} {
{% for line in method.bodyLines %}{{ line }}{% if not forloop.last %}
{% endif %}{% endfor %}
Expand Down
5 changes: 3 additions & 2 deletions Sources/DIGenKit/Generating/Resolver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ struct Resolver {

let resolveMethods: [ResolveMethod]
let injectMethods: [InjectMethod]
let generatedMethods: [GeneratedMethod]
let sortedGeneratedMethods: [GeneratedMethod]

init(type: Type, allTypes: [Type]) throws {
guard
Expand Down Expand Up @@ -149,6 +149,7 @@ struct Resolver {
}

injectMethods = nodesForInjectMethods.flatMap(InjectMethod.init(node:))
generatedMethods = resolveMethods as [GeneratedMethod] + injectMethods as [GeneratedMethod]
let generatedMethods = resolveMethods as [GeneratedMethod] + injectMethods as [GeneratedMethod]
sortedGeneratedMethods = generatedMethods.sorted { (lhs, rhs) in return lhs.name < rhs.name }
}
}
20 changes: 10 additions & 10 deletions Tests/DIGenKitTests/Example/ABCDTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,19 @@ final class ABCDTests: XCTestCase {
// Generated by dikitgen.
//

import XCTest
import DIGenKit
import DIKit
import XCTest

extension ABCDResolver {

func injectToE(_ e: E) -> Void {
let a = resolveA()
let c = resolveC()
let b = resolveB()
e.dependency = E.Dependency(ea: a, ec: c, eb: b)
}

func resolveA() -> A {
return A(dependency: .init())
}
Expand All @@ -74,21 +81,14 @@ final class ABCDTests: XCTestCase {
return B(dependency: .init(ba: a))
}

func resolveD() -> D {
return provideD()
}

func resolveC() -> C {
let a = resolveA()
let d = resolveD()
return C.makeInstance(dependency: .init(ca: a, cd: d))
}

func injectToE(_ e: E) -> Void {
let a = resolveA()
let c = resolveC()
let b = resolveB()
e.dependency = E.Dependency(ea: a, ec: c, eb: b)
func resolveD() -> D {
return provideD()
}

}
Expand Down
10 changes: 5 additions & 5 deletions Tests/DIGenKitTests/Example/AppTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,20 @@ final class AppTests: XCTestCase {
// Generated by dikitgen.
//

import XCTest
import DIGenKit
import DIKit
import XCTest

extension AppResolver {

func resolveAppResolver() -> AppResolver {
return provideAppResolver()
}

func resolveAPIClient() -> APIClient {
return provideAPIClient()
}

func resolveAppResolver() -> AppResolver {
return provideAppResolver()
}

func resolveDetailViewController(index: Int) -> DetailViewController {
let apiClient = resolveAPIClient()
return DetailViewController(dependency: .init(index: index, apiClient: apiClient))
Expand Down