Skip to content

Commit 608aafc

Browse files
committed
removed debug funcs
1 parent bd4b189 commit 608aafc

File tree

2 files changed

+29
-15
lines changed

2 files changed

+29
-15
lines changed

CodeEdit/Features/Documents/Controllers/CodeEditWindowController.swift

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
3232
init(window: NSWindow, workspace: WorkspaceDocument) {
3333
super.init(window: window)
3434
self.workspace = workspace
35-
self.workspaceSettings = CEWorkspaceSettings(workspaceDocument: workspace)
35+
self.workspaceSettings = CEWorkspaceSettings(
36+
workspaceDocument: workspace
37+
)
3638
setupSplitView(with: workspace)
3739

3840
let view = CodeEditSplitView(controller: splitViewController).ignoresSafeArea()
@@ -54,10 +56,14 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
5456
registerCommands()
5557
}
5658

57-
deinit { cancellables.forEach({ $0.cancel() }) }
59+
deinit {
60+
cancellables.forEach({ $0.cancel() })
61+
}
5862

5963
@available(*, unavailable)
60-
required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
64+
required init?(coder: NSCoder) {
65+
fatalError("init(coder:) has not been implemented")
66+
}
6167

6268
private func setupSplitView(with workspace: WorkspaceDocument) {
6369
let feedbackPerformer = NSHapticFeedbackManager.defaultPerformer
@@ -127,16 +133,18 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
127133
// Set titlebar background as transparent by default in order to
128134
// style the toolbar background in native tab bar style.
129135
self.window?.titlebarSeparatorStyle = .none
130-
} else { self.window?.titlebarSeparatorStyle = .automatic }
131-
// In Xcode tab bar style, we use default toolbar background with
132-
// line separator.
136+
} else {
137+
// In Xcode tab bar style, we use default toolbar background with
138+
// line separator.
139+
self.window?.titlebarSeparatorStyle = .automatic
140+
}
133141
self.window?.toolbar = toolbar
134142
}
135143

136144
// MARK: - Toolbar
137145

138146
func toolbarDefaultItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
139-
return [
147+
[
140148
.toggleFirstSidebarItem,
141149
.sidebarTrackingSeparator,
142150
.branchPicker,
@@ -181,7 +189,9 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
181189
) -> NSToolbarItem? {
182190
switch itemIdentifier {
183191
case .itemListTrackingSeparator:
184-
guard let splitViewController else { return nil }
192+
guard let splitViewController else {
193+
return nil
194+
}
185195

186196
return NSTrackingSeparatorToolbarItem(
187197
identifier: .itemListTrackingSeparator,
@@ -219,7 +229,9 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
219229
case .branchPicker:
220230
let toolbarItem = NSToolbarItem(itemIdentifier: .branchPicker)
221231
let view = NSHostingView(
222-
rootView: ToolbarBranchPicker(workspaceFileManager: workspace?.workspaceFileManager)
232+
rootView: ToolbarBranchPicker(
233+
workspaceFileManager: workspace?.workspaceFileManager
234+
)
223235
)
224236
toolbarItem.view = view
225237

CodeEdit/Features/WindowCommands/ViewCommands.swift

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ struct ViewCommands: Commands {
4141
}
4242

4343
var body: some Commands {
44+
4445
CommandGroup(after: .toolbar) {
4546
Button("Show Command Palette") {
4647
NSApp.sendAction(#selector(CodeEditWindowController.openCommandPalette(_:)), to: nil, from: nil)
@@ -94,6 +95,7 @@ struct ViewCommands: Commands {
9495
windowController = window?.windowController as? CodeEditWindowController
9596
}
9697

98+
9799
Button("\(inspectorCollapsed ? "Show" : "Hide") Inspector") {
98100
windowController?.toggleLastPanel()
99101
}
@@ -106,18 +108,18 @@ struct ViewCommands: Commands {
106108
.disabled(windowController == nil)
107109
.keyboardShortcut("y", modifiers: [.shift, .command])
108110

111+
Button("\(navigatorCollapsed ? "Show" : "Hide") Toolbar") {
112+
windowController?.toggleToolbar()
113+
}
114+
.disabled(windowController == nil)
115+
.keyboardShortcut("t", modifiers: [.option, .command])
116+
109117
Divider()
110118

111119
Button("\(showEditorPathBar ? "Hide" : "Show") Path Bar") {
112120
showEditorPathBar.toggle()
113121
}
114122

115-
Button("\(toolbarCollapsed ? "Show" : "Hide") Toolbar") {
116-
windowController?.toggleToolbar()
117-
print(toolbarCollapsed)
118-
}
119-
.keyboardShortcut("t", modifiers: [.option, .command])
120-
121123
Toggle("Dim editors without focus", isOn: $dimEditorsWithoutFocus)
122124

123125
Divider()

0 commit comments

Comments
 (0)