Moved EditorView from the SplitView folder into the Editor folder and…

… renamed it to EditorLayoutView. Renamed WorkspaceEditorView to EditorView.
CodeEditApp · Sep 5, 2023 · f39fac3 · f39fac3
1 parent b749ac7
commit f39fac3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/CodeEdit.xcodeproj/project.pbxproj b/CodeEdit.xcodeproj/project.pbxproj
@@ -254,9 +254,9 @@
 		6C147C4129A328BF0089B630 /* EditorLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C147C3E29A3281D0089B630 /* EditorLayout.swift */; };
 		6C147C4229A328C10089B630 /* Editor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C147C3D29A3281D0089B630 /* Editor.swift */; };
 		6C147C4529A329350089B630 /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = 6C147C4429A329350089B630 /* OrderedCollections */; };
-		6C147C4929A32A080089B630 /* EditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C147C4829A32A080089B630 /* EditorView.swift */; };
+		6C147C4929A32A080089B630 /* EditorLayoutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C147C4829A32A080089B630 /* EditorLayoutView.swift */; };
 		6C147C4B29A32A7B0089B630 /* Environment+SplitEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C147C4A29A32A7B0089B630 /* Environment+SplitEditor.swift */; };
-		6C147C4D29A32AA30089B630 /* WorkspaceEditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C147C4C29A32AA30089B630 /* WorkspaceEditorView.swift */; };
+		6C147C4D29A32AA30089B630 /* EditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C147C4C29A32AA30089B630 /* EditorView.swift */; };
 		6C14CEB028777D3C001468FE /* FindNavigatorListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C14CEAF28777D3C001468FE /* FindNavigatorListViewController.swift */; };
 		6C14CEB32877A68F001468FE /* FindNavigatorMatchListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C14CEB22877A68F001468FE /* FindNavigatorMatchListCell.swift */; };
 		6C18620A298BF5A800C663EA /* RecentProjectsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C186209298BF5A800C663EA /* RecentProjectsListView.swift */; };
@@ -712,9 +712,9 @@
 		6C147C3D29A3281D0089B630 /* Editor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Editor.swift; sourceTree = "<group>"; };
 		6C147C3E29A3281D0089B630 /* EditorLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorLayout.swift; sourceTree = "<group>"; };
 		6C147C3F29A328560089B630 /* SplitViewData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitViewData.swift; sourceTree = "<group>"; };
-		6C147C4829A32A080089B630 /* EditorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorView.swift; sourceTree = "<group>"; };
+		6C147C4829A32A080089B630 /* EditorLayoutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorLayoutView.swift; sourceTree = "<group>"; };
 		6C147C4A29A32A7B0089B630 /* Environment+SplitEditor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Environment+SplitEditor.swift"; sourceTree = "<group>"; };
-		6C147C4C29A32AA30089B630 /* WorkspaceEditorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkspaceEditorView.swift; sourceTree = "<group>"; };
+		6C147C4C29A32AA30089B630 /* EditorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorView.swift; sourceTree = "<group>"; };
 		6C14CEAF28777D3C001468FE /* FindNavigatorListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindNavigatorListViewController.swift; sourceTree = "<group>"; };
 		6C14CEB22877A68F001468FE /* FindNavigatorMatchListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindNavigatorMatchListCell.swift; sourceTree = "<group>"; };
 		6C186209298BF5A800C663EA /* RecentProjectsListView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecentProjectsListView.swift; sourceTree = "<group>"; };
@@ -2035,7 +2035,6 @@
 		6C092EDC2A53A63E00489202 /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				6C147C4829A32A080089B630 /* EditorView.swift */,
 				6C53AAD729A6C4FD00EE9ED6 /* SplitView.swift */,
 				6C2C156029B4F52F00EA60A5 /* SplitViewModifiers.swift */,
 				6C2C155C29B4F4E500EA60A5 /* SplitViewReader.swift */,
