Merge pull request #3876 from Vogel612/refactor-carefully

retailcoder · web-flow · commit 53fc9dd07d8a · 2018-04-05T20:39:22.000-04:00
Minor tweaks
diff --git a/Rubberduck.Core/Refactorings/ExtractMethod/ExtractMethodSelectionValidation.cs b/Rubberduck.Core/Refactorings/ExtractMethod/ExtractMethodSelectionValidation.cs
@@ -65,7 +65,6 @@ public bool withinSingleProcedure(QualifiedSelection qualifiedSelection)
 
             return (procEnd as Declaration).QualifiedSelection.Equals((procStart as Declaration).QualifiedSelection)
                 && (procSignatureLastLine < startLine);
-
         }
     }
 }
diff --git a/Rubberduck.Core/UI/Command/AddTestModuleCommand.cs b/Rubberduck.Core/UI/Command/AddTestModuleCommand.cs
@@ -121,18 +121,16 @@ private string DeclarationFormatFor(string declarationFormat, string type, IUnit
 
         private IVBProject GetProject()
         {
-            using (var activeProject = _vbe.ActiveVBProject)
+            var activeProject = _vbe.ActiveVBProject;
+            if (!activeProject.IsWrappingNullReference)
             {
-                if (!activeProject.IsWrappingNullReference)
-                {
-                    return activeProject;
-                }
+                return activeProject;
             }
 
             using (var projects = _vbe.VBProjects)
             {
                 return projects.Count == 1
-                    ? projects[1]
+                    ? projects[1] // because VBA-Side indexing
                     : new VBProject(null);
             }
         }
diff --git a/Rubberduck.Core/UI/Command/Refactorings/CodePaneRefactorRenameCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/CodePaneRefactorRenameCommand.cs
@@ -33,7 +33,10 @@ protected override bool EvaluateCanExecute(object parameter)
                 target = _state.FindSelectedDeclaration(activePane);
             }
 
-            return _state.Status == ParserState.Ready && target != null && target.IsUserDefined;
+            return _state.Status == ParserState.Ready 
+                && target != null 
+                && target.IsUserDefined 
+                && !_state.IsNewOrModified(target.QualifiedModuleName);
         }
 
         protected override void OnExecute(object parameter)
diff --git a/Rubberduck.Core/UI/Command/Refactorings/FormDesignerRefactorRenameCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/FormDesignerRefactorRenameCommand.cs
@@ -24,7 +24,8 @@ public FormDesignerRefactorRenameCommand(IVBE vbe, RubberduckParserState state,
 
         protected override bool EvaluateCanExecute(object parameter)
         {
-            return _state.Status == ParserState.Ready && GetTarget() != null;
+            var target = GetTarget();
+            return _state.Status == ParserState.Ready && target != null && !_state.IsNewOrModified(target.QualifiedModuleName);
         }
 
         protected override void OnExecute(object parameter)
diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorEncapsulateFieldCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorEncapsulateFieldCommand.cs
@@ -33,11 +33,10 @@ protected override bool EvaluateCanExecute(object parameter)
 
                 target = _state.FindSelectedDeclaration(pane);
             }
-            var canExecute = target != null 
+            return target != null
                 && target.DeclarationType == DeclarationType.Variable
-                && !target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);
-
-            return canExecute;
+                && !target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member)
+                && !_state.IsNewOrModified(target.QualifiedModuleName);
         }
 
         protected override void OnExecute(object parameter)
diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorExtractInterfaceCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorExtractInterfaceCommand.cs
@@ -67,7 +67,9 @@ protected override bool EvaluateCanExecute(object parameter)
             var context = ((ParserRuleContext)parseTree).GetDescendents<VBAParser.ImplementsStmtContext>();
 
             // true if active code pane is for a class/document/form module
-            return !context.Any();
+            return !context.Any() 
+                && !_state.IsNewOrModified(interfaceClass.QualifiedModuleName) 
+                && !_state.IsNewOrModified(selection.Value.QualifiedName);
         }
 
         protected override void OnExecute(object parameter)
diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorExtractMethodCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorExtractMethodCommand.cs
@@ -25,11 +25,14 @@ protected override bool EvaluateCanExecute(object parameter)
         {
 
             var qualifiedSelection = Vbe.GetActiveSelection();
-
             if (!qualifiedSelection.HasValue)
             {
                 return false;
             }
+            if (_state.IsNewOrModified(qualifiedSelection.Value.QualifiedName))
+            {
+                return false;
+            }
 
             var allDeclarations = _state.AllDeclarations;
             var extractMethodValidation = new ExtractMethodSelectionValidation(allDeclarations);
diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorImplementInterfaceCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorImplementInterfaceCommand.cs
@@ -28,17 +28,18 @@ protected override bool EvaluateCanExecute(object parameter)
             var selection = Vbe.GetActiveSelection();        
 
             if (!selection.HasValue)
-                {
-                    return false;
-                }
-
-                var targetInterface = _state.AllUserDeclarations.FindInterface(selection.Value);
+            {
+                return false;
+            }
 
-                var targetClass = _state.AllUserDeclarations.SingleOrDefault(d =>
-                    d.DeclarationType == DeclarationType.ClassModule &&
-                    d.QualifiedSelection.QualifiedName.Equals(selection.Value.QualifiedName));
+            var targetInterface = _state.AllUserDeclarations.FindInterface(selection.Value);
+            
+            var targetClass = _state.DeclarationFinder.Members(selection.Value.QualifiedName)
+                .SingleOrDefault(declaration => declaration.DeclarationType == DeclarationType.ClassModule);
 
-                return targetInterface != null && targetClass != null;
+            return targetInterface != null && targetClass != null
+                && !_state.IsNewOrModified(targetInterface.QualifiedModuleName)
+                && !_state.IsNewOrModified(targetClass.QualifiedModuleName);
             
         }
 
diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorIntroduceFieldCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorIntroduceFieldCommand.cs
@@ -35,7 +35,9 @@ protected override bool EvaluateCanExecute(object parameter)
 
             var target = _state.AllUserDeclarations.FindVariable(selection.Value);
 
-            return target != null && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);
+            return target != null 
+                && !_state.IsNewOrModified(target.QualifiedModuleName)
+                && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);
         }
 
         protected override void OnExecute(object parameter)
diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorIntroduceParameterCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorIntroduceParameterCommand.cs
@@ -34,7 +34,9 @@ protected override bool EvaluateCanExecute(object parameter)
 
             var target = _state.AllUserDeclarations.FindVariable(selection.Value);
 
-            return target != null && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);
+            return target != null
+                && !_state.IsNewOrModified(target.QualifiedModuleName)
+                && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);
         }
 
         protected override void OnExecute(object parameter)
diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorMoveCloserToUsageCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorMoveCloserToUsageCommand.cs
@@ -30,6 +30,7 @@ protected override bool EvaluateCanExecute(object parameter)
 
                 var target = _state.FindSelectedDeclaration(activePane);
                 return target != null
+                       && !_state.IsNewOrModified(target.QualifiedModuleName)
                        && (target.DeclarationType == DeclarationType.Variable ||
                            target.DeclarationType == DeclarationType.Constant)
                        && target.References.Any();
diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorRemoveParametersCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorRemoveParametersCommand.cs
@@ -52,6 +52,10 @@ protected override bool EvaluateCanExecute(object parameter)
             {
                 return false;
             }
+            if (_state.IsNewOrModified(member.QualifiedModuleName))
+            {
+                return false;
+            }
 
             var parameters = _state.DeclarationFinder.UserDeclarations(DeclarationType.Parameter)
                 .Where(item => member.Equals(item.ParentScopeDeclaration))
diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorReorderParametersCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorReorderParametersCommand.cs
@@ -50,6 +50,10 @@ protected override bool EvaluateCanExecute(object parameter)
             {
                 return false;
             }
+            if (_state.IsNewOrModified(member.QualifiedModuleName))
+            {
+                return false;
+            }
 
             var parameters = _state.AllUserDeclarations.Where(item => item.DeclarationType == DeclarationType.Parameter && member.Equals(item.ParentScopeDeclaration)).ToList();
             var canExecute = (member.DeclarationType == DeclarationType.PropertyLet || member.DeclarationType == DeclarationType.PropertySet)
diff --git a/Rubberduck.Core/UI/RubberduckUI.Designer.cs b/Rubberduck.Core/UI/RubberduckUI.Designer.cs
diff --git a/Rubberduck.Core/UI/RubberduckUI.resx b/Rubberduck.Core/UI/RubberduckUI.resx
@@ -1812,4 +1812,7 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="Command_AddTestModule_Error" xml:space="preserve">
     <value>Unable to create test module. The host application may not allow for creation of new modules or the project may be locked. For details, check the log.</value>
   </data>
+  <data name="InspectionSettings_FilterDescription" xml:space="preserve">
+    <value>Filter by Description:</value>
+  </data>
 </root>
diff --git a/Rubberduck.Core/UI/Settings/InspectionSettings.xaml b/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
@@ -259,44 +259,42 @@
     <Grid>
         <ScrollViewer>
             <StackPanel Margin="5,5,5,0" ScrollViewer.VerticalScrollBarVisibility="Auto">
