Fix Mac composition error

VsVim · Jul 12, 2021 · 81ebfb1 · 81ebfb1
1 parent fdb81f4
commit 81ebfb1
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 6 deletions.
diff --git a/Src/VimCore/MefComponents.fs b/Src/VimCore/MefComponents.fs
@@ -487,17 +487,20 @@ type internal ProtectedOperations =
 type internal VimWordCompletionSessionFactoryService 
     [<ImportingConstructor>]
     (
-        _wordCompletionSessionFactory: IWordCompletionSessionFactory
+        [<Import(AllowDefault=true)>] _wordCompletionSessionFactory: IWordCompletionSessionFactory
     ) =
 
     let _created = StandardEvent<WordCompletionSessionEventArgs>()
 
     member x.CreateWordCompletionSession textView wordSpan words isForward =
-        match _wordCompletionSessionFactory.CreateWordCompletionSession textView wordSpan words isForward with
+        match OptionUtil.nullToOption _wordCompletionSessionFactory with
         | None -> None
-        | Some session -> 
-            _created.Trigger x (WordCompletionSessionEventArgs(session))
-            Some session
+        | Some factory ->
+            match factory.CreateWordCompletionSession textView wordSpan words isForward with
+            | None -> None
+            | Some session -> 
+                _created.Trigger x (WordCompletionSessionEventArgs(session))
+                Some session
 
     interface IWordCompletionSessionFactoryService with
         member x.CreateWordCompletionSession textView wordSpan words isForward = x.CreateWordCompletionSession textView wordSpan words isForward     

diff --git a/Src/VimEditorHost/VimEditorHost.cs b/Src/VimEditorHost/VimEditorHost.cs
@@ -69,8 +69,8 @@ public VimEditorHost(CompositionContainer compositionContainer)
             ContentTypeRegistryService = CompositionContainer.GetExportedValue<IContentTypeRegistryService>();
             ClassificationTypeRegistryService = CompositionContainer.GetExportedValue<IClassificationTypeRegistryService>();
             BasicUndoHistoryRegistry = CompositionContainer.GetExportedValue<IBasicUndoHistoryRegistry>();
-            Vim = CompositionContainer.GetExportedValue<IVim>();
             VimBufferFactory = CompositionContainer.GetExportedValue<IVimBufferFactory>();
+            Vim = CompositionContainer.GetExportedValue<IVim>();
             VimErrorDetector = CompositionContainer.GetExportedValue<IVimErrorDetector>();
             CommonOperationsFactory = CompositionContainer.GetExportedValue<ICommonOperationsFactory>();
             BufferTrackingService = CompositionContainer.GetExportedValue<IBufferTrackingService>();

diff --git a/Test/VimCoreTest/MacTest.cs b/Test/VimCoreTest/MacTest.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.Text;
+using Vim.EditorHost;
+using Vim.UI.Wpf.Implementation.Misc;
+using Vim.UnitTest;
+using Xunit;
+
+namespace VimCoreTest
+{
+    /// <summary>
+    /// Test that we don't break the Vim Mac implementation as much as possible until we can get
+    /// full Mac testing support https://github.com/VsVim/VsVim/issues/2907
+    /// </summary>
+    public sealed class MacTest
+    {
+        [WpfFact]
+        public void Composition()
+        {
+            var baseTypeFilter = VimTestBase.GetVimEditorHostTypeFilter(typeof(TestableVimHost));
+            Func<Type, bool> typeFilter = (type) =>
+            {
+                if (type.GetCustomAttributes(typeof(ExportAttribute), inherit: false).Length > 0)
+                {
+                    if (!baseTypeFilter(type))
+                    {
+                        return false;
+                    }
+
+                    if (type.FullName.StartsWith("Vim.UI.Wpf"))
+                    {
+                        if (type != typeof(DisplayWindowBrokerFactoryService) &&
+                            type != typeof(AlternateKeyUtil))
+                        {
+                            return false;
+                        }
+                    }
+                }
+
+                return true;
+            };
+
+            var factory = new VimEditorHostFactory(typeFilter);
+            var host = factory.CreateVimEditorHost();
+            var textView = host.CreateTextView("");
+            host.Vim.AutoLoadVimRc = false;
+            var vimBuffer = host.Vim.CreateVimBuffer(textView);
+            vimBuffer.Process("ihello Mac");
+            Assert.Equal("hello Mac", textView.TextBuffer.GetLineText(0));
+        }
+    }
+}
diff --git a/Test/VimCoreTest/VimCoreTest.projitems b/Test/VimCoreTest/VimCoreTest.projitems
@@ -65,6 +65,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)LineRangeTest.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)LocalSettingsTest.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)MacroIntegrationTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MacTest.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)MarkMapTest.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)MatchingTokenUtilTest.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)MatchUtil.cs" />