fixes keyhook/RTrim issue (#1665)

retailcoder · retailcoder · commit 8721c6c8afe1 · 2016-06-01T23:49:07.000-04:00
* added AsTypeName to the context-sensitive commandbar * clear built-in references at every resolution; fixed issue with null parse trees, given built-in modules get a module state instance. * fixed OverflowException in GetTypeName; built-in parameters now have return type info :) * returning built-in members now have return type info as well * removed hard-coded defaults in ClassModuleDeclaration * added IsBadReadPtr check in COM declarations collector * Implemented CanExecute in Project Explorer rename command * cleaned up FormDesignerRefactorRename command * fixed IOExceptions in QualifiedModuleName * use filename, not buildfilename * GetDisplayName being the part in parens, should be null when not applicable; made it private * renamed namespace Rubberduck.UI.CodeInspections to Rubberduck.UI.Inspections for consistency with Rubberduck.Inspections namespace * changed background color of bottom panel in CodeExplorer and InspectionResults toolwindows * fixed broken keybinding "Esc" -> "Escape" * added copy/export button to SearchView (todo: implement ExecuteCopyResultsCommand) * Revert "added copy/export button to SearchView (todo: implement ExecuteCopyResultsCommand)" This reverts commit e9946b7. * assert ProjectId isn't null * fixes #1664
diff --git a/RetailCoder.VBE/App.cs b/RetailCoder.VBE/App.cs
@@ -12,6 +12,7 @@
 using Rubberduck.UI.Command.MenuItems;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Runtime.InteropServices.ComTypes;
@@ -174,6 +175,8 @@ async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
             }
 
             var projectId = e.Item.HelpFile;
+            Debug.Assert(projectId != null);
+
             _componentsEventsSinks.Remove(projectId);
             _referencesEventsSinks.Remove(projectId);
             _parser.State.RemoveProject(e.Item);
diff --git a/RetailCoder.VBE/Common/RubberduckHooks.cs b/RetailCoder.VBE/Common/RubberduckHooks.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Windows.Forms;
 using System.Windows.Input;
 using Microsoft.Vbe.Interop;
 using Rubberduck.Common.Hotkeys;
@@ -106,9 +107,16 @@ private void Mouse_RawMouseInputReceived(object sender, RawMouseEventArgs e)
             }
         }
 