@@ -2059,7 +2058,8 @@
 		6C147C3C29A328020089B630 /* Editor */ = {
 			isa = PBXGroup;
 			children = (
-				6C147C4C29A32AA30089B630 /* WorkspaceEditorView.swift */,
+				6C147C4C29A32AA30089B630 /* EditorView.swift */,
+				6C147C4829A32A080089B630 /* EditorLayoutView.swift */,
 				6C91D57129B176FF0059A90D /* EditorManager.swift */,
 				6C147C3E29A3281D0089B630 /* EditorLayout.swift */,
 				6C147C3D29A3281D0089B630 /* Editor.swift */,
@@ -2873,7 +2873,7 @@
 				6CE6226B2A2A1C730013085C /* UtilityAreaTab.swift in Sources */,
 				587B9DA329300ABD00AC7927 /* SettingsTextEditor.swift in Sources */,
 				B6F0517B29D9E46400D72287 /* SourceControlSettingsView.swift in Sources */,
-				6C147C4D29A32AA30089B630 /* WorkspaceEditorView.swift in Sources */,
+				6C147C4D29A32AA30089B630 /* EditorView.swift in Sources */,
 				587B9E7B29301D8F00AC7927 /* GitHubRouter.swift in Sources */,
 				201169E22837B3D800F92B46 /* SourceControlNavigatorChangesView.swift in Sources */,
 				850C631029D6B01D00E1444C /* SettingsView.swift in Sources */,
@@ -3014,7 +3014,7 @@
 				588847692992ABCA00996D95 /* Array+CEWorkspaceFile.swift in Sources */,
 				58822530292C280D00E83CDE /* FilterTextField.swift in Sources */,
 				6C82D6B929BFE34900495C54 /* HelpCommands.swift in Sources */,
-				6C147C4929A32A080089B630 /* EditorView.swift in Sources */,
+				6C147C4929A32A080089B630 /* EditorLayoutView.swift in Sources */,
 				6C147C4129A328BF0089B630 /* EditorLayout.swift in Sources */,
 				B6D7EA592971078500301FAC /* InspectorSection.swift in Sources */,
 				58F2EAEF292FB2B0004A9BDE /* ThemeSettingsView.swift in Sources */,

diff --git a/...Features/SplitView/Views/EditorView.swift → ...it/Features/Editor/EditorLayoutView.swift b/...Features/SplitView/Views/EditorView.swift → ...it/Features/Editor/EditorLayoutView.swift
@@ -1,13 +1,13 @@
 //
-//  EditorView.swift
+//  EditorLayoutView.swift
 //  CodeEdit
 //
 //  Created by Wouter Hennen on 20/02/2023.
 //
 
 import SwiftUI
 
-struct EditorView: View {
+struct EditorLayoutView: View {
     var layout: EditorLayout
 
     @FocusState.Binding var focus: Editor?
@@ -26,7 +26,7 @@ struct EditorView: View {
         VStack {
             switch layout {
             case .one(let detailEditor):
-                WorkspaceEditorView(editor: detailEditor, focus: $focus)
+                EditorView(editor: detailEditor, focus: $focus)
                     .transformEnvironment(\.edgeInsets) { insets in
                         switch isAtEdge {
                         case .all:
@@ -41,12 +41,12 @@ struct EditorView: View {
                         }
                     }
             case .vertical(let data), .horizontal(let data):
-                SubEditorView(data: data, focus: $focus)
+                SubEditorLayoutView(data: data, focus: $focus)
             }
         }
     }
 
-    struct SubEditorView: View {
+    struct SubEditorLayoutView: View {
         @ObservedObject var data: SplitViewData
 
         @FocusState.Binding var focus: Editor?
@@ -60,7 +60,7 @@ struct EditorView: View {
 
         var splitView: some View {
             ForEach(Array(data.editorLayouts.enumerated()), id: \.offset) { index, item in
-                EditorView(layout: item, focus: $focus)
+                EditorLayoutView(layout: item, focus: $focus)
                     .transformEnvironment(\.isAtEdge) { belowToolbar in
                         calcIsAtEdge(current: &belowToolbar, index: index)
                     }

diff --git a/...Features/Editor/WorkspaceEditorView.swift → CodeEdit/Features/Editor/EditorView.swift b/...Features/Editor/WorkspaceEditorView.swift → CodeEdit/Features/Editor/EditorView.swift
@@ -1,13 +1,13 @@
 //
-//  WorkspaceEditorView.swift
+//  EditorView.swift
 //  CodeEdit
 //
 //  Created by Wouter Hennen on 16/02/2023.
 //
 
 import SwiftUI
 
-struct WorkspaceEditorView: View {
+struct EditorView: View {
     @ObservedObject var editor: Editor
 
     @FocusState.Binding var focus: Editor?

diff --git a/CodeEdit/WorkspaceView.swift b/CodeEdit/WorkspaceView.swift
@@ -42,7 +42,7 @@ struct WorkspaceView: View {
             VStack {
                 SplitViewReader { proxy in
                     SplitView(axis: .vertical) {
-                        EditorView(
+                        EditorLayoutView(
                             layout: editorManager.isFocusingActiveEditor
                             ? editorManager.activeEditor.getEditorLayout() ?? editorManager.editorLayout
                             : editorManager.editorLayout,