UI tweaks for ExtractInterface refactoring to work with transient viewmodel correctly. Removed the InterfaceMemberViewModel to simplify the binding and update the refactoring to work off the selection, rather than assuming that all members are used.

bclothier · bclothier · commit f58113cd080f · 2018-12-28T16:55:14.000-06:00
diff --git a/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceView.xaml b/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceView.xaml
@@ -95,7 +95,7 @@
                         <ColumnDefinition Width="auto" />
                     </Grid.ColumnDefinitions>
 
-                    <DataGrid ItemsSource="{Binding Members}"
+                    <DataGrid ItemsSource="{Binding Members, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                               Grid.Column="0"
                               HorizontalAlignment="Stretch"
                               AutoGenerateColumns="False"
@@ -122,7 +122,7 @@
                         </DataGrid.CellStyle>
                         <DataGrid.Columns>
                             <DataGridCheckBoxColumn Width="Auto"
-                                                    Binding="{Binding IsSelected}" />
+                                                    Binding="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                             <DataGridTextColumn Binding="{Binding FullMemberSignature}"
                                                 Width="*"
                                                 IsReadOnly="True"
diff --git a/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceViewModel.cs b/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceViewModel.cs
@@ -1,12 +1,12 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using NLog;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Refactorings.ExtractInterface;
 using Rubberduck.UI.Command;
-using Rubberduck.UI.Refactorings.ExtractInterface;
 
 namespace Rubberduck.UI.Refactorings
 {
@@ -22,23 +22,14 @@ public ExtractInterfaceViewModel(ExtractInterfaceModel model) : base(model)
                 .Where(moduleDeclaration => moduleDeclaration.ProjectId == Model.TargetDeclaration.ProjectId)
                 .Select(module => module.ComponentName)
                 .ToList();
-            _members = Model.Members.Select(m => m.ToViewModel()).ToList();
-            UpdateModelMembers();
         }
 
-        private void UpdateModelMembers()
+        public ObservableCollection<InterfaceMember> Members
         {
-            Model.Members = _members.Where(m => m.IsSelected).Select(vm => vm.ToModel()).ToList();
-        }
-
-        private List<InterfaceMemberViewModel> _members;
-        public List<InterfaceMemberViewModel> Members
-        {
-            get => _members;
+            get => Model.Members;
             set
             {
-                _members = value;
-                UpdateModelMembers();
+                Model.Members = value;
                 OnPropertyChanged();
             }
         }
@@ -76,7 +67,7 @@ private void ToggleSelection(bool value)
             {
                 item.IsSelected = value;
             }
-            UpdateModelMembers();
+            OnPropertyChanged(nameof(Members));
         }
 
         public CommandBase SelectAllCommand { get; }
diff --git a/Rubberduck.Core/UI/Refactorings/ExtractInterface/InterfaceMemberViewModel.cs b/Rubberduck.Core/UI/Refactorings/ExtractInterface/InterfaceMemberViewModel.cs
diff --git a/Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceModel.cs b/Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceModel.cs
@@ -1,4 +1,5 @@
 ﻿using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
@@ -13,7 +14,9 @@ public class ExtractInterfaceModel
 
         public string InterfaceName { get; set; }
 
