Fix edge cases and lint warnings

Author: FastestMolasses

CodeEdit/Features/LSP/Service/LSPService.swift

@@ -334,7 +334,7 @@ final class LSPService: ObservableObject {
 extension LSPService {
     private func notifyToInstallLanguageServer(language lspLanguage: LanguageIdentifier) {
         // TODO: Re-Enable when this is more fleshed out (don't send duplicate notifications in a session)
-        return
+#if false
         let lspLanguageTitle = lspLanguage.rawValue.capitalized
         let notificationTitle = "Install \(lspLanguageTitle) Language Server"
         // Make sure the user doesn't have the same existing notification
@@ -354,6 +354,7 @@ extension LSPService {
             // This will always read the default value and will not update
             self?.openWindow(sceneID: .settings)
         }
+#endif
     }
 }
 

CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorOutlineView.swift

@@ -93,14 +93,13 @@ struct ProjectNavigatorOutlineView: NSViewControllerRepresentable {
             if outlineView.window?.firstResponder !== outlineView
                 && outlineView.window?.firstResponder is NSTextView
                 && (outlineView.window?.firstResponder as? NSView)?.isDescendant(of: outlineView) == true {
-                // Find the cell being edited by traversing up from the text view
-                var currentView = outlineView.window?.firstResponder as? NSView
                 capturedSelectionRange = (outlineView.window?.firstResponder as? NSTextView)?.selectedRange
 
+                // Find the cell being edited by traversing up from the text view
+                var currentView = outlineView.window?.firstResponder as? NSView
                 while let view = currentView {
                     if let cell = view as? ProjectNavigatorTableViewCell,
-                       let fileItem = cell.fileItem,
-                       fileItem.phantomFile != nil {
+                       let fileItem = cell.fileItem, fileItem.phantomFile != nil {
                         editingPhantomFile = fileItem
                         capturedText = cell.textField?.stringValue
                         break
@@ -114,33 +113,32 @@ struct ProjectNavigatorOutlineView: NSViewControllerRepresentable {
                 outlineView.reloadItem(item, reloadChildren: true)
             }
 
+            // Restore selected items where the files still exist.
+            let selectedIndexes = selectedRows.compactMap({ outlineView.row(forItem: $0) }).filter({ $0 >= 0 })
+            controller?.shouldSendSelectionUpdate = false
+            outlineView.selectRowIndexes(IndexSet(selectedIndexes), byExtendingSelection: false)
+            controller?.shouldSendSelectionUpdate = true
+
             // If we were editing a phantom file, restore the text field and focus
             if let phantomFile = editingPhantomFile, let text = capturedText {
                 let row = outlineView.row(forItem: phantomFile)
-                if row >= 0,
-                   let cell = outlineView.view(
+                if row >= 0, let cell = outlineView.view(
                     atColumn: 0,
                     row: row,
                     makeIfNecessary: false
-                   ) as? ProjectNavigatorTableViewCell {
+                ) as? ProjectNavigatorTableViewCell {
                     cell.textField?.stringValue = text
                     outlineView.window?.makeFirstResponder(cell.textField)
                     if let selectionRange = capturedSelectionRange {
                         cell.textField?.currentEditor()?.selectedRange = selectionRange
                     }
                 }
-            }
-
-            // Restore selected items where the files still exist.
-            let selectedIndexes = selectedRows.compactMap({ outlineView.row(forItem: $0) }).filter({ $0 >= 0 })
-            controller?.shouldSendSelectionUpdate = false
-            outlineView.selectRowIndexes(IndexSet(selectedIndexes), byExtendingSelection: false)
-            controller?.shouldSendSelectionUpdate = true
-
-            // Reselect the file that is currently active in the editor so it still appears highlighted
-            if outlineView.selectedRowIndexes.isEmpty,
-               let activeFileID = workspace?.editorManager?.activeEditor.selectedTab?.file.id {
-                controller?.updateSelection(itemID: activeFileID)
+            } else {
+                // Reselect the file that is currently active in the editor so it still appears highlighted
+                if selectedIndexes.isEmpty,
+                   let activeFileID = workspace?.editorManager?.activeEditor.selectedTab?.file.id {
+                    controller?.updateSelection(itemID: activeFileID)
+                }
             }
         }
 

CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorViewController+OutlineTableViewCellDelegate.swift

@@ -40,7 +40,5 @@ extension ProjectNavigatorViewController: OutlineTableViewCellDelegate {
         }
     }
 
-    func cellDidFinishEditing() {
-        outlineView.reloadData()
-    }
+    func cellDidFinishEditing() { }
 }