-                                    <Label Background="DarkGray"
+                <Label Background="DarkGray"
                        HorizontalContentAlignment="Stretch"
                        Margin="0,0,0,3">
-                        <Label.Style>
-                            <Style>
-                                <Style.Resources>
-                                    <Style TargetType="{x:Type Border}">
-                                        <Setter Property="CornerRadius" Value="5"/>
-                                    </Style>
-                                </Style.Resources>
-                            </Style>
-                        </Label.Style>
-                        <DockPanel Background="DarkGray" FlowDirection="LeftToRight">
-                            <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
-                                <Label Foreground="White"
-                                   FontWeight="SemiBold" 
-                                   Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeInspectionSettings_InspectionSeveritySettingsLabel}">
-                                </Label>
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal" DockPanel.Dock="Right">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition MaxWidth="75"/>
-                                        <ColumnDefinition MaxWidth="75"/>
-                                    </Grid.ColumnDefinitions>
-                                    <controls:LinkButton Grid.Column="1" Margin="2"
-                                                         Command="{Binding ImportButtonCommand}"
-                                                         Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ImportSettings}"/>
-                                    <controls:LinkButton Grid.Column="2" Margin="2"
-                                                         Command="{Binding ExportButtonCommand}"
-                                                         Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ExportSettings}"/>
-                            </Grid>
-                            </StackPanel>
-                        <StackPanel Orientation="Horizontal" DockPanel.Dock="Right">
-                            <Label Content="Description Filter"/>
-                            <TextBox MinWidth="75"
-                                     Text="{Binding InspectionSettingsFilter, UpdateSourceTrigger=PropertyChanged}"/>
+                    <Label.Style>
+                        <Style>
+                            <Style.Resources>
+                                <Style TargetType="{x:Type Border}">
+                                    <Setter Property="CornerRadius" Value="5"/>
+                                </Style>
+                            </Style.Resources>
+                        </Style>
+                    </Label.Style>
+                    <DockPanel Background="DarkGray" FlowDirection="LeftToRight">
+                        <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
+                            <Label Foreground="White"
+                                FontWeight="SemiBold" 
+                                Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeInspectionSettings_InspectionSeveritySettingsLabel}">
+                            </Label>
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" HorizontalAlignment="Left">
+                            <controls:LinkButton
+                                Margin="2"
+                                Command="{Binding ImportButtonCommand}"
+                                Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ImportSettings}"/>
+                            <controls:LinkButton
+                                Margin="2"
+                                Command="{Binding ExportButtonCommand}"
+                                Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ExportSettings}"/>
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" HorizontalAlignment="Stretch">
+                            <Label Foreground="White"
+                                FontWeight="SemiBold"
+                                Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=InspectionSettings_FilterDescription}" />
+                            <TextBox MinWidth="125"
+                                     Text="{Binding InspectionSettingsFilter, UpdateSourceTrigger=PropertyChanged}"
+                                     HorizontalAlignment="Stretch" />
                         </StackPanel>
                     </DockPanel>
                     </Label>  
diff --git a/Rubberduck.Core/UI/Settings/InspectionSettingsViewModel.cs b/Rubberduck.Core/UI/Settings/InspectionSettingsViewModel.cs
@@ -1,5 +1,7 @@
-﻿using System.Collections.Generic;
+﻿using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
 using System.Windows.Data;
 using NLog;
@@ -52,6 +54,17 @@ public string InspectionSettingsFilter
                 {
                     _inspectionSettingsFilter = value;
                     OnPropertyChanged(nameof(InspectionSettings));
+
+                    if (string.IsNullOrEmpty(value))
+                    {
+                        InspectionSettings.Filter = null;
+                    }
+                    else
+                    {
+                        InspectionSettings.Filter = item => (item as CodeInspectionSetting)?
+                            .Description.ToUpper()
+                            .Contains(value.ToUpper()) ?? true;
+                    }
                 }
             }
         }
@@ -61,14 +74,6 @@ public ListCollectionView InspectionSettings
         {
             get
             {
-                if (string.IsNullOrEmpty(_inspectionSettingsFilter))
-                {
-                    _inspectionSettings.Filter = null;
-                }
-                else
-                {
-                    _inspectionSettings.Filter = filter => FilterInspectionSettings(filter);
-                }
                 return _inspectionSettings;
             }
 
@@ -82,12 +87,6 @@ public ListCollectionView InspectionSettings
             }
         }
 
