Renamed a few files that were previously moved and added documentatio…

…n to new branch and rename branch views
CodeEditApp · Aug 5, 2024 · d4d0ea2 · d4d0ea2
1 parent baa079f
commit d4d0ea2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/CodeEdit.xcodeproj/project.pbxproj b/CodeEdit.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		041FC6AD2AE437CE00C1F65A /* SourceControlNavigatorNewBranchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041FC6AC2AE437CE00C1F65A /* SourceControlNavigatorNewBranchView.swift */; };
+		041FC6AD2AE437CE00C1F65A /* SourceControlNewBranchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041FC6AC2AE437CE00C1F65A /* SourceControlNewBranchView.swift */; };
 		043BCF03281DA18A000AC47C /* WorkspaceDocument+SearchState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043BCF02281DA18A000AC47C /* WorkspaceDocument+SearchState.swift */; };
 		043C321427E31FF6006AE443 /* CodeEditDocumentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043C321327E31FF6006AE443 /* CodeEditDocumentController.swift */; };
 		043C321627E3201F006AE443 /* WorkspaceDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043C321527E3201F006AE443 /* WorkspaceDocument.swift */; };
@@ -480,7 +480,7 @@
 		B607181D2B0C5BE3009CDAB4 /* GitClient+Stash.swift in Sources */ = {isa = PBXBuildFile; fileRef = B607181C2B0C5BE3009CDAB4 /* GitClient+Stash.swift */; };
 		B60718202B0C6CE7009CDAB4 /* GitStashEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = B607181F2B0C6CE7009CDAB4 /* GitStashEntry.swift */; };
 		B60718312B15A9A3009CDAB4 /* CEOutlineGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60718302B15A9A3009CDAB4 /* CEOutlineGroup.swift */; };
-		B60718372B170638009CDAB4 /* SourceControlNavigatorRenameBranchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60718362B170638009CDAB4 /* SourceControlNavigatorRenameBranchView.swift */; };
+		B60718372B170638009CDAB4 /* SourceControlRenameBranchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60718362B170638009CDAB4 /* SourceControlRenameBranchView.swift */; };
 		B607183F2B17DB07009CDAB4 /* SourceControlNavigatorRepositoryView+contextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = B607183E2B17DB07009CDAB4 /* SourceControlNavigatorRepositoryView+contextMenu.swift */; };
 		B60718422B17DB93009CDAB4 /* SourceControlNavigatorRepositoryView+outlineGroupData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60718412B17DB93009CDAB4 /* SourceControlNavigatorRepositoryView+outlineGroupData.swift */; };
 		B60718442B17DBE5009CDAB4 /* SourceControlNavigatorRepositoryItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60718432B17DBE5009CDAB4 /* SourceControlNavigatorRepositoryItem.swift */; };
@@ -655,7 +655,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		041FC6AC2AE437CE00C1F65A /* SourceControlNavigatorNewBranchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlNavigatorNewBranchView.swift; sourceTree = "<group>"; };
+		041FC6AC2AE437CE00C1F65A /* SourceControlNewBranchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlNewBranchView.swift; sourceTree = "<group>"; };
 		043BCF02281DA18A000AC47C /* WorkspaceDocument+SearchState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorkspaceDocument+SearchState.swift"; sourceTree = "<group>"; };
 		043C321327E31FF6006AE443 /* CodeEditDocumentController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeEditDocumentController.swift; sourceTree = "<group>"; };
 		043C321527E3201F006AE443 /* WorkspaceDocument.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkspaceDocument.swift; sourceTree = "<group>"; };
@@ -1116,7 +1116,7 @@
 		B607181C2B0C5BE3009CDAB4 /* GitClient+Stash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GitClient+Stash.swift"; sourceTree = "<group>"; };
 		B607181F2B0C6CE7009CDAB4 /* GitStashEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GitStashEntry.swift; sourceTree = "<group>"; };
 		B60718302B15A9A3009CDAB4 /* CEOutlineGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CEOutlineGroup.swift; sourceTree = "<group>"; };
-		B60718362B170638009CDAB4 /* SourceControlNavigatorRenameBranchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlNavigatorRenameBranchView.swift; sourceTree = "<group>"; };
+		B60718362B170638009CDAB4 /* SourceControlRenameBranchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlRenameBranchView.swift; sourceTree = "<group>"; };
 		B607183E2B17DB07009CDAB4 /* SourceControlNavigatorRepositoryView+contextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceControlNavigatorRepositoryView+contextMenu.swift"; sourceTree = "<group>"; };
 		B60718412B17DB93009CDAB4 /* SourceControlNavigatorRepositoryView+outlineGroupData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceControlNavigatorRepositoryView+outlineGroupData.swift"; sourceTree = "<group>"; };
 		B60718432B17DBE5009CDAB4 /* SourceControlNavigatorRepositoryItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlNavigatorRepositoryItem.swift; sourceTree = "<group>"; };
@@ -3301,8 +3301,8 @@
 				B6966A292C2F687A00259C2D /* SourceControlFetchView.swift */,
 				B67431CB2C3E45F30047FCA6 /* SourceControlSwitchView.swift */,
 				B65B10F42B081A0C002852CF /* SourceControlAddExistingRemoteView.swift */,