-        public IEnumerable<InterfaceMember> Members { get; set; } = new List<InterfaceMember>();
+        public ObservableCollection<InterfaceMember> Members { get; set; } = new ObservableCollection<InterfaceMember>();
+
+        public IEnumerable<InterfaceMember> SelectedMembers => Members.Where(m => m.IsSelected);
 
         private static readonly DeclarationType[] ModuleTypes =
         {
@@ -47,14 +50,15 @@ public ExtractInterfaceModel(RubberduckParserState state, QualifiedSelection sel
 
             InterfaceName = $"I{TargetDeclaration.IdentifierName}";
 
-            Members = declarations.Where(item => item.ProjectId == TargetDeclaration.ProjectId
-                                                 && item.ComponentName == TargetDeclaration.ComponentName
-                                                 && (item.Accessibility == Accessibility.Public || item.Accessibility == Accessibility.Implicit)
-                                                 && MemberTypes.Contains(item.DeclarationType))
-                                   .OrderBy(o => o.Selection.StartLine)
-                                   .ThenBy(t => t.Selection.StartColumn)
-                                   .Select(d => new InterfaceMember(d))
-                                   .ToList();
+            Members = new ObservableCollection<InterfaceMember>(declarations.Where(item =>
+                    item.ProjectId == TargetDeclaration.ProjectId
+                    && item.ComponentName == TargetDeclaration.ComponentName
+                    && (item.Accessibility == Accessibility.Public || item.Accessibility == Accessibility.Implicit)
+                    && MemberTypes.Contains(item.DeclarationType))
+                .OrderBy(o => o.Selection.StartLine)
+                .ThenBy(t => t.Selection.StartColumn)
+                .Select(d => new InterfaceMember(d))
+                .ToList());
         }
     }
 }
diff --git a/Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs b/Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.Linq;
 using NLog;
 using Rubberduck.Interaction;
@@ -175,12 +174,12 @@ private void AddInterfaceClass(Declaration implementingClass, string interfaceNa
         private void AddInterfaceMembersToClass(IModuleRewriter rewriter)
         {
             var implementInterfaceRefactoring = new ImplementInterfaceRefactoring(_vbe, _model.State, _messageBox, _rewritingManager);
-            implementInterfaceRefactoring.Refactor(_model.Members.Select(m => m.Member).ToList(), rewriter, _model.InterfaceName);
+            implementInterfaceRefactoring.Refactor(_model.SelectedMembers.Select(m => m.Member).ToList(), rewriter, _model.InterfaceName);
         }
 
         private string GetInterfaceModuleBody()
         {
-            return string.Join(Environment.NewLine, _model.Members.Select(m => m.Body));
+            return string.Join(Environment.NewLine, _model.SelectedMembers.Select(m => m.Body));
         }
     }
 }
diff --git a/Rubberduck.Refactorings/ExtractInterface/InterfaceMember.cs b/Rubberduck.Refactorings/ExtractInterface/InterfaceMember.cs
@@ -1,9 +1,10 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
-using Rubberduck.UI;
 
 namespace Rubberduck.Refactorings.ExtractInterface
 {
@@ -19,14 +20,24 @@ public override string ToString()
         }
     }
 
-    public class InterfaceMember
+    public class InterfaceMember : INotifyPropertyChanged
     {
         public Declaration Member { get; }
         public IEnumerable<Parameter> MemberParams { get; }
         private string Type { get; }
-
         private string MemberType { get; set; }
 
+        private bool _isSelected;
+        public bool IsSelected
+        {
+            get => _isSelected;
+            set
+            {
+                _isSelected = value;
+                OnPropertyChanged();
+            }
+        }
+
         public string Identifier { get; }
 
         public string FullMemberSignature
@@ -103,5 +114,11 @@ private void GetMethodType()
         }
 
         public string Body => string.Format("Public {0}{1}End {2}{1}", FullMemberSignature, Environment.NewLine, MemberType.Split(' ').First());
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
     }
 }
diff --git a/RubberduckTests/Refactoring/ExtractInterfaceTests.cs b/RubberduckTests/Refactoring/ExtractInterfaceTests.cs
@@ -1,3 +1,4 @@
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows.Forms;
 using NUnit.Framework;
@@ -250,7 +251,8 @@ End Function
 
                 //Specify Params to remove
                 var model = new ExtractInterfaceModel(state, qualifiedSelection);
-                model.Members = model.Members.Where(member => !member.FullMemberSignature.Contains("Property")).ToList();
+                model.Members = new ObservableCollection<InterfaceMember>(model.Members
+                    .Where(member => !member.FullMemberSignature.Contains("Property")).ToList());
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -392,7 +394,7 @@ End Sub
 
                 //Specify Params to remove
                 var model = new ExtractInterfaceModel(state, qualifiedSelection);