-        private bool FilterInspectionSettings(object filter)
-        {
-            var cis = filter as CodeInspectionSetting;
-            return cis.Description.ToUpper().Contains(_inspectionSettingsFilter.ToUpper());
-        }
-
         private bool _runInspectionsOnSuccessfulParse;
         public bool RunInspectionsOnSuccessfulParse
         {
diff --git a/Rubberduck.Core/UnitTesting/ProjectTestExtensions.cs b/Rubberduck.Core/UnitTesting/ProjectTestExtensions.cs
@@ -1,7 +1,6 @@
 ﻿using System.Runtime.InteropServices;
 using System.Reflection;
 using System.IO;
-using System.Linq;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UnitTesting
@@ -11,7 +10,9 @@ public static class ProjectTestExtensions
     {
         public static void EnsureReferenceToAddInLibrary(this IVBProject project)
         {
-            var assembly = Assembly.GetExecutingAssembly();
+            // FIXME should rely on the assembly containing the UnitTest components.
+            // Those are not necessarily the same.
+            var assembly = Assembly.GetEntryAssembly();
 
             var name = assembly.GetName().Name.Replace('.', '_');
             var referencePath = Path.ChangeExtension(assembly.Location, ".tlb");
diff --git a/RubberduckTests/Commands/UnitTestCommandTests.cs b/RubberduckTests/Commands/UnitTestCommandTests.cs
@@ -236,13 +236,10 @@ Private Assert As Object
         [Test]
         public void AddsTestModule()
         {
-            IVBComponent component;
-            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(string.Empty, out component);
-            var messageBox = new Mock<IMessageBox>();
-
+            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(string.Empty, out var component);
             using (var state = MockParser.CreateAndParse(vbe.Object))
             {
-
+                var messageBox = new Mock<IMessageBox>();
                 var settings = new Mock<ConfigurationLoader>(null, null, null, null, null, null, null);
                 var config = GetUnitTestConfig();
                 settings.Setup(x => x.LoadConfiguration()).Returns(config);
@@ -310,11 +307,8 @@ End Property
 
 Private Property Set PrivateProperty(s As String)
 End Property";
-
-            IVBComponent component;
-            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(code, out component);
-            var messageBox = new Mock<IMessageBox>();
-
+            
+            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(code, out var component);
             using (var state = MockParser.CreateAndParse(vbe.Object))
             {
                 var settings = new Mock<ConfigurationLoader>(null, null, null, null, null, null, null);
@@ -324,6 +318,7 @@ Private Property Set PrivateProperty(s As String)
                 var project = state.DeclarationFinder.FindProject("TestProject1");
                 var module = state.DeclarationFinder.FindStdModule("TestModule1", project);
 
+                var messageBox = new Mock<IMessageBox>();
                 var addTestModuleCommand = new AddTestModuleCommand(vbe.Object, state, settings.Object, messageBox.Object);
                 addTestModuleCommand.Execute(module);
 
@@ -345,7 +340,7 @@ Private Property Set PrivateProperty(s As String)
 
         private Configuration GetUnitTestConfig()
         {
-            var unitTestSettings = new UnitTestSettings(BindingMode.EarlyBinding, AssertMode.StrictAssert, false, false, false);
+            var unitTestSettings = new UnitTestSettings(BindingMode.LateBinding, AssertMode.StrictAssert, false, false, false);
 
             var userSettings = new UserSettings(null, null, null, null, unitTestSettings, null, null);
             return new Configuration(userSettings);
diff --git a/RubberduckTests/Refactoring/MoveCloserToUsageTests.cs b/RubberduckTests/Refactoring/MoveCloserToUsageTests.cs

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ public bool withinSingleProcedure(QualifiedSelection qualifiedSelection)`
`65`	`65`
`66`	`66`	`return (procEnd as Declaration).QualifiedSelection.Equals((procStart as Declaration).QualifiedSelection)`
`67`	`67`	`&& (procSignatureLastLine < startLine);`
`68`		`-`
`69`	`68`	`}`
`70`	`69`	`}`
`71`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,18 +121,16 @@ private string DeclarationFormatFor(string declarationFormat, string type, IUnit`
`121`	`121`
`122`	`122`	`private IVBProject GetProject()`
`123`	`123`	`{`
`124`		`- using (var activeProject = _vbe.ActiveVBProject)`
	`124`	`+ var activeProject = _vbe.ActiveVBProject;`
	`125`	`+ if (!activeProject.IsWrappingNullReference)`
`125`	`126`	`{`
`126`		`- if (!activeProject.IsWrappingNullReference)`
`127`		`- {`
`128`		`- return activeProject;`
`129`		`- }`
	`127`	`+ return activeProject;`
`130`	`128`	`}`
`131`	`129`
`132`	`130`	`using (var projects = _vbe.VBProjects)`
`133`	`131`	`{`
`134`	`132`	`return projects.Count == 1`
`135`		`- ? projects[1]`
	`133`	`+ ? projects[1] // because VBA-Side indexing`
`136`	`134`	`: new VBProject(null);`
`137`	`135`	`}`
`138`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,10 @@ protected override bool EvaluateCanExecute(object parameter)`
`33`	`33`	`target = _state.FindSelectedDeclaration(activePane);`
`34`	`34`	`}`
`35`	`35`
`36`		`- return _state.Status == ParserState.Ready && target != null && target.IsUserDefined;`
	`36`	`+ return _state.Status == ParserState.Ready`
	`37`	`+ && target != null`
	`38`	`+ && target.IsUserDefined`
	`39`	`+ && !_state.IsNewOrModified(target.QualifiedModuleName);`
`37`	`40`	`}`
`38`	`41`
`39`	`42`	`protected override void OnExecute(object parameter)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ public FormDesignerRefactorRenameCommand(IVBE vbe, RubberduckParserState state,`
`24`	`24`
`25`	`25`	`protected override bool EvaluateCanExecute(object parameter)`
`26`	`26`	`{`
`27`		`- return _state.Status == ParserState.Ready && GetTarget() != null;`
	`27`	`+ var target = GetTarget();`
	`28`	`+ return _state.Status == ParserState.Ready && target != null && !_state.IsNewOrModified(target.QualifiedModuleName);`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`protected override void OnExecute(object parameter)`
Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,10 @@ protected override bool EvaluateCanExecute(object parameter)`
`33`	`33`
`34`	`34`	`target = _state.FindSelectedDeclaration(pane);`
`35`	`35`	`}`
`36`		`- var canExecute = target != null`
	`36`	`+ return target != null`
`37`	`37`	`&& target.DeclarationType == DeclarationType.Variable`
`38`		`- && !target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);`
`39`		`-`
`40`		`- return canExecute;`
	`38`	`+ && !target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member)`
	`39`	`+ && !_state.IsNewOrModified(target.QualifiedModuleName);`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`protected override void OnExecute(object parameter)`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,9 @@ protected override bool EvaluateCanExecute(object parameter)`
`67`	`67`	`var context = ((ParserRuleContext)parseTree).GetDescendents<VBAParser.ImplementsStmtContext>();`
`68`	`68`
`69`	`69`	`// true if active code pane is for a class/document/form module`
`70`		`- return !context.Any();`
	`70`	`+ return !context.Any()`
	`71`	`+ && !_state.IsNewOrModified(interfaceClass.QualifiedModuleName)`
	`72`	`+ && !_state.IsNewOrModified(selection.Value.QualifiedName);`
`71`	`73`	`}`
`72`	`74`
`73`	`75`	`protected override void OnExecute(object parameter)`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,14 @@ protected override bool EvaluateCanExecute(object parameter)`
`25`	`25`	`{`
`26`	`26`
`27`	`27`	`var qualifiedSelection = Vbe.GetActiveSelection();`
`28`		`-`
`29`	`28`	`if (!qualifiedSelection.HasValue)`
`30`	`29`	`{`
`31`	`30`	`return false;`
`32`	`31`	`}`
	`32`	`+ if (_state.IsNewOrModified(qualifiedSelection.Value.QualifiedName))`
	`33`	`+ {`
	`34`	`+ return false;`
	`35`	`+ }`
`33`	`36`
`34`	`37`	`var allDeclarations = _state.AllDeclarations;`
`35`	`38`	`var extractMethodValidation = new ExtractMethodSelectionValidation(allDeclarations);`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,9 @@ protected override bool EvaluateCanExecute(object parameter)`
`35`	`35`
`36`	`36`	`var target = _state.AllUserDeclarations.FindVariable(selection.Value);`
`37`	`37`
`38`		`- return target != null && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);`
	`38`	`+ return target != null`
	`39`	`+ && !_state.IsNewOrModified(target.QualifiedModuleName)`
	`40`	`+ && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`protected override void OnExecute(object parameter)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,9 @@ protected override bool EvaluateCanExecute(object parameter)`
`34`	`34`
`35`	`35`	`var target = _state.AllUserDeclarations.FindVariable(selection.Value);`
`36`	`36`
`37`		`- return target != null && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);`
	`37`	`+ return target != null`
	`38`	`+ && !_state.IsNewOrModified(target.QualifiedModuleName)`
	`39`	`+ && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`protected override void OnExecute(object parameter)`