🎨 Some nitpicks and cleanup

haacked · haacked · commit c04ed0961254 · 2015-09-11T11:04:41.000-07:00
For the ExportMetadata, the assert didn't cover the potential nullref
case, so I refactored it so it would.
diff --git a/src/GitHub.Exports/Exports/ExportMetadata.cs b/src/GitHub.Exports/Exports/ExportMetadata.cs
@@ -5,6 +5,7 @@
 using System.Windows.Controls;
 using System.Linq;
 using System.Diagnostics;
+using System.Reflection;
 
 namespace GitHub.Exports {
 
@@ -50,8 +51,14 @@ public static class ExportViewAttributeExtensions
     {
         public static bool IsViewType(this UserControl c, UIViewType type)
         {
-            Debug.Assert(c.GetType().GetCustomAttributesData().Any(x => x.AttributeType == typeof(ExportViewAttribute) && x.NamedArguments.Any() && x.NamedArguments[0].TypedValue.ArgumentType == typeof(UIViewType)), "Someone broke the ExportViewAttribute contract...");
-            return c.GetType().GetCustomAttributesData().Any(x => x.AttributeType == typeof(ExportViewAttribute) && (UIViewType)x.NamedArguments[0].TypedValue.Value == type);
+            return c.GetType().GetCustomAttributesData().Any(attr => IsViewType(attr, type));
+        }
+
+        private static bool IsViewType(CustomAttributeData attributeData, UIViewType viewType)
+        {
+            Debug.Assert(attributeData.NamedArguments != null);
+            return attributeData.AttributeType == typeof(ExportViewAttribute)
+                && (UIViewType)attributeData.NamedArguments[0].TypedValue.Value == viewType;
         }
     }
 }
diff --git a/src/GitHub.Exports/Services/VSServices.cs b/src/GitHub.Exports/Services/VSServices.cs
@@ -1,18 +1,18 @@
-﻿using Microsoft.TeamFoundation.Git.Controls.Extensibility;
-using System;
+﻿using System;
+using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Globalization;
 using System.Linq;
+using System.Windows.Input;
 using GitHub.Extensions;
-using Microsoft.Win32;
-using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
+using GitHub.Models;
 using GitHub.VisualStudio;
 using Microsoft.TeamFoundation.Controls;
