Skip to content

Commit 167e675

Browse files
committed
Use set as filter arguments
1 parent 3adceb6 commit 167e675

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

Sources/CLI/Commands/Impact.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ extension XTree.Impact {
4141
inputPath: inputPath,
4242
names: names,
4343
filter: .init(
44-
roots: treeOptions.roots,
45-
contains: treeOptions.contains,
46-
except: treeOptions.except,
44+
roots: Set(treeOptions.roots),
45+
contains: Set(treeOptions.contains),
46+
except: Set(treeOptions.except),
4747
exceptIcons: [],
4848
maxHeight: treeOptions.maxHeight
4949
),

Sources/CLI/Commands/Print.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ extension XTree.Print {
3131
let tree = try await treeManager.print(
3232
inputPath: inputPath,
3333
filter: .init(
34-
roots: treeOptions.roots,
35-
contains: treeOptions.contains,
36-
except: treeOptions.except,
34+
roots: Set(treeOptions.roots),
35+
contains: Set(treeOptions.contains),
36+
except: Set(treeOptions.except),
3737
exceptIcons: [],
3838
maxHeight: treeOptions.maxHeight
3939
),

Sources/XTreeKit/Managers/ImpactManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ extension ImpactManager: IImpactManager {
6767
if affected.isEmpty { return nil }
6868

6969
var filter = filter
70-
filter.contains.append(contentsOf: affected)
70+
filter.contains.formUnion(affected)
7171
return try treeManager.print(nodesMap: nodesMap, filter: filter, sort: sort, needsCompress: false)
7272
}
7373
}

Sources/XTreeKit/Managers/TreeManager.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ import Fish
33
// MARK: - Interface
44

55
public struct TreeFilterOptions {
6-
public var roots: [String]
7-
public var contains: [String]
8-
public var except: [String]
6+
public var roots: Set<String>
7+
public var contains: Set<String>
8+
public var except: Set<String>
99
public var exceptIcons: Set<String>
1010
public var maxHeight: Int?
1111

1212
public init(
13-
roots: [String],
14-
contains: [String],
15-
except: [String],
13+
roots: Set<String>,
14+
contains: Set<String>,
15+
except: Set<String>,
1616
exceptIcons: Set<String>,
1717
maxHeight: Int? = nil
1818
) {

XTree/XTree/Modules/Main/MainView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ struct MainView: View {
6969
}
7070
}
7171

72-
private func formatFilters(_ filters: String) -> [String] {
73-
filters.components(separatedBy: ",").filter { !$0.isEmpty }
72+
private func formatFilters(_ filters: String) -> Set<String> {
73+
Set(filters.components(separatedBy: ",").filter { !$0.isEmpty })
7474
}
7575

7676
private func convertIcons(_ icons: [TreeNodeContent.Icon]?) -> [IconState] {

XTree/XTree/Modules/TreeView/TreeBuilder.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ final class TreeBuilder: ObservableObject {
2222
}
2323

2424
func build(
25-
roots: [String],
26-
contains: [String],
27-
except: [String],
25+
roots: Set<String>,
26+
contains: Set<String>,
27+
except: Set<String>,
2828
sorting: String,
2929
isCompressed: Bool,
3030
filterText: String,

0 commit comments

Comments
 (0)