Force close tabs and add ZZ

nosami · Nov 16, 2018 · 2beb18b · 2beb18b
1 parent e552b5c
commit 2beb18b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 12 deletions.
diff --git a/XSVim/Addin.fs b/XSVim/Addin.fs
@@ -215,5 +215,6 @@ type XSVim() as this =
     member x.Escape() = ctrl "c"
 
     override x.Dispose() =
+        Vim.editorStates.Remove(fileName) |> ignore;
         base.Dispose()
         disposables |> List.iter(fun d -> d.Dispose())
diff --git a/XSVim/ExMode.fs b/XSVim/ExMode.fs
@@ -16,7 +16,6 @@ module exMode =
         | _ -> wait
 
     let save() = IdeApp.Workbench.ActiveDocument.Save() |> Async.AwaitTask
-    let forceClose() = IdeApp.Workbench.ActiveDocument.Window.CloseWindow true |> Async.AwaitTask |> Async.Ignore
 
     let (|DeleteBetweenMarks|_|) input =
         let matches = Regex.Matches(input, "'([a-z]),'([a-z])d", RegexOptions.Compiled)
@@ -84,9 +83,7 @@ module exMode =
                         Window.closeTab()
                         normalMode, resetKeys
                     | "q!"  ->
-                        async {
-                            do! forceClose()
-                        } |> Async.StartImmediate
+                        Window.forceCloseTab()
                         normalMode, resetKeys
                     | "w"
                     | "w!"  ->
@@ -121,7 +118,7 @@ module exMode =
                     | "wq!"  ->
                         async {
                             do! save()
-                            do! forceClose()
+                            Window.forceCloseTab()
                         } |> Async.StartImmediate
                         normalMode, resetKeys
                     | "vs"

diff --git a/XSVim/Properties/AssemblyInfo.fs b/XSVim/Properties/AssemblyInfo.fs
@@ -5,7 +5,7 @@ open System.Runtime.CompilerServices
 [<AutoOpen>]
 module AddinVersion =
     [<Literal>]
-    let version = "0.63.3"
+    let version = "0.64.0"
 
 [<assembly: AssemblyTitle("XSVim")>]
 // The assembly version has the format {Major}.{Minor}.{Build}.{Revision}

diff --git a/XSVim/WindowManagement.fs b/XSVim/WindowManagement.fs
@@ -20,6 +20,8 @@ module Window =
     let switchToNotebook notebook =
         openDocument notebook.tabs.[notebook.activeTab]
 
+    let forceClose() = IdeApp.Workbench.ActiveDocument.Window.CloseWindow true |> Async.AwaitTask |> Async.Ignore
+
     let getNotebooks() =
         let (dockNotebookContainer: obj seq) = IdeApp.Workbench?RootWindow?TabControl?Container?GetNotebooks()
         let getFiles notebook =
@@ -84,16 +86,26 @@ module Window =
         if notebooks.Length = 2 && notebooks.[0].isActive then
             switchToNotebook notebooks.[1]
 
-    let closeTab() =
-        let n = tryActiveInactiveNoteBooks()
-        match n with
+    let private closeTabWithForce force  =
+        let closeFunc() =
+            match force with
+            | true -> forceClose() |> Async.RunSynchronously
+            | false -> dispatch FileCommands.CloseFile
+
+        match tryActiveInactiveNoteBooks() with
         | Some active, Some inactive when active.tabs.Length = 1 ->
-            dispatch FileCommands.CloseFile
+            closeFunc()
             switchToNotebook inactive
         | Some active, _ when active.activeTab > 0 ->
-            dispatch FileCommands.CloseFile
+            closeFunc()
             openDocument active.tabs.[active.activeTab-1]
-        | _ -> dispatch FileCommands.CloseFile
+        | Some active, _ when active.activeTab = 0 && active.tabs.Length > 1 ->
+            closeFunc()
+            openDocument active.tabs.[1]
+        | _ -> closeFunc()
+
+    let closeTab() = closeTabWithForce false
+    let forceCloseTab() = closeTabWithForce true
 
     let gotoPad padId =
         IdeApp.Workbench.Pads

diff --git a/XSVim/XSVim.fs b/XSVim/XSVim.fs
@@ -1633,6 +1633,8 @@ module Vim =
             | VisualModes, [ ">" ] -> [ run (EditorFunc EditActions.IndentSelection) Nothing; switchMode NormalMode ]
             | VisualModes, [ "<" ] -> [ run (EditorFunc EditActions.UnIndentSelection) Nothing; switchMode NormalMode ]
             | VisualModes, [ "=" ] -> [ run EqualIndent SelectedText; switchMode NormalMode ]
+            | NotInsertMode, [ "Z" ] -> wait
+            | NotInsertMode, [ "Z"; "Z" ] -> [ func Window.closeTab ]
             | NotInsertMode, [ "<C-p>" ] -> [ dispatch SearchCommands.GotoFile ]
             | NotInsertMode, [ "<C-w>" ] -> wait
             | NotInsertMode, [ "<C-w>"; "w" ]