FIx/suppress CA errors.

grokys · grokys · commit 2e2bfddcbccf · 2017-11-10T16:36:27.000+01:00
diff --git a/src/GitHub.VisualStudio/UI/GitHubPane.cs b/src/GitHub.VisualStudio/UI/GitHubPane.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.ComponentModel.Design;
+using System.Diagnostics.CodeAnalysis;
 using System.Reactive.Linq;
 using System.Runtime.InteropServices;
 using GitHub.Extensions;
@@ -98,6 +99,7 @@ public void ShowView(ViewWithData data)
             View.ViewModel?.Initialize(data);
         }
 
+        [SuppressMessage("Microsoft.Design", "CA1061:DoNotHideBaseClassMethods", Justification = "WTF CA, I'm overriding!")]
         public override IVsSearchTask CreateSearch(uint dwCookie, IVsSearchQuery pSearchQuery, IVsSearchCallback pSearchCallback)
         {
             var pane = View.ViewModel as IGitHubPaneViewModel;
@@ -124,9 +126,9 @@ public override void OnToolWindowCreated()
         {
             base.OnToolWindowCreated();
 
-            ((IVsWindowFrame)Frame)?.SetProperty(
+            Marshal.ThrowExceptionForHR(((IVsWindowFrame)Frame)?.SetProperty(
                 (int)__VSFPROPID5.VSFPROPID_SearchPlacement,
-                __VSSEARCHPLACEMENT.SP_STRETCH);
+                __VSSEARCHPLACEMENT.SP_STRETCH) ?? 0);
         }
 
         void UpdateSearchHost(bool enabled, string query)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.ComponentModel.Design;`
	`3`	`+using System.Diagnostics.CodeAnalysis;`
`3`	`4`	`using System.Reactive.Linq;`
`4`	`5`	`using System.Runtime.InteropServices;`
`5`	`6`	`using GitHub.Extensions;`
`@@ -98,6 +99,7 @@ public void ShowView(ViewWithData data)`
`98`	`99`	`View.ViewModel?.Initialize(data);`
`99`	`100`	`}`
`100`	`101`
	`102`	`+ [SuppressMessage("Microsoft.Design", "CA1061:DoNotHideBaseClassMethods", Justification = "WTF CA, I'm overriding!")]`
`101`	`103`	`public override IVsSearchTask CreateSearch(uint dwCookie, IVsSearchQuery pSearchQuery, IVsSearchCallback pSearchCallback)`
`102`	`104`	`{`
`103`	`105`	`var pane = View.ViewModel as IGitHubPaneViewModel;`
`@@ -124,9 +126,9 @@ public override void OnToolWindowCreated()`
`124`	`126`	`{`
`125`	`127`	`base.OnToolWindowCreated();`
`126`	`128`
`127`		`- ((IVsWindowFrame)Frame)?.SetProperty(`
	`129`	`+ Marshal.ThrowExceptionForHR(((IVsWindowFrame)Frame)?.SetProperty(`
`128`	`130`	`(int)__VSFPROPID5.VSFPROPID_SearchPlacement,`
`129`		`- __VSSEARCHPLACEMENT.SP_STRETCH);`
	`131`	`+ __VSSEARCHPLACEMENT.SP_STRETCH) ?? 0);`
`130`	`132`	`}`
`131`	`133`
`132`	`134`	`void UpdateSearchHost(bool enabled, string query)`