Merge pull request #1464 from xdaDaveShaw/unittest-fixes

Unittest fixes

Author: cloudRoutine

src/FSharp.Editing.VisualStudio/Navigation/GoToDefinitionFilter.fs

@@ -3,7 +3,6 @@
 open System
 open System.IO
 open System.Threading
-open System.Diagnostics
 open System.Text.RegularExpressions
 open Microsoft.Win32
 open Microsoft.VisualStudio
@@ -46,7 +45,8 @@ type GoToDefinitionFilter
         referenceSourceProvider: ReferenceSourceProvider,
         metadataService: NavigateToMetadataService,
         navigationPreference: NavigationPreference,
-        fireNavigationEvent: bool
+        fireNavigationEvent: bool,
+        processStart: System.Action<string>
     ) =
 
     let urlChanged = if fireNavigationEvent then Some (Event<UrlChangeEventArgs>()) else None
@@ -127,7 +127,7 @@ type GoToDefinitionFilter
             if fireNavigationEvent then
                 currentUrl <- Some url
                 urlChanged |> Option.iter (fun event -> event.Trigger(UrlChangeEventArgs(url)))
-            Process.Start(browserUrl) |> ignore)
+            processStart.Invoke(browserUrl) |> ignore)
 
     let tryFindSourceUrl (fsSymbol: FSharpSymbol) = 
         let changeExt ext path = Path.ChangeExtension(path, ext)
@@ -194,7 +194,7 @@ type GoToDefinitionFilter
                     if fireNavigationEvent then
                         currentUrl <- Some url
                         urlChanged |> Option.iter (fun event -> event.Trigger(UrlChangeEventArgs(url)))                                    
-                    Process.Start url |> ignore
+                    processStart.Invoke(url) |> ignore
                 | None ->
                     Logging.logWarning (fun _ -> sprintf "Can't find navigation information for %s." symbol.FullName)
             else

src/FSharpVSPowerTools/Commands/GotoDefinitionFilterProvider.cs

@@ -44,7 +44,7 @@ public class GoToDefinitionFilterProvider : IVsTextViewCreationListener, IWpfTex
         private readonly SolutionEvents _solutionEvents;
 
         private static readonly Type serviceType = typeof(GoToDefinitionFilterProvider);
-        
+
         [ImportingConstructor]
         public GoToDefinitionFilterProvider(
             [Import(typeof(SVsServiceProvider))] System.IServiceProvider serviceProvider,
@@ -83,29 +83,34 @@ public void VsTextViewCreated(IVsTextView textViewAdapter)
         {
             var textView = _editorFactory.GetWpfTextView(textViewAdapter);
             if (textView == null) return;
-            Register(textViewAdapter, textView, fireNavigationEvent: false);
+            Register(textViewAdapter, textView, fireNavigationEvent: false, processStart: ProcessStart);
+        }
+
+        private void ProcessStart(String path)
+        {
+            System.Diagnostics.Process.Start(path);
         }
 
-        internal GoToDefinitionFilter RegisterCommandFilter(IWpfTextView textView, bool fireNavigationEvent)
+        internal GoToDefinitionFilter RegisterCommandFilter(IWpfTextView textView, bool fireNavigationEvent, Action<String> processStart)
         {
             var textViewAdapter = _editorFactory.GetViewAdapter(textView);
-            return textViewAdapter == null ? null : Register(textViewAdapter, textView, fireNavigationEvent);
+            return textViewAdapter == null ? null : Register(textViewAdapter, textView, fireNavigationEvent, processStart);
         }
 
-        private GoToDefinitionFilter Register(IVsTextView textViewAdapter, IWpfTextView textView, bool fireNavigationEvent)
+        private GoToDefinitionFilter Register(IVsTextView textViewAdapter, IWpfTextView textView, bool fireNavigationEvent, Action<String> processStart)
         {
             var generalOptions = Setting.getGeneralOptions(_serviceProvider);
             if (generalOptions == null || (!generalOptions.GoToMetadataEnabled && !generalOptions.GoToSymbolSourceEnabled)) return null;
             // Favor Navigate to Source feature over Go to Metadata
             var preference = generalOptions.GoToSymbolSourceEnabled
-                                ? (generalOptions.GoToMetadataEnabled ? NavigationPreference.SymbolSourceOrMetadata : NavigationPreference.SymbolSource) 
+                                ? (generalOptions.GoToMetadataEnabled ? NavigationPreference.SymbolSourceOrMetadata : NavigationPreference.SymbolSource)
                                 : NavigationPreference.Metadata;
             ITextDocument doc;
             if (_textDocumentFactoryService.TryGetTextDocument(textView.TextBuffer, out doc))
             {
                 var commandFilter = new GoToDefinitionFilter(doc, textView, _fsharpVsLanguageService,
                                                              _serviceProvider, _projectFactory, _referenceSourceProvider,
-                                                             _navigationService, preference, fireNavigationEvent);
+                                                             _navigationService, preference, fireNavigationEvent, processStart);
                 if (!_referenceSourceProvider.IsActivated && generalOptions.GoToSymbolSourceEnabled)
                     _referenceSourceProvider.Activate();
                 textView.Properties.AddProperty(serviceType, commandFilter);

tests/FSharp.Editing.VisualStudio.Tests/GoToDefinitionFilterCommandTests.fs

@@ -24,8 +24,11 @@ type GoToDefinitionCommandHelper() =
                 metadataService = Unchecked.defaultof<_>
             )
 
+    let stubProcessStart =
+        Action<string> (fun _ -> ())
+
     member __.GetCommandFilter(wpfTextView) =
-        command.RegisterCommandFilter(wpfTextView, fireNavigationEvent = true)
+        command.RegisterCommandFilter(wpfTextView, fireNavigationEvent = true, processStart = stubProcessStart)
 
 module GoToDefinitionCommandTests =
 

tests/FSharp.Editing.VisualStudio.Tests/HighlightUsageTaggerTests.fs

@@ -200,7 +200,6 @@ module Test =
 """
         let projectFileName = fullPathBasedOnSourceDir "../data/MultiProjects/Project2/Project2.fsproj"
         let fileName = fullPathBasedOnSourceDir "../data/MultiProjects/Project2/Project21.fs"
-        File.WriteAllText (fileName, "")
         let buffer = createMockTextBuffer "" fileName
         helper.SetUpProjectAndCurrentDocument(ExternalProjectProvider(projectFileName), fileName, "")
         let view = helper.GetView(buffer)