Cleanup

uber · Apr 6, 2020 · e5496f5 · e5496f5
1 parent 2b2fe67
commit e5496f5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 77 deletions.
diff --git a/Sources/MockoloFramework/Parsers/ViaSwiftSyntax/ParserViaSwiftSyntax.swift b/Sources/MockoloFramework/Parsers/ViaSwiftSyntax/ParserViaSwiftSyntax.swift
@@ -78,7 +78,6 @@ public class ParserViaSwiftSyntax: SourceParsing {
             let ret = treeVisitor.entities
             results.append(contentsOf: ret)
             let imports = treeVisitor.imports
-            treeVisitor.reset()
 
             lock?.lock()
             defer {lock?.unlock()}

diff --git a/Sources/MockoloFramework/Parsers/ViaSwiftSyntax/SwiftSyntaxExtensions.swift b/Sources/MockoloFramework/Parsers/ViaSwiftSyntax/SwiftSyntaxExtensions.swift
@@ -639,12 +639,25 @@ final class EntityVisitor: SyntaxVisitor {
         return .visitChildren
     }
 
+    #if swift(>=5.2)
+    override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind {
+        return .skipChildren
+    }
+    #else
     func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind {
         return .skipChildren
     }
+    #endif
+
+    #if swift(>=5.2)
+    override func visit(_ node: EnumDeclSyntax) -> SyntaxVisitorContinueKind {
+        return .skipChildren
+    }
+    #else
     func visit(_ node: EnumDeclSyntax) -> SyntaxVisitorContinueKind {
         return .skipChildren
     }
+    #endif
 
 }
 

diff --git a/Sources/MockoloFramework/Templates/ClassTemplate.swift b/Sources/MockoloFramework/Templates/ClassTemplate.swift
@@ -82,7 +82,7 @@ extension ClassModel {
 
         let template = """
         \(attribute)
-        \(acl)class \(moduleDot)\(name): \(moduleDot)\(identifier) {
+        \(acl)class \(name): \(moduleDot)\(identifier) {
         \(body)
         }
         """

diff --git a/Tests/TestModuleNames/FixtureModuleOverrides.swift b/Tests/TestModuleNames/FixtureModuleOverrides.swift
@@ -12,8 +12,7 @@ protocol TaskRouting: BaseRouting {
 
 let moduleOverrideMock = """
 
-
-class Foo.TaskRoutingMock: Foo.TaskRouting {
+class TaskRoutingMock: Foo.TaskRouting {
     init() { }
     init(bar: String = "") {
         self.bar = bar

diff --git a/_layouts/default.html b/_layouts/default.html
diff --git a/install-script.sh b/install-script.sh
@@ -63,7 +63,7 @@ echo "DESTINATION DIR = ${DESTDIR}"
 echo "OUTPUT FILE = ${OUTFILE}"
 
 cd "$SRCDIR"
-#rm -rf .build
+rm -rf .build
 swift build -c release 
 
 cd .build/release