Skip to content
This repository has been archived by the owner on Jun 1, 2023. It is now read-only.

Fix included symbols #309

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix included symbols #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a137fed
Generate: Fix which related types are included.
Lukas-Stuehrk Aug 27, 2021
ceb99a6
Diagram: Fix which types are included.
Lukas-Stuehrk Aug 27, 2021
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/SwiftDoc/Interface.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public final class Interface {
var superclasses = Set(CollectionOfOne(baseClass))

while !superclasses.isEmpty {
let subclasses = Set(superclasses.flatMap { typesInheriting(from: $0) }.filter { $0.isPublic })
let subclasses = Set(superclasses.flatMap { typesInheriting(from: $0) })
defer { superclasses = subclasses }
classClusters[baseClass, default: []].formUnion(subclasses)
}
Expand Down
6 changes: 3 additions & 3 deletions Sources/swift-doc/Subcommands/Diagram.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fileprivate func diagram(of module: Module, including symbolFilter: (Symbol) ->
for (baseClass, subclasses) in module.interface.classHierarchies {
var subgraph = Subgraph(id: "cluster_\(baseClass.id.description.replacingOccurrences(of: ".", with: "_"))")

for subclass in subclasses {
for subclass in subclasses.filter(symbolFilter) {
var subclassNode = Node("\(subclass.id)")
subclassNode.shape = .box

Expand All @@ -54,7 +54,7 @@ fileprivate func diagram(of module: Module, including symbolFilter: (Symbol) ->
}
}

if subclasses.count > 1 {
if subgraph.nodes.count > 1 {
graph.append(subgraph)
} else {
subgraph.nodes.forEach { graph.append($0) }
Expand All @@ -67,7 +67,7 @@ fileprivate func diagram(of module: Module, including symbolFilter: (Symbol) ->
let symbolNode = Node("\(symbol.id)")
graph.append(symbolNode)

for inherited in module.interface.typesConformed(by: symbol) {
for inherited in module.interface.typesConformed(by: symbol).filter(symbolFilter) {
let inheritedNode = Node("\(inherited.id.description)")
let edge = Edge(from: symbolNode, to: inheritedNode)

Expand Down
4 changes: 2 additions & 2 deletions Sources/swift-doc/Supporting Types/Components/Relationships.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct Relationships: Component {
init(of symbol: Symbol, in module: Module, baseURL: String, includingChildren symbolFilter: @escaping (Symbol) -> Bool) {
self.module = module
self.symbol = symbol
self.inheritedTypes = module.interface.typesInherited(by: symbol) + module.interface.typesConformed(by: symbol)
self.inheritedTypes = (module.interface.typesInherited(by: symbol) + module.interface.typesConformed(by: symbol)).filter(symbolFilter)
self.baseURL = baseURL
self.symbolFilter = symbolFilter
}
Expand Down Expand Up @@ -68,7 +68,7 @@ struct Relationships: Component {
("Subclasses", module.interface.typesInheriting(from: symbol)),
("Conforms To", module.interface.typesConformed(by: symbol)),
("Types Conforming to <code>\(softbreak(symbol.id.description))</code>", module.interface.typesConforming(to: symbol)),
].map { (title: $0.0, symbols: $0.1.filter { $0.isPublic }) }.filter { !$0.symbols.isEmpty }
].map { (title: $0.0, symbols: $0.1.filter(symbolFilter)) }.filter { !$0.symbols.isEmpty }
}

// MARK: - Component
Expand Down