Skip to content

Commit e010354

Browse files
matthijseikelenboommatthijseikelenboom
committed
Applying the naming of CEWorkspaceFile + Manager to every file
1 parent 3e3f8e4 commit e010354

34 files changed

+672
-660
lines changed

‎CodeEdit.xcodeproj/project.pbxproj

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
285FEC7027FE4B9800E57D53 /* OutlineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 285FEC6F27FE4B9800E57D53 /* OutlineTableViewCell.swift */; };
6060
286471AB27ED51FD0039369D /* ProjectNavigatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 286471AA27ED51FD0039369D /* ProjectNavigatorView.swift */; };
6161
287776E927E34BC700D46668 /* TabBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 287776E827E34BC700D46668 /* TabBarView.swift */; };
62-
287776EF27E3515300D46668 /* TabBarItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 287776EE27E3515300D46668 /* TabBarItemView.swift */; };
6362
2897E1C72979A29200741E32 /* OffsettableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2897E1C62979A29200741E32 /* OffsettableScrollView.swift */; };
6463
28A51001281673530087B0CC /* codeedit-xcode-dark.json in Resources */ = {isa = PBXBuildFile; fileRef = 28A50FFF281673530087B0CC /* codeedit-xcode-dark.json */; };
6564
28A51002281673530087B0CC /* codeedit-xcode-light.json in Resources */ = {isa = PBXBuildFile; fileRef = 28A51000281673530087B0CC /* codeedit-xcode-light.json */; };
@@ -97,7 +96,7 @@
9796
583E529729361B39001AB554 /* testEffectViewDark.1.png in Resources */ = {isa = PBXBuildFile; fileRef = 583E528329361B39001AB554 /* testEffectViewDark.1.png */; };
9897
583E529829361B39001AB554 /* testBranchPickerLight.1.png in Resources */ = {isa = PBXBuildFile; fileRef = 583E528429361B39001AB554 /* testBranchPickerLight.1.png */; };
9998
583E529C29361BAB001AB554 /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 583E529B29361BAB001AB554 /* SnapshotTesting */; };
100-
58710159298EB80000951BA4 /* FileSystemClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58710158298EB80000951BA4 /* FileSystemClient.swift */; };
99+
58710159298EB80000951BA4 /* CEWorkspaceFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58710158298EB80000951BA4 /* CEWorkspaceFileManager.swift */; };
101100
5878DA82291863F900DD95A3 /* AcknowledgementsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878DA81291863F900DD95A3 /* AcknowledgementsView.swift */; };
102101
5878DA842918642000DD95A3 /* ParsePackagesResolved.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878DA832918642000DD95A3 /* ParsePackagesResolved.swift */; };
103102
5878DA872918642F00DD95A3 /* AcknowledgementsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878DA862918642F00DD95A3 /* AcknowledgementsViewModel.swift */; };
@@ -238,8 +237,8 @@
238237
58822532292C280D00E83CDE /* StatusBarViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5882251C292C280D00E83CDE /* StatusBarViewModel.swift */; };
239238
58822533292C280D00E83CDE /* StatusBarTabType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5882251D292C280D00E83CDE /* StatusBarTabType.swift */; };
240239
58822534292C280D00E83CDE /* CursorLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5882251E292C280D00E83CDE /* CursorLocation.swift */; };
241-
588847632992A2A200996D95 /* FileSystemItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 588847622992A2A200996D95 /* FileSystemItem.swift */; };
242-
588847692992ABCA00996D95 /* Array+FileSystem.FileItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 588847682992ABCA00996D95 /* Array+FileSystem.FileItem.swift */; };
240+
588847632992A2A200996D95 /* CEWorkspaceFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 588847622992A2A200996D95 /* CEWorkspaceFile.swift */; };
241+
588847692992ABCA00996D95 /* Array+CEWorkspaceFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 588847682992ABCA00996D95 /* Array+CEWorkspaceFile.swift */; };
243242
58A5DF7D2931787A00D1BD5D /* ShellClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58A5DF7C2931787A00D1BD5D /* ShellClient.swift */; };
244243
58A5DF8029325B5A00D1BD5D /* GitClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58A5DF7F29325B5A00D1BD5D /* GitClient.swift */; };
245244
58A5DFA229339F6400D1BD5D /* KeybindingManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58A5DF9E29339F6400D1BD5D /* KeybindingManager.swift */; };
@@ -465,7 +464,6 @@
465464
286471AA27ED51FD0039369D /* ProjectNavigatorView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = ProjectNavigatorView.swift; sourceTree = "<group>"; tabWidth = 4; };
466465
287776E627E3413200D46668 /* NavigatorSidebarView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = NavigatorSidebarView.swift; sourceTree = "<group>"; tabWidth = 4; };
467466
287776E827E34BC700D46668 /* TabBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarView.swift; sourceTree = "<group>"; };
468-
287776EE27E3515300D46668 /* TabBarItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarItemView.swift; sourceTree = "<group>"; };
469467
2897E1C62979A29200741E32 /* OffsettableScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OffsettableScrollView.swift; sourceTree = "<group>"; };
470468
28A50FFF281673530087B0CC /* codeedit-xcode-dark.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "codeedit-xcode-dark.json"; sourceTree = "<group>"; };
471469
28A51000281673530087B0CC /* codeedit-xcode-light.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "codeedit-xcode-light.json"; sourceTree = "<group>"; };
@@ -504,7 +502,7 @@
504502
583E528329361B39001AB554 /* testEffectViewDark.1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = testEffectViewDark.1.png; sourceTree = "<group>"; };
505503
583E528429361B39001AB554 /* testBranchPickerLight.1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = testBranchPickerLight.1.png; sourceTree = "<group>"; };
506504
583E52A129361BFD001AB554 /* CodeEditUITests-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CodeEditUITests-Bridging-Header.h"; sourceTree = "<group>"; };
507-
58710158298EB80000951BA4 /* FileSystemClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileSystemClient.swift; sourceTree = "<group>"; };
505+
58710158298EB80000951BA4 /* CEWorkspaceFileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CEWorkspaceFileManager.swift; sourceTree = "<group>"; };
508506
5878DA81291863F900DD95A3 /* AcknowledgementsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AcknowledgementsView.swift; sourceTree = "<group>"; };
509507
5878DA832918642000DD95A3 /* ParsePackagesResolved.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParsePackagesResolved.swift; sourceTree = "<group>"; };
510508
5878DA862918642F00DD95A3 /* AcknowledgementsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AcknowledgementsViewModel.swift; sourceTree = "<group>"; };
@@ -642,8 +640,8 @@
642640
5882251C292C280D00E83CDE /* StatusBarViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusBarViewModel.swift; sourceTree = "<group>"; };
643641
5882251D292C280D00E83CDE /* StatusBarTabType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusBarTabType.swift; sourceTree = "<group>"; };
644642
5882251E292C280D00E83CDE /* CursorLocation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CursorLocation.swift; sourceTree = "<group>"; };
645-
588847622992A2A200996D95 /* FileSystemItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileSystemItem.swift; sourceTree = "<group>"; };
646-
588847682992ABCA00996D95 /* Array+FileSystem.FileItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+FileSystem.FileItem.swift"; sourceTree = "<group>"; };
643+
588847622992A2A200996D95 /* CEWorkspaceFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CEWorkspaceFile.swift; sourceTree = "<group>"; };
644+
588847682992ABCA00996D95 /* Array+CEWorkspaceFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+CEWorkspaceFile.swift"; sourceTree = "<group>"; };
647645
589F3E342936185400E1A4DA /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
648646
58A5DF7C2931787A00D1BD5D /* ShellClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShellClient.swift; sourceTree = "<group>"; };
649647
58A5DF7F29325B5A00D1BD5D /* GitClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GitClient.swift; sourceTree = "<group>"; };
@@ -1836,8 +1834,8 @@
18361834
588847652992A35800996D95 /* Models */ = {
18371835
isa = PBXGroup;
18381836
children = (
1839-
588847622992A2A200996D95 /* FileSystemItem.swift */,
1840-
58710158298EB80000951BA4 /* FileSystemClient.swift */,
1837+
588847622992A2A200996D95 /* CEWorkspaceFile.swift */,
1838+
58710158298EB80000951BA4 /* CEWorkspaceFileManager.swift */,
18411839
);
18421840
path = Models;
18431841
sourceTree = "<group>";
@@ -1852,7 +1850,7 @@
18521850
588847672992AAB800996D95 /* Array */ = {
18531851
isa = PBXGroup;
18541852
children = (
1855-
588847682992ABCA00996D95 /* Array+FileSystem.FileItem.swift */,
1853+
588847682992ABCA00996D95 /* Array+CEWorkspaceFile.swift */,
18561854
);
18571855
path = Array;
18581856
sourceTree = "<group>";
@@ -1880,7 +1878,6 @@
18801878
isa = PBXGroup;
18811879
children = (
18821880
287776E827E34BC700D46668 /* TabBarView.swift */,
1883-
287776EE27E3515300D46668 /* TabBarItemView.swift */,
18841881
B6C6A429297716A500A3D28F /* TabBarItemCloseButton.swift */,
18851882
6CDA84AC284C1BA000C1CC3A /* TabBarContextMenu.swift */,
18861883
B6C6A42D29771A8D00A3D28F /* TabBarItemButtonStyle.swift */,
@@ -2792,7 +2789,7 @@
27922789
587B9E6729301D8F00AC7927 /* GitLabEventData.swift in Sources */,
27932790
5882252F292C280D00E83CDE /* StatusBarClearButton.swift in Sources */,
27942791
58F2EB04292FB2B0004A9BDE /* SourceControlPreferences.swift in Sources */,
2795-
58710159298EB80000951BA4 /* FileSystemClient.swift in Sources */,
2792+
58710159298EB80000951BA4 /* CEWorkspaceFileManager.swift in Sources */,
27962793
582213F0291834A500EFE361 /* AboutView.swift in Sources */,
27972794
58F2EB12292FB2B0004A9BDE /* PreferencesPlaceholderView.swift in Sources */,
27982795
6CC9E4B229B5669900C97388 /* Environment+ActiveTabGroup.swift in Sources */,
@@ -2851,7 +2848,6 @@
28512848
58F2EAF1292FB2B0004A9BDE /* TerminalThemeView.swift in Sources */,
28522849
04C3254B27FF23B000C8DA2D /* ExtensionNavigatorData.swift in Sources */,
28532850
58798261292EC4080085B254 /* ExtensionsManager.swift in Sources */,
2854-
287776EF27E3515300D46668 /* TabBarItemView.swift in Sources */,
28552851
2806E9022979588B000040F4 /* Contributor.swift in Sources */,
28562852
58D01C98293167DC00C5B6B4 /* String+RemoveOccurrences.swift in Sources */,
28572853
5878DAA8291AE76700DD95A3 /* QuickOpenItem.swift in Sources */,
@@ -2877,7 +2873,7 @@
28772873
587B9E7629301D8F00AC7927 /* GitTime.swift in Sources */,
28782874
2072FA16280D83A500C7F8D4 /* FileTypeList.swift in Sources */,
28792875
587B9E5D29301D8F00AC7927 /* GitLabUserRouter.swift in Sources */,
2880-
588847692992ABCA00996D95 /* Array+FileSystem.FileItem.swift in Sources */,
2876+
588847692992ABCA00996D95 /* Array+CEWorkspaceFile.swift in Sources */,
28812877
04C3254F2800AA4700C8DA2D /* ExtensionInstallationView.swift in Sources */,
28822878
58822530292C280D00E83CDE /* FilterTextField.swift in Sources */,
28832879
58798266292EC4080085B254 /* APIResponse.swift in Sources */,
@@ -2942,7 +2938,7 @@
29422938
58798263292EC4080085B254 /* DownloadedPlugin.swift in Sources */,
29432939
587B9E6029301D8F00AC7927 /* GitLabOAuthRouter.swift in Sources */,
29442940
6C05A8AF284D0CA3007F4EAA /* WorkspaceDocument+Listeners.swift in Sources */,
2945-
588847632992A2A200996D95 /* FileSystemItem.swift in Sources */,
2941+
588847632992A2A200996D95 /* CEWorkspaceFile.swift in Sources */,
29462942
587D9B732933BF5700BF7490 /* FileIcon.swift in Sources */,
29472943
58F2EAF9292FB2B0004A9BDE /* AccountSelectionDialog.swift in Sources */,
29482944
6C2C155D29B4F4E500EA60A5 /* SplitViewReader.swift in Sources */,

‎CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import CodeEditSymbols
1010

1111
/// A view that pops up a branch picker.
1212
struct ToolbarBranchPicker: View {
13-
private var workspace: WorkspaceClient?
13+
private var workspaceFileManager: CEWorkspaceFileManager?
1414
private var gitClient: GitClient?
1515

1616
@Environment(\.controlActiveState)
@@ -30,10 +30,10 @@ struct ToolbarBranchPicker: View {
3030
/// - Parameter workspace: An instance of the current `WorkspaceClient`
3131
init(
3232
shellClient: ShellClient,
33-
workspace: WorkspaceClient?
33+
workspaceFileManager: CEWorkspaceFileManager?
3434
) {
35-
self.workspace = workspace
36-
if let folderURL = workspace?.folderURL() {
35+
self.workspaceFileManager = workspaceFileManager
36+
if let folderURL = workspaceFileManager?.folderUrl {
3737
self.gitClient = GitClient(directoryURL: folderURL, shellClient: shellClient)
3838
}
3939
self._currentBranch = State(initialValue: try? gitClient?.getCurrentBranchName())
@@ -94,7 +94,7 @@ struct ToolbarBranchPicker: View {
9494
}
9595

9696
private var title: String {
97-
workspace?.folderURL()?.lastPathComponent ?? "Empty"
97+
workspaceFileManager?.folderUrl.lastPathComponent ?? "Empty"
9898
}
9999

100100
// MARK: Popover View

‎CodeEdit/Features/Documents/Controllers/CodeEditWindowController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
203203
let view = NSHostingView(
204204
rootView: ToolbarBranchPicker(
205205
shellClient: currentWorld.shellClient,
206-
workspace: workspace?.workspaceClient
206+
workspaceFileManager: workspace?.workspaceFileManager
207207
)
208208
)
209209
toolbarItem.view = view

‎CodeEdit/Features/Documents/Views/WorkspaceCodeFileView.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ struct WorkspaceCodeFileView: View {
1616
@EnvironmentObject
1717
private var tabgroup: TabGroupData
1818

19-
var file: WorkspaceClient.FileItem
19+
var file: CEWorkspaceFile
2020

2121
@StateObject
2222
private var prefs: AppPreferencesModel = .shared
@@ -37,7 +37,7 @@ struct WorkspaceCodeFileView: View {
3737
Spacer()
3838
VStack(spacing: 10) {
3939
ProgressView()
40-
Text("Opening \(file.fileName)...")
40+
Text("Opening \(file.name)...")
4141
}
4242
Spacer()
4343
}
@@ -46,7 +46,7 @@ struct WorkspaceCodeFileView: View {
4646
@ViewBuilder
4747
private func otherFileView(
4848
_ otherFile: CodeFileDocument,
49-
for item: WorkspaceClient.FileItem
49+
for item: CEWorkspaceFile
5050
) -> some View {
5151
VStack(spacing: 0) {
5252

‎CodeEdit/Features/Documents/WorkspaceDocument+Listeners.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ import Foundation
99
import Combine
1010

1111
class WorkspaceNotificationModel: ObservableObject {
12+
13+
@Published
14+
var highlightedFileItem: CEWorkspaceFile?
15+
1216
init() {
1317
highlightedFileItem = nil
1418
}
1519

16-
@Published var highlightedFileItem: WorkspaceClient.FileItem?
1720
}

‎CodeEdit/Features/Documents/WorkspaceDocument+Search.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ extension WorkspaceDocument {
7474
// - Lazily load strings using `FileHandle.AsyncBytes`
7575
// https://developer.apple.com/documentation/foundation/filehandle/3766681-bytes
7676
filePaths.map { url in
77-
WorkspaceClient.FileItem(url: url, children: nil)
77+
CEWorkspaceFile(url: url, children: nil)
7878
}.forEach { fileItem in
7979
guard let data = try? Data(contentsOf: fileItem.url),
8080
let string = String(data: data, encoding: .utf8) else { return }

‎CodeEdit/Features/Documents/WorkspaceDocument.swift

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@ import Combine
1212
import CodeEditKit
1313

1414
@objc(WorkspaceDocument) final class WorkspaceDocument: NSDocument, ObservableObject, NSToolbarDelegate {
15-
var workspaceClient: WorkspaceClient?
1615

17-
var workspaceClient: FileSystemClient?
16+
@Published
17+
var sortFoldersOnTop: Bool = true
1818

19-
var extensionNavigatorData = ExtensionNavigatorData()
19+
@Published
20+
var fileItems: [CEWorkspaceFile] = []
21+
22+
@Published
23+
var targets: [Target] = []
2024

21-
@Published var sortFoldersOnTop: Bool = true
25+
var workspaceFileManager: CEWorkspaceFileManager?
2226

23-
@Published var fileItems: [WorkspaceClient.FileItem] = []
27+
var extensionNavigatorData = ExtensionNavigatorData()
2428

2529
var tabManager = TabManager()
2630

@@ -120,7 +124,10 @@ import CodeEditKit
120124
// folderURL: url,
121125
// ignoredFilesAndFolders: ignoredFilesAndDirectory
122126
// )
123-
self.workspaceClient = .init(fileManager: .default, folderUrl: url, ignoredFilesAndFolders: ignoredFilesAndDirectory)
127+
self.workspaceFileManager = .init(
128+
folderUrl: url,
129+
ignoredFilesAndFolders: ignoredFilesAndDirectory
130+
)
124131
self.searchState = .init(self)
125132
self.quickOpenViewModel = .init(fileURL: url)
126133
self.commandsPaletteState = .init()
@@ -130,7 +137,7 @@ import CodeEditKit
130137
try initWorkspaceState(url)
131138

132139
// Initialize Workspace
133-
workspaceClient?
140+
workspaceFileManager?
134141
.getFiles
135142
.sink { [weak self] files in
136143
guard let self = self else { return }

0 commit comments

Comments
 (0)