+using Microsoft.TeamFoundation.Git.Controls.Extensibility;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell.Interop;
-using System.Collections.Generic;
-using GitHub.Models;
-using System.Windows.Input;
+using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
+using Microsoft.Win32;
 
 namespace GitHub.Services
 {
@@ -181,41 +181,36 @@ public string SetDefaultProjectPath(string path)
         public void ShowMessage(string message)
         {
             var manager = serviceProvider.TryGetService<ITeamExplorer>() as ITeamExplorerNotificationManager;
-            if (manager != null)
-                manager.ShowNotification(message, NotificationType.Information, NotificationFlags.None, null, default(Guid));
+            manager?.ShowNotification(message, NotificationType.Information, NotificationFlags.None, null, default(Guid));
         }
 
         public void ShowMessage(string message, ICommand command)
         {
             var manager = serviceProvider.TryGetService<ITeamExplorer>() as ITeamExplorerNotificationManager;
-            if (manager != null)
-                manager.ShowNotification(message, NotificationType.Information, NotificationFlags.None, command, default(Guid));
+            manager?.ShowNotification(message, NotificationType.Information, NotificationFlags.None, command, default(Guid));
         }
 
         public void ShowWarning(string message)
         {
             var manager = serviceProvider.TryGetService<ITeamExplorer>() as ITeamExplorerNotificationManager;
-            if (manager != null)
-                manager.ShowNotification(message, NotificationType.Warning, NotificationFlags.None, null, default(Guid));
+            manager?.ShowNotification(message, NotificationType.Warning, NotificationFlags.None, null, default(Guid));
         }
 
         public void ShowError(string message)
         {
             var manager = serviceProvider.TryGetService<ITeamExplorer>() as ITeamExplorerNotificationManager;
-            if (manager != null)
-                manager.ShowNotification(message, NotificationType.Error, NotificationFlags.None, null, default(Guid));
+            manager?.ShowNotification(message, NotificationType.Error, NotificationFlags.None, null, default(Guid));
         }
 
         public void ClearNotifications()
         {
             var manager = serviceProvider.TryGetService<ITeamExplorer>() as ITeamExplorerNotificationManager;
-            if (manager != null)
-                manager.ClearNotifications();
-		}
+            manager?.ClearNotifications();
+        }
 
         public void ActivityLogMessage(string message)
         {
-            var log = VisualStudio.Services.GetActivityLog(serviceProvider);
+            var log = serviceProvider.GetActivityLog();
             if (log != null)
             {
                 if (!ErrorHandler.Succeeded(log.LogEntry((UInt32)__ACTIVITYLOG_ENTRYTYPE.ALE_INFORMATION,
@@ -226,7 +221,7 @@ public void ActivityLogMessage(string message)
 
         public void ActivityLogError(string message)
         {
-            var log = VisualStudio.Services.GetActivityLog(serviceProvider);
+            var log = serviceProvider.GetActivityLog();
             if (log != null)
             {
 
@@ -238,7 +233,7 @@ public void ActivityLogError(string message)
 
         public void ActivityLogWarning(string message)
         {
-            var log = VisualStudio.Services.GetActivityLog(serviceProvider);
+            var log = serviceProvider.GetActivityLog();
             if (log != null)
             {
                 if (!ErrorHandler.Succeeded(log.LogEntry((UInt32)__ACTIVITYLOG_ENTRYTYPE.ALE_WARNING,
diff --git a/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubConnectSection.cs b/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubConnectSection.cs
@@ -1,25 +1,22 @@
-﻿using GitHub.Api;
+﻿using System;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using GitHub.Api;
+using GitHub.Exports;
+using GitHub.Extensions;
 using GitHub.Models;
 using GitHub.Services;
 using GitHub.UI;
 using GitHub.VisualStudio.Base;
 using GitHub.VisualStudio.Helpers;
 using GitHub.VisualStudio.UI.Views;
 using Microsoft.TeamFoundation.Controls;
-using System.Linq;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using GitHub.Extensions;
-using NullGuard;
+using Microsoft.TeamFoundation.MVVM;
 using Microsoft.VisualStudio;
-using System;
-using System.Windows.Data;
-using System.ComponentModel;
+using NullGuard;
 using ReactiveUI;
-using GitHub.Exports;
-using System.Globalization;
-using Microsoft.TeamFoundation.MVVM;
-using GitHub.Primitives;
 
 namespace GitHub.VisualStudio.TeamExplorer.Connect
 {
@@ -109,10 +106,9 @@ void RefreshConnections(object sender, NotifyCollectionChangedEventArgs e)
                         Refresh(connectionManager.Connections[sectionIndex]);
                     break;
                 case NotifyCollectionChangedAction.Remove:
-                    if (connectionManager.Connections.Count <= sectionIndex)
-                        Refresh(null);
-                    else
-                        Refresh(connectionManager.Connections[sectionIndex]);
+                    Refresh(connectionManager.Connections.Count <= sectionIndex
+                        ? null
+                        : connectionManager.Connections[sectionIndex]);
                     break;
             }
         }
@@ -176,10 +172,9 @@ public override void Initialize(object sender, SectionInitializeEventArgs e)
 
         void UpdateConnection()
         {
-            if (connectionManager.Connections.Count > sectionIndex)
-                Refresh(connectionManager.Connections[sectionIndex]);
-            else
-                Refresh(SectionConnection);
+            Refresh(connectionManager.Connections.Count > sectionIndex
+                ? connectionManager.Connections[sectionIndex]
+                : SectionConnection);
         }
 
         void OnPropertyChange(object sender, PropertyChangedEventArgs e)
@@ -246,7 +241,7 @@ void ShowNotification(ISimpleRepositoryModel newrepo, string msg)
             vsservices.ClearNotifications();
             vsservices.ShowMessage(
                 msg,
-                new RelayCommand((o) =>
+                new RelayCommand(o =>
                 {
                     var str = o.ToString();
                     /* the prefix is the action to perform:

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System.Windows.Controls;`
`6`	`6`	`using System.Linq;`
`7`	`7`	`using System.Diagnostics;`
	`8`	`+using System.Reflection;`
`8`	`9`
`9`	`10`	`namespace GitHub.Exports {`
`10`	`11`
`@@ -50,8 +51,14 @@ public static class ExportViewAttributeExtensions`
`50`	`51`	`{`
`51`	`52`	`public static bool IsViewType(this UserControl c, UIViewType type)`
`52`	`53`	`{`
`53`		`- Debug.Assert(c.GetType().GetCustomAttributesData().Any(x => x.AttributeType == typeof(ExportViewAttribute) && x.NamedArguments.Any() && x.NamedArguments[0].TypedValue.ArgumentType == typeof(UIViewType)), "Someone broke the ExportViewAttribute contract...");`
`54`		`- return c.GetType().GetCustomAttributesData().Any(x => x.AttributeType == typeof(ExportViewAttribute) && (UIViewType)x.NamedArguments[0].TypedValue.Value == type);`
	`54`	`+ return c.GetType().GetCustomAttributesData().Any(attr => IsViewType(attr, type));`
	`55`	`+ }`
	`56`	`+`
	`57`	`+ private static bool IsViewType(CustomAttributeData attributeData, UIViewType viewType)`
	`58`	`+ {`
	`59`	`+ Debug.Assert(attributeData.NamedArguments != null);`
	`60`	`+ return attributeData.AttributeType == typeof(ExportViewAttribute)`
	`61`	`+ && (UIViewType)attributeData.NamedArguments[0].TypedValue.Value == viewType;`
`55`	`62`	`}`
`56`	`63`	`}`
`57`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`		`-using Microsoft.TeamFoundation.Git.Controls.Extensibility;`
`2`		`-using System;`
	`1`	`+using System;`
	`2`	`+using System.Collections.Generic;`
`3`	`3`	`using System.ComponentModel.Composition;`
`4`	`4`	`using System.Globalization;`
`5`	`5`	`using System.Linq;`
	`6`	`+using System.Windows.Input;`
`6`	`7`	`using GitHub.Extensions;`
`7`		`-using Microsoft.Win32;`
`8`		`-using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;`
	`8`	`+using GitHub.Models;`
`9`	`9`	`using GitHub.VisualStudio;`
`10`	`10`	`using Microsoft.TeamFoundation.Controls;`
	`11`	`+using Microsoft.TeamFoundation.Git.Controls.Extensibility;`
`11`	`12`	`using Microsoft.VisualStudio;`
`12`	`13`	`using Microsoft.VisualStudio.Shell.Interop;`
`13`		`-using System.Collections.Generic;`
`14`		`-using GitHub.Models;`
`15`		`-using System.Windows.Input;`
	`14`	`+using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;`
	`15`	`+using Microsoft.Win32;`
`16`	`16`
`17`	`17`	`namespace GitHub.Services`
`18`	`18`	`{`
`@@ -181,41 +181,36 @@ public string SetDefaultProjectPath(string path)`
`181`	`181`	`public void ShowMessage(string message)`
`182`	`182`	`{`
`183`	`183`	`var manager = serviceProvider.TryGetService<ITeamExplorer>() as ITeamExplorerNotificationManager;`
`184`		`- if (manager != null)`
`185`		`- manager.ShowNotification(message, NotificationType.Information, NotificationFlags.None, null, default(Guid));`
	`184`	`+ manager?.ShowNotification(message, NotificationType.Information, NotificationFlags.None, null, default(Guid));`
`186`	`185`	`}`
`187`	`186`
`188`	`187`	`public void ShowMessage(string message, ICommand command)`
`189`	`188`	`{`
`190`	`189`	`var manager = serviceProvider.TryGetService<ITeamExplorer>() as ITeamExplorerNotificationManager;`
`191`		`- if (manager != null)`
`192`		`- manager.ShowNotification(message, NotificationType.Information, NotificationFlags.None, command, default(Guid));`
	`190`	`+ manager?.ShowNotification(message, NotificationType.Information, NotificationFlags.None, command, default(Guid));`
`193`	`191`	`}`
`194`	`192`
`195`	`193`	`public void ShowWarning(string message)`
`196`	`194`	`{`
`197`	`195`	`var manager = serviceProvider.TryGetService<ITeamExplorer>() as ITeamExplorerNotificationManager;`
`198`		`- if (manager != null)`
`199`		`- manager.ShowNotification(message, NotificationType.Warning, NotificationFlags.None, null, default(Guid));`
	`196`	`+ manager?.ShowNotification(message, NotificationType.Warning, NotificationFlags.None, null, default(Guid));`
`200`	`197`	`}`
`201`	`198`
`202`	`199`	`public void ShowError(string message)`
`203`	`200`	`{`
`204`	`201`	`var manager = serviceProvider.TryGetService<ITeamExplorer>() as ITeamExplorerNotificationManager;`
`205`		`- if (manager != null)`
`206`		`- manager.ShowNotification(message, NotificationType.Error, NotificationFlags.None, null, default(Guid));`
	`202`	`+ manager?.ShowNotification(message, NotificationType.Error, NotificationFlags.None, null, default(Guid));`
`207`	`203`	`}`
`208`	`204`
`209`	`205`	`public void ClearNotifications()`
`210`	`206`	`{`
`211`	`207`	`var manager = serviceProvider.TryGetService<ITeamExplorer>() as ITeamExplorerNotificationManager;`
`212`		`- if (manager != null)`
`213`		`- manager.ClearNotifications();`
`214`		`- }`
	`208`	`+ manager?.ClearNotifications();`
	`209`	`+ }`
`215`	`210`
`216`	`211`	`public void ActivityLogMessage(string message)`
`217`	`212`	`{`
`218`		`- var log = VisualStudio.Services.GetActivityLog(serviceProvider);`
	`213`	`+ var log = serviceProvider.GetActivityLog();`
`219`	`214`	`if (log != null)`
`220`	`215`	`{`
`221`	`216`	`if (!ErrorHandler.Succeeded(log.LogEntry((UInt32)__ACTIVITYLOG_ENTRYTYPE.ALE_INFORMATION,`
`@@ -226,7 +221,7 @@ public void ActivityLogMessage(string message)`
`226`	`221`
`227`	`222`	`public void ActivityLogError(string message)`
`228`	`223`	`{`
`229`		`- var log = VisualStudio.Services.GetActivityLog(serviceProvider);`
	`224`	`+ var log = serviceProvider.GetActivityLog();`
`230`	`225`	`if (log != null)`
`231`	`226`	`{`
`232`	`227`
`@@ -238,7 +233,7 @@ public void ActivityLogError(string message)`
`238`	`233`
`239`	`234`	`public void ActivityLogWarning(string message)`
`240`	`235`	`{`
`241`		`- var log = VisualStudio.Services.GetActivityLog(serviceProvider);`
	`236`	`+ var log = serviceProvider.GetActivityLog();`
`242`	`237`	`if (log != null)`
`243`	`238`	`{`
`244`	`239`	`if (!ErrorHandler.Succeeded(log.LogEntry((UInt32)__ACTIVITYLOG_ENTRYTYPE.ALE_WARNING,`