Merge remote-tracking branch 'origin/staging'

VsVim · Mar 28, 2014 · 86d9e29 · 86d9e29
2 parents 8c98a55 + 5b8743d
commit 86d9e29
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/Src/VimCore/Constants.fs b/Src/VimCore/Constants.fs
@@ -27,10 +27,10 @@ module Constants =
 
 #if DEBUG
     [<Literal>]
-    let VersionNumber = "1.6.0.1 Debug"
+    let VersionNumber = "1.6.0.2 Debug"
 #else
     [<Literal>]
-    let VersionNumber = "1.6.0.1"
+    let VersionNumber = "1.6.0.2"
 #endif
 
 
diff --git a/Src/VimCore/Modes_Normal_NormalMode.fs b/Src/VimCore/Modes_Normal_NormalMode.fs
@@ -350,7 +350,7 @@ type internal NormalMode
         x.Reset()
 
         // Ensure the caret is positioned correctly vis a vis virtual edit
-        if not (TextViewUtil.GetCaretPoint(_operations.TextView).Position = 0) then
+        if not _textView.IsClosed && not (TextViewUtil.GetCaretPoint(_textView).Position = 0) then
             _operations.EnsureAtCaret ViewFlags.VirtualEdit
 
         // Process the argument if it's applicable

diff --git a/Src/VsVim/source.extension.vsixmanifest b/Src/VsVim/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
   <Identifier Id="VsVim.Microsoft.e214908b-0458-4ae2-a583-4310f29687c3">
     <Name>VsVim</Name>
     <Author>Jared Parsons</Author>
-    <Version>1.6.0.1</Version>
+    <Version>1.6.0.2</Version>
     <Description xml:space="preserve">VIM emulation layer for Visual Studio</Description>
     <Locale>1033</Locale>
     <MoreInfoUrl>http://blogs.msdn.com/b/jaredpar</MoreInfoUrl>

diff --git a/Test/VimCoreTest/CommandModeIntegrationTest.cs b/Test/VimCoreTest/CommandModeIntegrationTest.cs
@@ -1113,6 +1113,14 @@ public void Replace_GoToLastEditPosition()
                 Assert.Equal(1, _textView.Caret.Position.BufferPosition.GetColumn().Column);
                 Assert.Equal(1, _textView.GetCaretLine().LineNumber);
             }
+
+            [Fact]
+            public void Issue1327()
+            {
+                Create("cat", "dog");
+                _textView.MoveCaretTo(3);
+                RunCommand("wq");
+            }
         }
     }
 }
diff --git a/Test/VimCoreTest/Mock/MockVimHost.cs b/Test/VimCoreTest/Mock/MockVimHost.cs
@@ -123,6 +123,7 @@ string IVimHost.GetName(ITextBuffer textBuffer)
         void IVimHost.Close(ITextView textView)
         {
             LastClosed = textView;
+            textView.Close();
         }
 
         ITextView IVimHost.CreateHiddenTextView()

diff --git a/Test/VimCoreTest/VimBufferFactoryIntegrationTest.cs b/Test/VimCoreTest/VimBufferFactoryIntegrationTest.cs
@@ -71,6 +71,7 @@ public void TextViewDelayInitialize()
                 var textView = MockObjectFactory.CreateTextView(textBuffer);
                 textView.SetupGet(x => x.TextViewLines).Returns((ITextViewLineCollection)null);
                 textView.SetupGet(x => x.Caret.Position).Returns(new CaretPosition());
+                textView.SetupGet(x => x.IsClosed).Returns(false);
                 var vimTextBuffer = _vimBufferFactory.CreateVimTextBuffer(textBuffer, _vim);
                 var vimBuffer = _vimBufferFactory.CreateVimBuffer(textView.Object, vimTextBuffer);
                 Assert.Equal(ModeKind.Uninitialized, vimBuffer.ModeKind);