Updated to latest

Author: austincondiff

CodeEdit/Features/InspectorArea/Views/InspectorAreaView.swift

@@ -13,17 +13,24 @@ struct InspectorAreaView: View {
     @ObservedObject private var extensionManager = ExtensionManager.shared
     @ObservedObject public var viewModel: InspectorAreaViewModel
 
-    @EnvironmentObject private var editorManager: EditorManager
-
-    @AppSettings(\.sourceControl.general.sourceControlIsEnabled)
-    private var sourceControlIsEnabled: Bool
-
     @AppSettings(\.general.inspectorTabBarPosition)
     var sidebarPosition: SettingsData.SidebarTabBarPosition
 
     init(viewModel: InspectorAreaViewModel) {
         self.viewModel = viewModel
-        updateTabItems()
+
+        viewModel.tabItems = [.file, .gitHistory] +
+            extensionManager
+                .extensions
+                .map { ext in
+                    ext.availableFeatures.compactMap {
+                        if case .sidebarItem(let data) = $0, data.kind == .inspector {
+                            return InspectorTab.uiExtension(endpoint: ext.endpoint, data: data)
+                        }
+                        return nil
+                    }
+                }
+                .joined()
     }
 
     var body: some View {
@@ -36,28 +43,5 @@ struct InspectorAreaView: View {
         .formStyle(.grouped)
         .accessibilityElement(children: .contain)
         .accessibilityLabel("inspector")
-        .onChange(of: sourceControlIsEnabled) { _ in
-            updateTabItems()
-        }
-    }
-
-    private func updateTabItems() {
-        viewModel.tabItems = [.file] +
-            (sourceControlIsEnabled ? [.gitHistory] : []) +
-            extensionManager
-                .extensions
-                .flatMap { ext in
-                    ext.availableFeatures.compactMap {
-                        if case .sidebarItem(let data) = $0, data.kind == .inspector {
-                            return InspectorTab.uiExtension(endpoint: ext.endpoint, data: data)
-                        }
-                        return nil
-                    }
-                }
-        if let selectedTab = selection,
-            !viewModel.tabItems.isEmpty &&
-            !viewModel.tabItems.contains(selectedTab) {
-            selection = viewModel.tabItems[0]
-        }
     }
 }

CodeEdit/Features/NavigatorArea/Views/NavigatorAreaView.swift

@@ -15,13 +15,22 @@ struct NavigatorAreaView: View {
     @AppSettings(\.general.navigatorTabBarPosition)
     var sidebarPosition: SettingsData.SidebarTabBarPosition
 
-    @AppSettings(\.sourceControl.general.sourceControlIsEnabled)
-    private var sourceControlIsEnabled: Bool
-
-    init(workspace: WorkspaceDocument, viewModel: NavigatorSidebarViewModel) {
+    init(workspace: WorkspaceDocument, viewModel: NavigatorAreaViewModel) {
         self.workspace = workspace
         self.viewModel = viewModel
-        updateTabItems()
+
+        viewModel.tabItems = [.project, .sourceControl, .search] +
+            extensionManager
+                .extensions
+                .map { ext in
+                    ext.availableFeatures.compactMap {
+                        if case .sidebarItem(let data) = $0, data.kind == .navigator {
+                            return NavigatorTab.uiExtension(endpoint: ext.endpoint, data: data)
+                        }
+                        return nil
+                    }
+                }
+                .joined()
     }
 
     var body: some View {
@@ -34,29 +43,5 @@ struct NavigatorAreaView: View {
         .environmentObject(workspace)
         .accessibilityElement(children: .contain)
         .accessibilityLabel("navigator")
-        .onChange(of: sourceControlIsEnabled) { _ in
-            updateTabItems()
-        }
-    }
-
-    private func updateTabItems() {
-        viewModel.tabItems = [.project] +
-            (sourceControlIsEnabled ? [.sourceControl] : []) +
-            [.search] +
-            extensionManager
-                .extensions
-                .flatMap { ext in
-                    ext.availableFeatures.compactMap {
-                        if case .sidebarItem(let data) = $0, data.kind == .navigator {
-                            return NavigatorTab.uiExtension(endpoint: ext.endpoint, data: data)
-                        }
-                        return nil
-                    }
-                }
-        if let selectedTab = viewModel.selectedTab,
-            !viewModel.tabItems.isEmpty &&
-            !viewModel.tabItems.contains(selectedTab) {
-            viewModel.selectedTab = viewModel.tabItems[0]
-        }
     }
 }