Skip to content

Commit d4d0ea2

Browse files
committed
Renamed a few files that were previously moved and added documentation to new branch and rename branch views
1 parent baa079f commit d4d0ea2

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

CodeEdit.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
041FC6AD2AE437CE00C1F65A /* SourceControlNavigatorNewBranchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041FC6AC2AE437CE00C1F65A /* SourceControlNavigatorNewBranchView.swift */; };
10+
041FC6AD2AE437CE00C1F65A /* SourceControlNewBranchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041FC6AC2AE437CE00C1F65A /* SourceControlNewBranchView.swift */; };
1111
043BCF03281DA18A000AC47C /* WorkspaceDocument+SearchState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043BCF02281DA18A000AC47C /* WorkspaceDocument+SearchState.swift */; };
1212
043C321427E31FF6006AE443 /* CodeEditDocumentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043C321327E31FF6006AE443 /* CodeEditDocumentController.swift */; };
1313
043C321627E3201F006AE443 /* WorkspaceDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043C321527E3201F006AE443 /* WorkspaceDocument.swift */; };
@@ -480,7 +480,7 @@
480480
B607181D2B0C5BE3009CDAB4 /* GitClient+Stash.swift in Sources */ = {isa = PBXBuildFile; fileRef = B607181C2B0C5BE3009CDAB4 /* GitClient+Stash.swift */; };
481481
B60718202B0C6CE7009CDAB4 /* GitStashEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = B607181F2B0C6CE7009CDAB4 /* GitStashEntry.swift */; };
482482
B60718312B15A9A3009CDAB4 /* CEOutlineGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60718302B15A9A3009CDAB4 /* CEOutlineGroup.swift */; };
483-
B60718372B170638009CDAB4 /* SourceControlNavigatorRenameBranchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60718362B170638009CDAB4 /* SourceControlNavigatorRenameBranchView.swift */; };
483+
B60718372B170638009CDAB4 /* SourceControlRenameBranchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60718362B170638009CDAB4 /* SourceControlRenameBranchView.swift */; };
484484
B607183F2B17DB07009CDAB4 /* SourceControlNavigatorRepositoryView+contextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = B607183E2B17DB07009CDAB4 /* SourceControlNavigatorRepositoryView+contextMenu.swift */; };
485485
B60718422B17DB93009CDAB4 /* SourceControlNavigatorRepositoryView+outlineGroupData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60718412B17DB93009CDAB4 /* SourceControlNavigatorRepositoryView+outlineGroupData.swift */; };
486486
B60718442B17DBE5009CDAB4 /* SourceControlNavigatorRepositoryItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60718432B17DBE5009CDAB4 /* SourceControlNavigatorRepositoryItem.swift */; };
@@ -655,7 +655,7 @@
655655
/* End PBXCopyFilesBuildPhase section */
656656

