Skip to content

Commit 84fd417

Browse files
austincondiffaustincondiff
committed
Renamed PathBar to JumpBar
1 parent cb2fdb2 commit 84fd417

File tree

6 files changed

+29
-30
lines changed

6 files changed

+29
-30
lines changed

‎CodeEdit.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@
131131
5878DAA6291AE76700DD95A3 /* OpenQuicklyPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878DAA2291AE76700DD95A3 /* OpenQuicklyPreviewView.swift */; };
132132
5878DAA7291AE76700DD95A3 /* OpenQuicklyViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878DAA3291AE76700DD95A3 /* OpenQuicklyViewModel.swift */; };
133133
5878DAA8291AE76700DD95A3 /* OpenQuicklyListItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878DAA4291AE76700DD95A3 /* OpenQuicklyListItemView.swift */; };
134-
5878DAB0291D627C00DD95A3 /* EditorPathBarMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878DAAD291D627C00DD95A3 /* EditorPathBarMenu.swift */; };
135-
5878DAB1291D627C00DD95A3 /* EditorPathBarComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878DAAE291D627C00DD95A3 /* EditorPathBarComponent.swift */; };
136-
5878DAB2291D627C00DD95A3 /* EditorPathBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878DAAF291D627C00DD95A3 /* EditorPathBarView.swift */; };
134+
5878DAB0291D627C00DD95A3 /* EditorJumpBarMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878DAAD291D627C00DD95A3 /* EditorJumpBarMenu.swift */; };
135+
5878DAB1291D627C00DD95A3 /* EditorJumpBarComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878DAAE291D627C00DD95A3 /* EditorJumpBarComponent.swift */; };
136+
5878DAB2291D627C00DD95A3 /* EditorJumpBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878DAAF291D627C00DD95A3 /* EditorJumpBarView.swift */; };
137137
58798218292D92370085B254 /* String+SafeOffset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58798213292D92370085B254 /* String+SafeOffset.swift */; };
138138
58798219292D92370085B254 /* SearchModeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58798215292D92370085B254 /* SearchModeModel.swift */; };
139139
5879821A292D92370085B254 /* SearchResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58798216292D92370085B254 /* SearchResultModel.swift */; };
@@ -807,9 +807,9 @@
807807
5878DAA2291AE76700DD95A3 /* OpenQuicklyPreviewView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenQuicklyPreviewView.swift; sourceTree = "<group>"; };
808808
5878DAA3291AE76700DD95A3 /* OpenQuicklyViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenQuicklyViewModel.swift; sourceTree = "<group>"; };
809809
5878DAA4291AE76700DD95A3 /* OpenQuicklyListItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenQuicklyListItemView.swift; sourceTree = "<group>"; };
810-
5878DAAD291D627C00DD95A3 /* EditorPathBarMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorPathBarMenu.swift; sourceTree = "<group>"; };
811-
5878DAAE291D627C00DD95A3 /* EditorPathBarComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorPathBarComponent.swift; sourceTree = "<group>"; };
812-
5878DAAF291D627C00DD95A3 /* EditorPathBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorPathBarView.swift; sourceTree = "<group>"; };
810+
5878DAAD291D627C00DD95A3 /* EditorJumpBarMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorJumpBarMenu.swift; sourceTree = "<group>"; };
811+
5878DAAE291D627C00DD95A3 /* EditorJumpBarComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorJumpBarComponent.swift; sourceTree = "<group>"; };
812+
5878DAAF291D627C00DD95A3 /* EditorJumpBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorJumpBarView.swift; sourceTree = "<group>"; };
813813
58798213292D92370085B254 /* String+SafeOffset.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+SafeOffset.swift"; sourceTree = "<group>"; };
814814
58798215292D92370085B254 /* SearchModeModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchModeModel.swift; sourceTree = "<group>"; };
815815
58798216292D92370085B254 /* SearchResultModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchResultModel.swift; sourceTree = "<group>"; };
@@ -1892,20 +1892,20 @@
18921892
path = ViewModels;
18931893
sourceTree = "<group>";
18941894
};
1895-
5878DAAB291D627C00DD95A3 /* PathBar */ = {
1895+
5878DAAB291D627C00DD95A3 /* JumpBar */ = {
18961896
isa = PBXGroup;
18971897
children = (
18981898
5878DAAC291D627C00DD95A3 /* Views */,
18991899
);
1900-
path = PathBar;
1900+
path = JumpBar;
19011901
sourceTree = "<group>";
19021902
};
19031903
5878DAAC291D627C00DD95A3 /* Views */ = {
19041904
isa = PBXGroup;
19051905
children = (
1906-
5878DAAD291D627C00DD95A3 /* EditorPathBarMenu.swift */,
1907-
5878DAAE291D627C00DD95A3 /* EditorPathBarComponent.swift */,
1908-
5878DAAF291D627C00DD95A3 /* EditorPathBarView.swift */,
1906+
5878DAAD291D627C00DD95A3 /* EditorJumpBarMenu.swift */,
1907+
5878DAAE291D627C00DD95A3 /* EditorJumpBarComponent.swift */,
1908+
5878DAAF291D627C00DD95A3 /* EditorJumpBarView.swift */,
19091909
);
19101910
path = Views;
19111911
sourceTree = "<group>";
@@ -2819,7 +2819,7 @@
28192819
6C147C3C29A328020089B630 /* Editor */ = {
28202820
isa = PBXGroup;
28212821
children = (
2822-
5878DAAB291D627C00DD95A3 /* PathBar */,
2822+
5878DAAB291D627C00DD95A3 /* JumpBar */,
28232823
287776EB27E350BA00D46668 /* TabBar */,
28242824
B67660642AA970ED00CD56B0 /* Models */,
28252825
B67660632AA970E300CD56B0 /* Views */,
@@ -4033,7 +4033,7 @@
40334033
58D01C9B293167DC00C5B6B4 /* CodeEditKeychainConstants.swift in Sources */,
40344034
B640A99E29E2184700715F20 /* SettingsForm.swift in Sources */,
40354035
B62AEDD12A27B264009A9F52 /* View+paneToolbar.swift in Sources */,
4036-
5878DAB1291D627C00DD95A3 /* EditorPathBarComponent.swift in Sources */,
4036+
5878DAB1291D627C00DD95A3 /* EditorJumpBarComponent.swift in Sources */,
40374037
B628B7B72B223BAD00F9775A /* FindModePicker.swift in Sources */,
40384038
587B9E6E29301D8F00AC7927 /* GitLabProject.swift in Sources */,
40394039
58798234292E30B90085B254 /* FeedbackIssueArea.swift in Sources */,
@@ -4386,7 +4386,7 @@
43864386
58D01C99293167DC00C5B6B4 /* String+MD5.swift in Sources */,
43874387
20EBB505280C329800F3A5DA /* CommitListItemView.swift in Sources */,
43884388
669A50512C380C1800304CD8 /* String+escapedWhiteSpaces.swift in Sources */,
4389-
5878DAB2291D627C00DD95A3 /* EditorPathBarView.swift in Sources */,
4389+
5878DAB2291D627C00DD95A3 /* EditorJumpBarView.swift in Sources */,
43904390
664935422C35A5BC00461C35 /* NSTableViewWrapper.swift in Sources */,
43914391
04BC1CDE2AD9B4B000A83EA5 /* EditorFileTabCloseButton.swift in Sources */,
43924392
6C6BD70129CD172700235D17 /* ExtensionsListView.swift in Sources */,
@@ -4411,7 +4411,7 @@
44114411
587B9E7229301D8F00AC7927 /* GitJSONPostRouter.swift in Sources */,
44124412
6C6362D42C3E321A0025570D /* Editor+History.swift in Sources */,
44134413
6C85BB412C21061A00EB5DEF /* GitHubComment.swift in Sources */,
4414-
5878DAB0291D627C00DD95A3 /* EditorPathBarMenu.swift in Sources */,
4414+
5878DAB0291D627C00DD95A3 /* EditorJumpBarMenu.swift in Sources */,
44154415
04BA7C242AE2E7CD00584E1C /* SourceControlNavigatorSyncView.swift in Sources */,
44164416
587B9DA529300ABD00AC7927 /* PressActionsModifier.swift in Sources */,
44174417
6C147C4029A328BC0089B630 /* SplitViewData.swift in Sources */,

CodeEdit/Features/Editor/PathBar/Views/EditorPathBarComponent.swift renamed to CodeEdit/Features/Editor/JumpBar/Views/EditorJumpBarComponent.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// PathBar.swift
2+
// EditorJumpBar.swift
33
// CodeEditModules/PathBar
44
//
55
// Created by Lukas Pistrol on 18.03.22.
@@ -9,7 +9,7 @@ import SwiftUI
99
import Combine
1010
import CodeEditSymbols
1111

12-
struct EditorPathBarComponent: View {
12+
struct EditorJumpBarComponent: View {
1313
private let fileItem: CEWorkspaceFile
1414
private let tappedOpenFile: (CEWorkspaceFile) -> Void
1515
private let isLastItem: Bool
@@ -54,7 +54,7 @@ struct EditorPathBarComponent: View {
5454
NSPopUpButtonView(selection: $selection) {
5555
guard let fileManager = workspace.workspaceFileManager else { return NSPopUpButton() }
5656

57-
button.menu = EditorPathBarMenu(
57+
button.menu = EditorJumpBarMenu(
5858
fileItems: siblings,
5959
fileManager: fileManager,
6060
tappedOpenFile: tappedOpenFile

CodeEdit/Features/Editor/PathBar/Views/EditorPathBarMenu.swift renamed to CodeEdit/Features/Editor/JumpBar/Views/EditorJumpBarMenu.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//
2-
// EditorPathBarMenu.swift
2+
// EditorJumpBarMenu.swift
33
// CodeEditModules/PathBar
44
//
55
// Created by Ziyuan Zhao on 2022/3/29.
66
//
77

88
import AppKit
99

10-
final class EditorPathBarMenu: NSMenu, NSMenuDelegate {
10+
final class EditorJumpBarMenu: NSMenu, NSMenuDelegate {
1111
private let fileItems: [CEWorkspaceFile]
1212
private weak var fileManager: CEWorkspaceFileManager?
1313
private let tappedOpenFile: (CEWorkspaceFile) -> Void
@@ -23,7 +23,7 @@ final class EditorPathBarMenu: NSMenu, NSMenuDelegate {
2323
super.init(title: "")
2424
delegate = self
2525
fileItems.forEach { item in
26-
let menuItem = PathBarMenuItem(fileItem: item, tappedOpenFile: tappedOpenFile)
26+
let menuItem = JumpBarMenuItem(fileItem: item, tappedOpenFile: tappedOpenFile)
2727
menuItem.onStateImage = nil
2828
self.addItem(menuItem)
2929
}
@@ -44,10 +44,10 @@ final class EditorPathBarMenu: NSMenu, NSMenuDelegate {
4444
}
4545
}
4646

47-
private func generateSubmenu(_ fileItem: CEWorkspaceFile) -> EditorPathBarMenu? {
47+
private func generateSubmenu(_ fileItem: CEWorkspaceFile) -> EditorJumpBarMenu? {
4848
if let fileManager = fileManager,
4949
let children = fileManager.childrenOfFile(fileItem) {
50-
let menu = EditorPathBarMenu(
50+
let menu = EditorJumpBarMenu(
5151
fileItems: children,
5252
fileManager: fileManager,
5353
tappedOpenFile: tappedOpenFile
@@ -58,7 +58,7 @@ final class EditorPathBarMenu: NSMenu, NSMenuDelegate {
5858
}
5959
}
6060

61-
final class PathBarMenuItem: NSMenuItem {
61+
final class JumpBarMenuItem: NSMenuItem {
6262
private let fileItem: CEWorkspaceFile
6363
private let tappedOpenFile: (CEWorkspaceFile) -> Void
6464
private let generalSettings = Settings.shared.preferences.general

CodeEdit/Features/Editor/PathBar/Views/EditorPathBarView.swift renamed to CodeEdit/Features/Editor/JumpBar/Views/EditorJumpBarView.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//
2-
// EditorPathBarView.swift
2+
// EditorJumpBarView.swift
33
// CodeEditModules/PathBar
44
//
55
// Created by Lukas Pistrol on 17.03.22.
66
//
77

88
import SwiftUI
99

10-
struct EditorPathBarView: View {
10+
struct EditorJumpBarView: View {
1111
private let file: CEWorkspaceFile?
1212
private let shouldShowTabBar: Bool
1313
private let tappedOpenFile: (CEWorkspaceFile) -> Void
@@ -58,7 +58,7 @@ struct EditorPathBarView: View {
5858
)
5959
} else {
6060
ForEach(fileItems, id: \.self) { fileItem in
61-
EditorPathBarComponent(
61+
EditorJumpBarComponent(
6262
fileItem: fileItem,
6363
tappedOpenFile: tappedOpenFile,
6464
isLastItem: fileItems.last == fileItem

‎CodeEdit/Features/Editor/Views/EditorAreaView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct EditorAreaView: View {
4343

4444
var editorInsetAmount: Double {
4545
let tabBarHeight = shouldShowTabBar ? (EditorTabBarView.height + 1) : 0
46-
let pathBarHeight = showEditorPathBar ? (EditorPathBarView.height + 1) : 0
46+
let pathBarHeight = showEditorPathBar ? (EditorJumpBarView.height + 1) : 0
4747
return tabBarHeight + pathBarHeight
4848
}
4949

@@ -90,7 +90,7 @@ struct EditorAreaView: View {
9090
Divider()
9191
}
9292
if showEditorPathBar {
93-
EditorPathBarView(
93+
EditorJumpBarView(
9494
file: editor.selectedTab?.file,
9595
shouldShowTabBar: shouldShowTabBar
9696
) { [weak editor] newFile in

‎CodeEdit/Features/InspectorArea/Views/InspectorAreaView.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import SwiftUI
99

1010
struct InspectorAreaView: View {
1111
@EnvironmentObject private var workspace: WorkspaceDocument
12-
1312
@ObservedObject private var extensionManager = ExtensionManager.shared
1413
@ObservedObject public var viewModel: InspectorAreaViewModel
1514

0 commit comments

Comments
 (0)