-                model.Members = new[]{ model.Members.ElementAt(0) }.ToList();
+                model.Members = new ObservableCollection<InterfaceMember>(new[] {model.Members.ElementAt(0)}.ToList());
 
                 //SetupFactory
                 var factory = SetupFactory(model);

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using System.Collections.ObjectModel;`
`3`	`4`	`using System.Linq;`
`4`	`5`	`using NLog;`
`5`	`6`	`using Rubberduck.Parsing.Grammar;`
`6`	`7`	`using Rubberduck.Parsing.Symbols;`
`7`	`8`	`using Rubberduck.Refactorings.ExtractInterface;`
`8`	`9`	`using Rubberduck.UI.Command;`
`9`		`-using Rubberduck.UI.Refactorings.ExtractInterface;`
`10`	`10`
`11`	`11`	`namespace Rubberduck.UI.Refactorings`
`12`	`12`	`{`
`@@ -22,23 +22,14 @@ public ExtractInterfaceViewModel(ExtractInterfaceModel model) : base(model)`
`22`	`22`	`.Where(moduleDeclaration => moduleDeclaration.ProjectId == Model.TargetDeclaration.ProjectId)`
`23`	`23`	`.Select(module => module.ComponentName)`
`24`	`24`	`.ToList();`
`25`		`- _members = Model.Members.Select(m => m.ToViewModel()).ToList();`
`26`		`- UpdateModelMembers();`
`27`	`25`	`}`
`28`	`26`
`29`		`- private void UpdateModelMembers()`
	`27`	`+ public ObservableCollection<InterfaceMember> Members`
`30`	`28`	`{`
`31`		`- Model.Members = _members.Where(m => m.IsSelected).Select(vm => vm.ToModel()).ToList();`
`32`		`- }`
`33`		`-`
`34`		`- private List<InterfaceMemberViewModel> _members;`
`35`		`- public List<InterfaceMemberViewModel> Members`
`36`		`- {`
`37`		`- get => _members;`
	`29`	`+ get => Model.Members;`
`38`	`30`	`set`
`39`	`31`	`{`
`40`		`- _members = value;`
`41`		`- UpdateModelMembers();`
	`32`	`+ Model.Members = value;`
`42`	`33`	`OnPropertyChanged();`
`43`	`34`	`}`
`44`	`35`	`}`
`@@ -76,7 +67,7 @@ private void ToggleSelection(bool value)`
`76`	`67`	`{`
`77`	`68`	`item.IsSelected = value;`
`78`	`69`	`}`
`79`		`- UpdateModelMembers();`
	`70`	`+ OnPropertyChanged(nameof(Members));`
`80`	`71`	`}`
`81`	`72`
`82`	`73`	`public CommandBase SelectAllCommand { get; }`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`	`2`	`using System.Linq;`
`4`	`3`	`using NLog;`
`5`	`4`	`using Rubberduck.Interaction;`
`@@ -175,12 +174,12 @@ private void AddInterfaceClass(Declaration implementingClass, string interfaceNa`
`175`	`174`	`private void AddInterfaceMembersToClass(IModuleRewriter rewriter)`
`176`	`175`	`{`
`177`	`176`	`var implementInterfaceRefactoring = new ImplementInterfaceRefactoring(_vbe, _model.State, _messageBox, _rewritingManager);`
`178`		`- implementInterfaceRefactoring.Refactor(_model.Members.Select(m => m.Member).ToList(), rewriter, _model.InterfaceName);`
	`177`	`+ implementInterfaceRefactoring.Refactor(_model.SelectedMembers.Select(m => m.Member).ToList(), rewriter, _model.InterfaceName);`
`179`	`178`	`}`
`180`	`179`
`181`	`180`	`private string GetInterfaceModuleBody()`
`182`	`181`	`{`
`183`		`- return string.Join(Environment.NewLine, _model.Members.Select(m => m.Body));`
	`182`	`+ return string.Join(Environment.NewLine, _model.SelectedMembers.Select(m => m.Body));`
`184`	`183`	`}`
`185`	`184`	`}`
`186`	`185`	`}`