Fixed close tab and close window shortcut (#1381)

* Fixed close tab and close window shortcut

* Replace .hidden modifier with .opacity modifier

* Close current tab updates

* Removed unnecessary modifier

Author: FastestMolasses

CodeEdit/Features/Documents/Controllers/CodeEditWindowController.swift

@@ -299,6 +299,10 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
             }
         }
     }
+
+    @IBAction func closeCurrentTab(_ sender: Any) {
+        workspace?.tabManager.activeTabGroup.closeCurrentTab()
+    }
 }
 
 extension CodeEditWindowController {

CodeEdit/Features/Tabs/TabGroup/TabGroupData.swift

@@ -114,6 +114,15 @@ final class TabGroupData: ObservableObject, Identifiable {
         }
     }
 
+    /// Closes the currently opened tab in the tab group.
+    func closeCurrentTab() {
+        guard let selectedTab = selected else {
+            return
+        }
+
+        closeTab(item: selectedTab)
+    }
+
     /// Opens a tab in the tabgroup.
     /// If a tab for the item already exists, it is used instead.
     /// - Parameters:

CodeEdit/Features/Tabs/Views/TabBarItemView.swift

@@ -163,19 +163,6 @@ struct TabBarItemView: View {
             .padding(.horizontal, tabBarStyle == .native ? 28 : 23)
             .overlay {
                 ZStack {
-                    if isActive {
-                        // Close Tab Shortcut:
-                        // Using an invisible button to contain the keyboard shortcut is simply
-                        // because the keyboard shortcut has an unexpected bug when working with
-                        // custom buttonStyle. This is an workaround and it works as expected.
-                        Button(
-                            action: closeAction,
-                            label: { EmptyView() }
-                        )
-                        .frame(width: 0, height: 0)
-                        .keyboardShortcut("w", modifiers: [.command])
-                        .hidden()
-                    }
                     // Switch Tab Shortcut:
                     // Using an invisible button to contain the keyboard shortcut is simply
                     // because the keyboard shortcut has an unexpected bug when working with

CodeEdit/Features/WindowCommands/FileCommands.swift

@@ -37,12 +37,12 @@ struct FileCommands: Commands {
 
         CommandGroup(replacing: .saveItem) {
             Button("Close Tab") {
-                NSApp.sendAction(#selector(NSWindow.close), to: nil, from: nil)
+                NSApp.sendAction(#selector(CodeEditWindowController.closeCurrentTab(_:)), to: nil, from: nil)
             }
             .keyboardShortcut("w")
 
             Button("Close Editor") {
-
+                NSApp.sendAction(#selector(NSWindow.close), to: nil, from: nil)
             }
             .keyboardShortcut("w", modifiers: [.control, .shift, .command])