-				041FC6AC2AE437CE00C1F65A /* SourceControlNavigatorNewBranchView.swift */,
-				B60718362B170638009CDAB4 /* SourceControlNavigatorRenameBranchView.swift */,
+				041FC6AC2AE437CE00C1F65A /* SourceControlNewBranchView.swift */,
+				B60718362B170638009CDAB4 /* SourceControlRenameBranchView.swift */,
 				B6966A2F2C33282200259C2D /* RemoteBranchPicker.swift */,
 			);
 			path = Views;
@@ -3863,7 +3863,7 @@
 				58A5DF8029325B5A00D1BD5D /* GitClient.swift in Sources */,
 				D7E201AE27E8B3C000CB86D0 /* String+Ranges.swift in Sources */,
 				6CE6226E2A2A1CDE0013085C /* NavigatorTab.swift in Sources */,
-				041FC6AD2AE437CE00C1F65A /* SourceControlNavigatorNewBranchView.swift in Sources */,
+				041FC6AD2AE437CE00C1F65A /* SourceControlNewBranchView.swift in Sources */,
 				77A01E432BBC3A2800F0EA38 /* CETask.swift in Sources */,
 				6C48D8F72972E5F300D6D205 /* WindowObserver.swift in Sources */,
 				6CED16E42A3E660D000EC962 /* String+Lines.swift in Sources */,
@@ -3923,7 +3923,7 @@
 				30B088092C0D53080063A882 /* LanguageServer+Formatting.swift in Sources */,
 				30B088102C0D53080063A882 /* LanguageServer+SemanticTokens.swift in Sources */,
 				B6C6A43029771F7100A3D28F /* EditorTabBackground.swift in Sources */,
-				B60718372B170638009CDAB4 /* SourceControlNavigatorRenameBranchView.swift in Sources */,
+				B60718372B170638009CDAB4 /* SourceControlRenameBranchView.swift in Sources */,
 				6C578D8129CD294800DC73B2 /* ExtensionActivatorView.swift in Sources */,
 				B6F0517D29D9E4B100D72287 /* TerminalSettingsView.swift in Sources */,
 				6CC17B532C43314000834E2C /* ProjectNavigatorViewController+NSOutlineViewDelegate.swift in Sources */,

diff --git a/...orArea/SourceControlNavigator/Repository/Views/SourceControlNavigatorRepositoryView.swift b/...orArea/SourceControlNavigator/Repository/Views/SourceControlNavigatorRepositoryView.swift
@@ -69,12 +69,12 @@ struct SourceControlNavigatorRepositoryView: View {
             }
         )
         .sheet(isPresented: $showNewBranch) {
-            SourceControlNavigatorNewBranchView(
+            SourceControlNewBranchView(
                 fromBranch: $fromBranch
             )
         }
         .sheet(isPresented: $showRenameBranch) {
-            SourceControlNavigatorRenameBranchView(
+            SourceControlRenameBranchView(
                 fromBranch: $fromBranch
             )
         }

diff --git a/...SourceControlNavigatorNewBranchView.swift → ...ol/Views/SourceControlNewBranchView.swift b/...SourceControlNavigatorNewBranchView.swift → ...ol/Views/SourceControlNewBranchView.swift
@@ -1,13 +1,13 @@
 //
-//  SourceControlNavigatorNewBranchView.swift
+//  SourceControlNewBranchView.swift
 //  CodeEdit
 //
 //  Created by Albert Vinizhanau on 10/21/23.
 //
 
 import SwiftUI
 
-struct SourceControlNavigatorNewBranchView: View {
+struct SourceControlNewBranchView: View {
     @Environment(\.dismiss)
     var dismiss
 
@@ -65,6 +65,7 @@ struct SourceControlNavigatorNewBranchView: View {
         }
     }
 
+    /// Creates a new branch from the specifiied source branch
     func submit(_ branch: GitBranch) {
         Task {
             do {

diff --git a/...rceControlNavigatorRenameBranchView.swift → ...Views/SourceControlRenameBranchView.swift b/...rceControlNavigatorRenameBranchView.swift → ...Views/SourceControlRenameBranchView.swift
@@ -1,13 +1,13 @@
 //
-//  SourceControlNavigatorRenameBranchView.swift
+//  SourceControlRenameBranchView.swift
 //  CodeEdit
 //
 //  Created by Austin Condiff on 11/28/23.
 //
 
 import SwiftUI
 
-struct SourceControlNavigatorRenameBranchView: View {
+struct SourceControlRenameBranchView: View {
     @Environment(\.dismiss)
     var dismiss
 

diff --git a/CodeEdit/Features/SourceControl/Views/SourceControlSwitchView.swift b/CodeEdit/Features/SourceControl/Views/SourceControlSwitchView.swift
@@ -59,6 +59,7 @@ struct SourceControlSwitchView: View {
         .frame(width: 420)
     }
 
+    /// Checks out the specifiied branch and if local changes exist prompts the user to shash changes
     func submit() {
         Task {
             do {
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,6 +59,7 @@ struct SourceControlSwitchView: View { @@
             .frame(width: 420)
         }
+        /// Checks out the specifiied branch and if local changes exist prompts the user to shash changes
         func submit() {
             Task {
                 do {
@@ Expand Down @@