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

Jump to bottom

Support SwiftSyntax 0.50200.0 #1

Closed
wants to merge 4 commits into from
Closed

Support SwiftSyntax 0.50200.0 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2c4685
Use SyntaxVisitor.walk
akkyie Mar 27, 2020
d036a53
Extend SyntaxProtocol instead of Syntax
akkyie Mar 27, 2020
a554faf
Use .as() for casting
akkyie Mar 27, 2020
ab6eec5
Add override as SyntaxVisitor is now a class
akkyie Mar 27, 2020
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
2 changes: 1 addition & 1 deletion Sources/MockoloFramework/Parsers/ViaSwiftSyntax/ParserViaSwiftSyntax.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public class ParserViaSwiftSyntax: SourceParsing {
do {
var results = [Entity]()
let node = try SyntaxParser.parse(path)
node.walk(&treeVisitor)
treeVisitor.walk(node)
let ret = treeVisitor.entities
for ent in ret {
ent.filepath = path
Expand Down
26 changes: 13 additions & 13 deletions Sources/MockoloFramework/Parsers/ViaSwiftSyntax/SwiftSyntaxExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ extension SyntaxParser {
}
}

extension Syntax {
extension SyntaxProtocol {
var offset: Int64 {
return Int64(self.position.utf8Offset)
}
Expand Down Expand Up @@ -146,40 +146,40 @@ extension MemberDeclListItemSyntax {
}

func transformToModel(with encloserAcl: String, declType: DeclType, metadata: AnnotationMetadata?, processed: Bool) -> (Model, String?, Bool)? {
if let varMember = self.decl as? VariableDeclSyntax {
if let varMember = self.decl.as(VariableDeclSyntax.self) {
if validateMember(varMember.modifiers, declType, processed: processed) {
let acl = memberAcl(varMember.modifiers, encloserAcl, declType)
if let item = varMember.models(with: acl, declType: declType, overrides: metadata?.varTypes, processed: processed).first {
return (item, varMember.attributes?.trimmedDescription, false)
}
}
} else if let funcMember = self.decl as? FunctionDeclSyntax {
} else if let funcMember = self.decl.as(FunctionDeclSyntax.self) {
if validateMember(funcMember.modifiers, declType, processed: processed) {
let acl = memberAcl(funcMember.modifiers, encloserAcl, declType)
let item = funcMember.model(with: acl, declType: declType, processed: processed)
return (item, funcMember.attributes?.trimmedDescription, false)
}
} else if let subscriptMember = self.decl as? SubscriptDeclSyntax {
} else if let subscriptMember = self.decl.as(SubscriptDeclSyntax.self) {
if validateMember(subscriptMember.modifiers, declType, processed: processed) {
let acl = memberAcl(subscriptMember.modifiers, encloserAcl, declType)
let item = subscriptMember.model(with: acl, declType: declType, processed: processed)
return (item, subscriptMember.attributes?.trimmedDescription, false)
}
} else if let initMember = self.decl as? InitializerDeclSyntax {
} else if let initMember = self.decl.as(InitializerDeclSyntax.self) {
if validateInit(initMember, declType, processed: processed) {
let acl = memberAcl(initMember.modifiers, encloserAcl, declType)
let item = initMember.model(with: acl, declType: declType, processed: processed)
return (item, initMember.attributes?.trimmedDescription, true)
}
} else if let patMember = self.decl as? AssociatedtypeDeclSyntax {
} else if let patMember = self.decl.as(AssociatedtypeDeclSyntax.self) {
let acl = memberAcl(patMember.modifiers, encloserAcl, declType)
let item = patMember.model(with: acl, declType: declType, overrides: metadata?.typeAliases, processed: processed)
return (item, patMember.attributes?.trimmedDescription, false)
} else if let taMember = self.decl as? TypealiasDeclSyntax {
} else if let taMember = self.decl.as(TypealiasDeclSyntax.self) {
let acl = memberAcl(taMember.modifiers, encloserAcl, declType)
let item = taMember.model(with: acl, declType: declType, overrides: metadata?.typeAliases, processed: processed)
return (item, taMember.attributes?.trimmedDescription, false)
} else if let ifMacroMember = self.decl as? IfConfigDeclSyntax {
} else if let ifMacroMember = self.decl.as(IfConfigDeclSyntax.self) {
let (item, attr, initFlag) = ifMacroMember.model(with: encloserAcl, declType: declType, metadata: metadata, processed: processed)
return (item, attr, initFlag)
}
Expand All @@ -191,7 +191,7 @@ extension MemberDeclListItemSyntax {
extension MemberDeclListSyntax {
var hasBlankInit: Bool {
for member in self {
if let varMember = member.decl as? VariableDeclSyntax {
if let varMember = member.decl.as(VariableDeclSyntax.self) {
for v in varMember.bindings {
if let name = v.pattern.firstToken?.text {
if name == String.hasBlankInit {
Expand Down Expand Up @@ -230,7 +230,7 @@ extension IfConfigDeclSyntax {

var name = ""
for cl in self.clauses {
if let desc = cl.condition?.description, let list = cl.elements as? MemberDeclListSyntax {
if let desc = cl.condition?.description, let list = cl.elements.as(MemberDeclListSyntax.self) {
name = desc

for element in list {
Expand Down Expand Up @@ -573,15 +573,15 @@ final class EntityVisitor: SyntaxVisitor {
imports = []
}

func visit(_ node: ProtocolDeclSyntax) -> SyntaxVisitorContinueKind {
override func visit(_ node: ProtocolDeclSyntax) -> SyntaxVisitorContinueKind {
let metadata = node.annotationMetadata(with: annotation)
if let ent = Entity.node(with: node, isPrivate: node.isPrivate, isFinal: false, metadata: metadata, processed: false) {
entities.append(ent)
}
return .skipChildren
}

func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind {
override func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind {
if node.name.hasSuffix("Mock") {
// this mock class node must be public else wouldn't have compiled before
if let ent = Entity.node(with: node, isPrivate: node.isPrivate, isFinal: false, metadata: nil, processed: true) {
Expand All @@ -596,7 +596,7 @@ final class EntityVisitor: SyntaxVisitor {
return .skipChildren
}

func visit(_ node: ImportDeclSyntax) -> SyntaxVisitorContinueKind {
override func visit(_ node: ImportDeclSyntax) -> SyntaxVisitorContinueKind {
if let ret = node.path.firstToken?.text {
let desc = node.importTok.text + " " + ret
imports.append(desc)
Expand Down