+        // keys that change the current selection.
+        private static readonly HashSet<Keys> NavKeys = new HashSet<Keys>
+        {
+            Keys.Up, Keys.Down, Keys.Left, Keys.Right, Keys.PageDown, Keys.PageUp, Keys.Enter
+        };
+
         private void Keyboard_RawKeyboardInputReceived(object sender, RawKeyEventArgs e)
         {
-            if (e.Message == WM.KEYUP)
+            // note: handling *all* keys causes annoying RTrim of current line, making editing code a PITA.
+            if (e.Message == WM.KEYUP && NavKeys.Contains((Keys)e.VKey))
             {
                 OnMessageReceived(this, HookEventArgs.Empty);
             }
diff --git a/RetailCoder.VBE/Root/RubberduckModule.cs b/RetailCoder.VBE/Root/RubberduckModule.cs
@@ -21,7 +21,7 @@
 using Rubberduck.SourceControl;
 using Rubberduck.UI;
 using Rubberduck.UI.CodeExplorer;
-using Rubberduck.UI.CodeInspections;
+using Rubberduck.UI.Inspections;
 using Rubberduck.UI.Command;
 using Rubberduck.UI.Command.MenuItems;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
diff --git a/RetailCoder.VBE/Rubberduck.csproj b/RetailCoder.VBE/Rubberduck.csproj
@@ -567,13 +567,13 @@
     <Compile Include="Navigation\CodeExplorer\CodeExplorerMemberViewModel.cs" />
     <Compile Include="Navigation\CodeExplorer\CodeExplorerProjectViewModel.cs" />
     <Compile Include="Navigation\CodeExplorer\CodeExplorerViewModel.cs" />
-    <Compile Include="UI\CodeInspections\InspectionDescriptionConverter.cs" />
-    <Compile Include="UI\CodeInspections\InspectionImageSourceConverter.cs" />
-    <Compile Include="UI\CodeInspections\InspectionResultsControl.xaml.cs">
+    <Compile Include="UI\Inspections\InspectionDescriptionConverter.cs" />
+    <Compile Include="UI\Inspections\InspectionImageSourceConverter.cs" />
+    <Compile Include="UI\Inspections\InspectionResultsControl.xaml.cs">
       <DependentUpon>InspectionResultsControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UI\CodeInspections\InspectionResultsViewModel.cs" />
-    <Compile Include="UI\CodeInspections\InspectionSeverityImageSourceConverter.cs" />
+    <Compile Include="UI\Inspections\InspectionResultsViewModel.cs" />
+    <Compile Include="UI\Inspections\InspectionSeverityImageSourceConverter.cs" />
     <Compile Include="UI\Command\AboutCommand.cs" />
     <Compile Include="UI\Command\AddTestMethodExpectedErrorCommand.cs" />
     <Compile Include="UI\Command\AddTestMethodCommand.cs" />
@@ -880,15 +880,15 @@
     <Compile Include="UI\CodeExplorer\CodeExplorerWindow.Designer.cs">
       <DependentUpon>CodeExplorerWindow.cs</DependentUpon>
     </Compile>
-    <Compile Include="UI\CodeInspections\CodeInspectionsDockablePresenter.cs" />
-    <Compile Include="UI\CodeInspections\CodeInspectionsWindow.cs">
+    <Compile Include="UI\Inspections\CodeInspectionsDockablePresenter.cs" />
+    <Compile Include="UI\Inspections\CodeInspectionsWindow.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="UI\CodeInspections\CodeInspectionsWindow.Designer.cs">
+    <Compile Include="UI\Inspections\CodeInspectionsWindow.Designer.cs">
       <DependentUpon>CodeInspectionsWindow.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\NavigateCodeEventArgs.cs" />
-    <Compile Include="UI\CodeInspections\QuickFixEventArgs.cs" />
+    <Compile Include="UI\Inspections\QuickFixEventArgs.cs" />
     <Compile Include="UI\DockableToolwindowPresenter.cs" />
     <Compile Include="Settings\Configuration.cs" />
     <Compile Include="Settings\ToDoListSettings.cs" />
@@ -992,7 +992,7 @@
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="UI\CodeInspections\CodeInspectionsWindow.resx">
+    <EmbeddedResource Include="UI\Inspections\CodeInspectionsWindow.resx">
       <DependentUpon>CodeInspectionsWindow.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="UI\Controls\SearchResultWindow.resx">
@@ -1484,7 +1484,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="UI\CodeInspections\InspectionResultsControl.xaml">
+    <Page Include="UI\Inspections\InspectionResultsControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml b/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml
@@ -714,7 +714,7 @@
             </ToolBar>
         </ToolBarTray>
 
-        <TreeView Grid.Row="1"
+        <TreeView Grid.Row="1" Background="White"
                   ItemContainerStyle="{StaticResource ShinyTreeView}"
                   HorizontalContentAlignment="Stretch"
                   MouseDoubleClick="TreeView_OnMouseDoubleClick"
@@ -730,7 +730,7 @@
 
         <Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="DimGray">
 
-            <StackPanel Orientation="Vertical" MinHeight="48" Background="Gainsboro">
+            <StackPanel Orientation="Vertical" MinHeight="48" Background="WhiteSmoke">
 
                 <Grid Margin="4" HorizontalAlignment="Stretch">
                     <Grid.ColumnDefinitions>
diff --git a/RetailCoder.VBE/UI/Inspections/CodeInspectionsDockablePresenter.cs b/RetailCoder.VBE/UI/Inspections/CodeInspectionsDockablePresenter.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.Vbe.Interop;
 
-namespace Rubberduck.UI.CodeInspections
+namespace Rubberduck.UI.Inspections
 {
     public class CodeInspectionsDockablePresenter : DockableToolwindowPresenter
     {
diff --git a/RetailCoder.VBE/UI/Inspections/CodeInspectionsWindow.Designer.cs b/RetailCoder.VBE/UI/Inspections/CodeInspectionsWindow.Designer.cs
diff --git a/RetailCoder.VBE/UI/Inspections/CodeInspectionsWindow.cs b/RetailCoder.VBE/UI/Inspections/CodeInspectionsWindow.cs
@@ -1,6 +1,6 @@
 ﻿using System.Windows.Forms;
 
-namespace Rubberduck.UI.CodeInspections
+namespace Rubberduck.UI.Inspections
 {
     public partial class CodeInspectionsWindow : UserControl, IDockableUserControl
     {
diff --git a/RetailCoder.VBE/UI/Inspections/CodeInspectionsWindow.resx b/RetailCoder.VBE/UI/Inspections/CodeInspectionsWindow.resx
diff --git a/RetailCoder.VBE/UI/Inspections/InspectionDescriptionConverter.cs b/RetailCoder.VBE/UI/Inspections/InspectionDescriptionConverter.cs
@@ -3,7 +3,7 @@
 using System.Windows.Data;
 using Rubberduck.Inspections;
 
-namespace Rubberduck.UI.CodeInspections
+namespace Rubberduck.UI.Inspections
 {
     public class InspectionTypeConverter : IValueConverter
     {
diff --git a/RetailCoder.VBE/UI/Inspections/InspectionImageSourceConverter.cs b/RetailCoder.VBE/UI/Inspections/InspectionImageSourceConverter.cs
@@ -3,7 +3,7 @@
 using System.Windows.Data;
 using Rubberduck.Inspections;
 
-namespace Rubberduck.UI.CodeInspections
+namespace Rubberduck.UI.Inspections
 {
     public class InspectionImageSourceConverter : IValueConverter
     {
diff --git a/RetailCoder.VBE/UI/Inspections/InspectionResultsControl.xaml b/RetailCoder.VBE/UI/Inspections/InspectionResultsControl.xaml
@@ -1,10 +1,10 @@
-﻿<UserControl x:Class="Rubberduck.UI.CodeInspections.InspectionResultsControl"
+﻿<UserControl x:Class="Rubberduck.UI.Inspections.InspectionResultsControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:inspections="clr-namespace:Rubberduck.Inspections"
-             xmlns:codeInspections="clr-namespace:Rubberduck.UI.CodeInspections"
+             xmlns:codeInspections="clr-namespace:Rubberduck.UI.Inspections"
              xmlns:controls="clr-namespace:Rubberduck.UI.Controls"
              xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
              xmlns:themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
@@ -483,7 +483,7 @@
             <RowDefinition Height="Auto" MinHeight="48"/>
         </Grid.RowDefinitions>
 
-        <Border Grid.Row="0" Grid.RowSpan="3" Background="#FFEEF5FD" />
+        <Border Grid.Row="0" Grid.RowSpan="3" Background="White" />
 
         <ToolBarTray Grid.Row="0" IsLocked="True">
             <ToolBar Style="{StaticResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}">
@@ -590,7 +590,7 @@
 
         <Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="DimGray">
 
-            <StackPanel Orientation="Vertical" MinHeight="48" Background="Gainsboro">
+            <StackPanel Orientation="Vertical" MinHeight="48" Background="WhiteSmoke">
                 
                 <Grid Margin="4" HorizontalAlignment="Stretch">
                     <Grid.ColumnDefinitions>
diff --git a/RetailCoder.VBE/UI/Inspections/InspectionResultsControl.xaml.cs b/RetailCoder.VBE/UI/Inspections/InspectionResultsControl.xaml.cs
@@ -1,7 +1,7 @@
 ﻿using System.Windows;
 using System.Windows.Controls;
 
-namespace Rubberduck.UI.CodeInspections
+namespace Rubberduck.UI.Inspections
 {
     /// <summary>
     /// Interaction logic for InspectionResultsControl.xaml
diff --git a/RetailCoder.VBE/UI/Inspections/InspectionResultsViewModel.cs b/RetailCoder.VBE/UI/Inspections/InspectionResultsViewModel.cs
@@ -21,7 +21,7 @@
 using Rubberduck.VBEditor.Extensions;
 using NLog;
 
-namespace Rubberduck.UI.CodeInspections
+namespace Rubberduck.UI.Inspections
 {
     public sealed class InspectionResultsViewModel : ViewModelBase, INavigateSelection, IDisposable
     {
diff --git a/RetailCoder.VBE/UI/Inspections/InspectionSeverityImageSourceConverter.cs b/RetailCoder.VBE/UI/Inspections/InspectionSeverityImageSourceConverter.cs
@@ -8,7 +8,7 @@
 using System.Windows.Media.Imaging;
 using Rubberduck.Inspections;
 
-namespace Rubberduck.UI.CodeInspections
+namespace Rubberduck.UI.Inspections
 {
     public class InspectionSeverityImageSourceConverter : IValueConverter
     {
diff --git a/RetailCoder.VBE/UI/Inspections/QuickFixEventArgs.cs b/RetailCoder.VBE/UI/Inspections/QuickFixEventArgs.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace Rubberduck.UI.CodeInspections
+namespace Rubberduck.UI.Inspections
 {
     public class QuickFixEventArgs : EventArgs
     {
diff --git a/RetailCoder.VBE/UI/Settings/SettingsControl.xaml b/RetailCoder.VBE/UI/Settings/SettingsControl.xaml
@@ -9,8 +9,7 @@
              d:DesignHeight="300" d:DesignWidth="600"
              d:DataContext="{d:DesignInstance {x:Type settings:SettingsControlViewModel}, IsDesignTimeCreatable=False}">
     <UserControl.InputBindings>
-        <KeyBinding Key="Escape"
-                    Command="{Binding CancelButtonCommand}" />
+        <KeyBinding Key="Escape" Command="{Binding CancelButtonCommand}" />
     </UserControl.InputBindings>
     <UserControl.Resources>
         <converters:SettingsViewToPageConverter x:Key="SettingsViewToPage" />
diff --git a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerWindow.Designer.cs b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerWindow.Designer.cs
diff --git a/Rubberduck.Parsing/Symbols/TypeAnnotationPass.cs b/Rubberduck.Parsing/Symbols/TypeAnnotationPass.cs
@@ -62,6 +62,11 @@ private void AnnotateType(Declaration declaration)
                 return;
             }
             var module = Declaration.GetModuleParent(declaration);
+            if (module == null)
+            {
+                _logger.Warn("Type annotation failed for {0} because module parent is missing.", typeExpression);
+                return;
+            }
             var expressionContext = _expressionParser.Parse(typeExpression.Trim());
             var boundExpression = _bindingService.ResolveType(module, declaration.ParentDeclaration, expressionContext);
             if (boundExpression.Classification != ExpressionClassification.ResolutionFailed)

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Diagnostics;`
`5`	`5`	`using System.Linq;`
`6`	`6`	`using System.Runtime.InteropServices;`
	`7`	`+using System.Windows.Forms;`
`7`	`8`	`using System.Windows.Input;`
`8`	`9`	`using Microsoft.Vbe.Interop;`
`9`	`10`	`using Rubberduck.Common.Hotkeys;`
`@@ -106,9 +107,16 @@ private void Mouse_RawMouseInputReceived(object sender, RawMouseEventArgs e)`
`106`	`107`	`}`
`107`	`108`	`}`
`108`	`109`
	`110`	`+ // keys that change the current selection.`
	`111`	`+ private static readonly HashSet<Keys> NavKeys = new HashSet<Keys>`
	`112`	`+ {`
	`113`	`+ Keys.Up, Keys.Down, Keys.Left, Keys.Right, Keys.PageDown, Keys.PageUp, Keys.Enter`
	`114`	`+ };`
	`115`	`+`
`109`	`116`	`private void Keyboard_RawKeyboardInputReceived(object sender, RawKeyEventArgs e)`
`110`	`117`	`{`
`111`		`- if (e.Message == WM.KEYUP)`
	`118`	`+ // note: handling all keys causes annoying RTrim of current line, making editing code a PITA.`
	`119`	`+ if (e.Message == WM.KEYUP && NavKeys.Contains((Keys)e.VKey))`
`112`	`120`	`{`
`113`	`121`	`OnMessageReceived(this, HookEventArgs.Empty);`
`114`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Microsoft.Vbe.Interop;`
`2`	`2`
`3`		`-namespace Rubberduck.UI.CodeInspections`
	`3`	`+namespace Rubberduck.UI.Inspections`
`4`	`4`	`{`
`5`	`5`	`public class CodeInspectionsDockablePresenter : DockableToolwindowPresenter`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Windows.Forms;`
`2`	`2`
`3`		`-namespace Rubberduck.UI.CodeInspections`
	`3`	`+namespace Rubberduck.UI.Inspections`
`4`	`4`	`{`
`5`	`5`	`public partial class CodeInspectionsWindow : UserControl, IDockableUserControl`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Windows.Data;`
`4`	`4`	`using Rubberduck.Inspections;`
`5`	`5`
`6`		`-namespace Rubberduck.UI.CodeInspections`
	`6`	`+namespace Rubberduck.UI.Inspections`
`7`	`7`	`{`
`8`	`8`	`public class InspectionTypeConverter : IValueConverter`
`9`	`9`	`{`