Replace ActivateItem with open/diff file ommands.

Author: grokys

src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs

@@ -76,6 +76,7 @@ public PullRequestDetailViewModelDesigner()
         public ReactiveCommand<object> ActivateItem { get; }
         public ReactiveCommand<object> ToggleChangedFilesView { get; }
         public ReactiveCommand<object> ToggleOpenChangedFileAction { get; }
-        public ReactiveCommand<object> ViewOpenFile { get; }
+        public ReactiveCommand<object> OpenFile { get; }
+        public ReactiveCommand<object> DiffFile { get; }
     }
 }

src/GitHub.App/ViewModels/PullRequestDetailViewModel.cs

@@ -97,8 +97,6 @@ public PullRequestDetailViewModel(
             Checkout = ReactiveCommand.CreateAsyncObservable(canCheckout, DoCheckout);
 
             OpenOnGitHub = ReactiveCommand.Create();
-            ActivateItem = ReactiveCommand.Create();
-            ActivateItem.Subscribe(x => DoOpenFile((IPullRequestFileViewModel)x));
 
             ToggleChangedFilesView = ReactiveCommand.Create();
             ToggleChangedFilesView.Subscribe(_ =>
@@ -114,7 +112,8 @@ public PullRequestDetailViewModel(
                     OpenChangedFileAction.Open : OpenChangedFileAction.Diff;
             });
 
-            ViewOpenFile = ReactiveCommand.Create();
+            OpenFile = ReactiveCommand.Create();
+            DiffFile = ReactiveCommand.Create();
         }
 
         /// <summary>
@@ -273,16 +272,6 @@ public string CheckoutDisabledMessage
         /// </summary>
         public ReactiveCommand<object> OpenOnGitHub { get; }
 
-        /// <summary>
-        /// Gets a command that opens the specified file according to <see cref="ChangedFilesView"/>.
-        /// </summary>
-        /// <remarks>
-        /// An <see cref="IPullRequestFileViewModel"/> should be passed as the parameter to this command's
-        /// Execute method. It triggers <see cref="ViewOpenFile"/> or <see cref="ViewCompareFiles"/> which
-        /// should be handled by the view to implement opening or comparing the file.
-        /// </remarks>
-        public ReactiveCommand<object> ActivateItem { get; }
-
         /// <summary>
         /// Gets a command that toggles the <see cref="ChangedFilesView"/> property.
         /// </summary>
@@ -294,12 +283,14 @@ public string CheckoutDisabledMessage
         public ReactiveCommand<object> ToggleOpenChangedFileAction { get; }
 
         /// <summary>
-        /// Gets a command that informs the view that the specified file should be opened.
+        /// Gets a command that opens a <see cref="IPullRequestFileViewModel"/>.
+        /// </summary>
+        public ReactiveCommand<object> OpenFile { get; }
+ 
+        /// <summary>
+        /// Gets a command that diffs a <see cref="IPullRequestFileViewModel"/>.
         /// </summary>
-        /// <remarks>
-        /// The parameter passed is a string detailing the full path to the file.
-        /// </remarks>
-        public ReactiveCommand<object> ViewOpenFile { get; }
+        public ReactiveCommand<object> DiffFile { get; }
 
         /// <summary>
         /// Initializes the view model with new data.
@@ -513,12 +504,5 @@ IObservable<Unit> DoCheckout(object unused)
                 return Observable.Empty<Unit>();
             });
         }
-
-        void DoOpenFile(IPullRequestFileViewModel x)
-        {
-            // TODO: Handle diffing files accoring to OpenChangedFileAction and getting a file from another branch etc.
-            var fullPath = Path.Combine(repository.LocalPath, x.Path, x.FileName);
-            ViewOpenFile.Execute(fullPath);
-        }
     }
 }

src/GitHub.Exports.Reactive/ViewModels/IPullRequestDetailViewModel.cs

@@ -176,16 +176,6 @@ public interface IPullRequestDetailViewModel : IViewModel, IHasBusy
         /// </summary>
         ReactiveCommand<object> OpenOnGitHub { get; }
 
-        /// <summary>
-        /// Gets a command that opens the specified file according to <see cref="ChangedFilesView"/>.
-        /// </summary>
-        /// <remarks>
-        /// An <see cref="IPullRequestFileViewModel"/> should be passed as the parameter to this command's
-        /// Execute method. It triggers <see cref="ViewOpenFile"/> or <see cref="ViewCompareFiles"/> which
-        /// should be handled by the view to implement opening or comparing the file.
-        /// </remarks>
-        ReactiveCommand<object> ActivateItem { get; }
-
         /// <summary>
         /// Gets a command that toggles the <see cref="ChangedFilesView"/> property.
         /// </summary>
@@ -197,11 +187,13 @@ public interface IPullRequestDetailViewModel : IViewModel, IHasBusy
         ReactiveCommand<object> ToggleOpenChangedFileAction { get; }
 
         /// <summary>
-        /// Gets a command that informs the view that the specified file should be opened.
+        /// Gets a command that opens a <see cref="IPullRequestFileViewModel"/>.
+        /// </summary>
+        ReactiveCommand<object> OpenFile { get; }
+
+        /// <summary>
+        /// Gets a command that diffs a <see cref="IPullRequestFileViewModel"/>.
         /// </summary>
-        /// <remarks>
-        /// The parameter passed is a string detailing the full path to the file.
-        /// </remarks>
-        ReactiveCommand<object> ViewOpenFile { get; }
+        ReactiveCommand<object> DiffFile { get; }
     }
 }

src/GitHub.VisualStudio/UI/Views/PullRequestDetailView.xaml.cs

@@ -40,7 +40,6 @@ public PullRequestDetailView()
             this.WhenActivated(d =>
             {
                 d(ViewModel.OpenOnGitHub.Subscribe(_ => DoOpenOnGitHub()));
-                d(ViewModel.ViewOpenFile.Subscribe(x => DoOpenFile((string)x)));
             });
 
             OpenChangesOptionsMenu = ReactiveCommand.Create();
@@ -111,18 +110,13 @@ void DoOpenChangesOptionsMenu(dynamic o)
             menu.IsOpen = true;
         }
 
-        void DoOpenFile(string fileName)
-        {
-            Services.Dte.ItemOperations.OpenFile(fileName);
-        }
-
         private void FileListMouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
             var file = (e.OriginalSource as FrameworkElement)?.DataContext as IPullRequestFileViewModel;
 
             if (file != null)
             {
-                ViewModel.ActivateItem.Execute(file);
+                // TODO: Implement open/diff.
             }
         }
     }