657657
/* Begin PBXFileReference section */
658-
041FC6AC2AE437CE00C1F65A /* SourceControlNavigatorNewBranchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlNavigatorNewBranchView.swift; sourceTree = "<group>"; };
658+
041FC6AC2AE437CE00C1F65A /* SourceControlNewBranchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlNewBranchView.swift; sourceTree = "<group>"; };
659659
043BCF02281DA18A000AC47C /* WorkspaceDocument+SearchState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorkspaceDocument+SearchState.swift"; sourceTree = "<group>"; };
660660
043C321327E31FF6006AE443 /* CodeEditDocumentController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeEditDocumentController.swift; sourceTree = "<group>"; };
661661
043C321527E3201F006AE443 /* WorkspaceDocument.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkspaceDocument.swift; sourceTree = "<group>"; };
@@ -1116,7 +1116,7 @@
11161116
B607181C2B0C5BE3009CDAB4 /* GitClient+Stash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GitClient+Stash.swift"; sourceTree = "<group>"; };
11171117
B607181F2B0C6CE7009CDAB4 /* GitStashEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GitStashEntry.swift; sourceTree = "<group>"; };
11181118
B60718302B15A9A3009CDAB4 /* CEOutlineGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CEOutlineGroup.swift; sourceTree = "<group>"; };
1119-
B60718362B170638009CDAB4 /* SourceControlNavigatorRenameBranchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlNavigatorRenameBranchView.swift; sourceTree = "<group>"; };
1119+
B60718362B170638009CDAB4 /* SourceControlRenameBranchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlRenameBranchView.swift; sourceTree = "<group>"; };
11201120
B607183E2B17DB07009CDAB4 /* SourceControlNavigatorRepositoryView+contextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceControlNavigatorRepositoryView+contextMenu.swift"; sourceTree = "<group>"; };
11211121
B60718412B17DB93009CDAB4 /* SourceControlNavigatorRepositoryView+outlineGroupData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceControlNavigatorRepositoryView+outlineGroupData.swift"; sourceTree = "<group>"; };
11221122
B60718432B17DBE5009CDAB4 /* SourceControlNavigatorRepositoryItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlNavigatorRepositoryItem.swift; sourceTree = "<group>"; };
@@ -3301,8 +3301,8 @@
33013301
B6966A292C2F687A00259C2D /* SourceControlFetchView.swift */,
33023302
B67431CB2C3E45F30047FCA6 /* SourceControlSwitchView.swift */,
33033303
B65B10F42B081A0C002852CF /* SourceControlAddExistingRemoteView.swift */,
3304-
041FC6AC2AE437CE00C1F65A /* SourceControlNavigatorNewBranchView.swift */,
3305-
B60718362B170638009CDAB4 /* SourceControlNavigatorRenameBranchView.swift */,
3304+
041FC6AC2AE437CE00C1F65A /* SourceControlNewBranchView.swift */,
3305+
B60718362B170638009CDAB4 /* SourceControlRenameBranchView.swift */,
33063306
B6966A2F2C33282200259C2D /* RemoteBranchPicker.swift */,
33073307
);
33083308
path = Views;
@@ -3863,7 +3863,7 @@
38633863
58A5DF8029325B5A00D1BD5D /* GitClient.swift in Sources */,
38643864
D7E201AE27E8B3C000CB86D0 /* String+Ranges.swift in Sources */,
38653865
6CE6226E2A2A1CDE0013085C /* NavigatorTab.swift in Sources */,
3866-
041FC6AD2AE437CE00C1F65A /* SourceControlNavigatorNewBranchView.swift in Sources */,
3866+
041FC6AD2AE437CE00C1F65A /* SourceControlNewBranchView.swift in Sources */,
38673867
77A01E432BBC3A2800F0EA38 /* CETask.swift in Sources */,
38683868
6C48D8F72972E5F300D6D205 /* WindowObserver.swift in Sources */,
38693869
6CED16E42A3E660D000EC962 /* String+Lines.swift in Sources */,
@@ -3923,7 +3923,7 @@
39233923
30B088092C0D53080063A882 /* LanguageServer+Formatting.swift in Sources */,
39243924
30B088102C0D53080063A882 /* LanguageServer+SemanticTokens.swift in Sources */,
39253925
B6C6A43029771F7100A3D28F /* EditorTabBackground.swift in Sources */,
3926-
B60718372B170638009CDAB4 /* SourceControlNavigatorRenameBranchView.swift in Sources */,
3926+
B60718372B170638009CDAB4 /* SourceControlRenameBranchView.swift in Sources */,
39273927
6C578D8129CD294800DC73B2 /* ExtensionActivatorView.swift in Sources */,
39283928
B6F0517D29D9E4B100D72287 /* TerminalSettingsView.swift in Sources */,
39293929
6CC17B532C43314000834E2C /* ProjectNavigatorViewController+NSOutlineViewDelegate.swift in Sources */,

CodeEdit/Features/NavigatorArea/SourceControlNavigator/Repository/Views/SourceControlNavigatorRepositoryView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ struct SourceControlNavigatorRepositoryView: View {
6969
}
7070
)
7171
.sheet(isPresented: $showNewBranch) {
72-
SourceControlNavigatorNewBranchView(
72+
SourceControlNewBranchView(
7373
fromBranch: $fromBranch
7474
)
7575
}
7676
.sheet(isPresented: $showRenameBranch) {
77-
SourceControlNavigatorRenameBranchView(
77+
SourceControlRenameBranchView(
7878
fromBranch: $fromBranch
7979
)
8080
}

CodeEdit/Features/SourceControl/Views/SourceControlNavigatorNewBranchView.swift renamed to CodeEdit/Features/SourceControl/Views/SourceControlNewBranchView.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//
2-
// SourceControlNavigatorNewBranchView.swift
2+
// SourceControlNewBranchView.swift
33
// CodeEdit
44
//
55
// Created by Albert Vinizhanau on 10/21/23.
66
//
77

88
import SwiftUI
99

10-
struct SourceControlNavigatorNewBranchView: View {
10+
struct SourceControlNewBranchView: View {
1111
@Environment(\.dismiss)
1212
var dismiss
1313

@@ -65,6 +65,7 @@ struct SourceControlNavigatorNewBranchView: View {
6565
}
6666
}
6767

68+
/// Creates a new branch from the specifiied source branch
6869
func submit(_ branch: GitBranch) {
6970
Task {
7071
do {

CodeEdit/Features/SourceControl/Views/SourceControlNavigatorRenameBranchView.swift renamed to CodeEdit/Features/SourceControl/Views/SourceControlRenameBranchView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//
2-
// SourceControlNavigatorRenameBranchView.swift
2+
// SourceControlRenameBranchView.swift
33
// CodeEdit
44
//
55
// Created by Austin Condiff on 11/28/23.
66
//
77

88
import SwiftUI
99

10-
struct SourceControlNavigatorRenameBranchView: View {
10+
struct SourceControlRenameBranchView: View {
1111
@Environment(\.dismiss)
1212
var dismiss
1313

CodeEdit/Features/SourceControl/Views/SourceControlSwitchView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ struct SourceControlSwitchView: View {
5959
.frame(width: 420)
6060
}
6161

62+
/// Checks out the specifiied branch and if local changes exist prompts the user to shash changes
6263
func submit() {
6364
Task {
6465
do {

0 commit comments

Comments
 (0)