Close tab with x key

Because:
- This used to work in the old Safari extension

This commit:
- Closes the current Safari tab when the user presses x. The previous
implementation let the user pick whether to close the tab left or right.
For now, this implementation relies on Safari's default behaviour to
pick the left or right tab. This feels more 'Mac-like'.

Author: danielcompton

CHANGELOG.md

@@ -5,6 +5,7 @@ Changelog
 
 * Fix newTabHintToggle to use shift+f instead of F
 * Implement forward tab and backward tab commands.
+* Close tab with x is now implemented. Note that this relies on Safari's default behaviour to choose whether to switch to the left or right tab after closing the current tab.
 
 ### 2.0.2 (2019-09-23)
 

Vimari Extension/SafariExtensionHandler.swift

@@ -5,6 +5,7 @@ enum ActionType: String {
     case openNewTab
     case tabForward
     case tabBackward
+    case closeTab
 }
 
 enum TabDirection: String {
@@ -37,6 +38,8 @@ class SafariExtensionHandler: SFSafariExtensionHandler {
             changeTab(withDirection: .forward, from: page)
         case .tabBackward:
             changeTab(withDirection: .backward, from: page)
+        case .closeTab:
+            closeTab(from: page)
         }
     }
 
@@ -58,7 +61,7 @@ class SafariExtensionHandler: SFSafariExtensionHandler {
         }
     }
 
-    func changeTab(withDirection direction: TabDirection, from page: SFSafariPage) {
+    func changeTab(withDirection direction: TabDirection, from page: SFSafariPage, completionHandler: (() -> Void)? = nil ) {
         page.getContainingTab(completionHandler: { currentTab in
             currentTab.getContainingWindow(completionHandler: { window in
                 window?.getAllTabs(completionHandler: { tabs in
@@ -69,13 +72,21 @@ class SafariExtensionHandler: SFSafariExtensionHandler {
                         // % calculates the remainder, not the modulus, so we need a
                         // custom function.
                         let newIndex = mod(currentIndex + indexStep, tabs.count)
-
-                        tabs[newIndex].activate {}
+    
+                        tabs[newIndex].activate(completionHandler: completionHandler ?? {})
+                        
                     }
                 })
             })
         })
     }
+    
+    func closeTab(from page: SFSafariPage) {
+        page.getContainingTab {
+            tab in
+            tab.close()
+        }
+    }
 
     override func toolbarItemClicked(in _: SFSafariWindow) {
         // This method will be called when your toolbar item is clicked.

Vimari Extension/js/injected.js

@@ -67,7 +67,7 @@ var actionMap = {
 		function() { openNewTab(); },
 
 	'closeTab':
-		function() { safari.self.tab.dispatchMessage('closeTab', 0); },
+		function() { safari.extension.dispatchMessage("closeTab"); },
 
 	'closeTabReverse':
 		function() { safari.self.tab.dispatchMessage('closeTab', 1); },