Use expression bodies wherever possible

Also we should prefer to use `var` unless the type's really not clear at
all from the right hand side. Also, I prefer all the usings on top and
not within namespaces.

Author: haacked

src/GitHub.Exports/Extensions/SimpleRepositoryModelExtensions.cs

@@ -1,28 +1,24 @@
-using GitHub.Models;
-using System;
+using System;
 using System.Linq;
 using System.IO;
+using GitHub.Models;
 using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
 
 namespace GitHub.Extensions
 {
-    using Services;
-    using VisualStudio;
     public static class SimpleRepositoryModelExtensions
     {
         /// <summary>
         /// Create a SimpleRepositoryModel from a VS git repo object
         /// </summary>
         public static ISimpleRepositoryModel ToModel(this IGitRepositoryInfo repo)
         {
-            if (repo == null)
-                return null;
-            return new SimpleRepositoryModel(repo.RepositoryPath);
+            return repo == null ? null : new SimpleRepositoryModel(repo.RepositoryPath);
         }
 
         public static bool HasCommits(this ISimpleRepositoryModel repository)
         {
-            var repo = Services.IGitService.GetRepo(repository.LocalPath);
+            var repo = VisualStudio.Services.IGitService.GetRepo(repository.LocalPath);
             return repo?.Commits.Any() ?? false;
         }
 

src/GitHub.Exports/Extensions/VSExtensions.cs

@@ -1,12 +1,10 @@
-using GitHub.Services;
-using Microsoft.TeamFoundation.Controls;
-using System;
+using System;
 using System.Diagnostics;
+using GitHub.Services;
+using Microsoft.TeamFoundation.Controls;
 
 namespace GitHub.Extensions
 {
-    using VisualStudio;
-
     public static class VSExtensions
     {
         public static T TryGetService<T>(this IServiceProvider serviceProvider) where T : class
@@ -41,9 +39,9 @@ public static T GetService<T>(this IServiceProvider serviceProvider)
         public static T GetExportedValue<T>(this IServiceProvider serviceProvider)
         {
             var ui = serviceProvider as IUIProvider;
-            if (ui != null)
-                return ui.GetService<T>();
-            return Services.ComponentModel.DefaultExportProvider.GetExportedValue<T>();
+            return ui != null
+                ? ui.GetService<T>()
+                : VisualStudio.Services.ComponentModel.DefaultExportProvider.GetExportedValue<T>();
         }
 
         public static ITeamExplorerSection GetSection(this IServiceProvider serviceProvider, Guid section)

src/GitHub.Exports/Models/SimpleRepositoryModel.cs

@@ -1,18 +1,13 @@
-using GitHub.Extensions;
-using GitHub.Primitives;
-using GitHub.Services;
-using GitHub.UI;
-using GitHub.VisualStudio;
-using GitHub.VisualStudio.Helpers;
-using System;
+using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using GitHub.Primitives;
+using GitHub.UI;
+using GitHub.VisualStudio.Helpers;
 
 namespace GitHub.Models
 {
-    using VisualStudio;
-
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class SimpleRepositoryModel : NotificationAwareObject, ISimpleRepositoryModel, INotifyPropertySource, IEquatable<SimpleRepositoryModel>
     {
@@ -31,10 +26,8 @@ public SimpleRepositoryModel(string path)
             var dir = new DirectoryInfo(path);
             if (!dir.Exists)
                 throw new ArgumentException("Path does not exist", nameof(path));
-            var uri = Services.IGitService.GetUri(path);
-            var name = uri?.NameWithOwner;
-            if (name == null)
-                name = dir.Name;
+            var uri = VisualStudio.Services.IGitService.GetUri(path);
+            var name = uri?.NameWithOwner ?? dir.Name;
             Name = name;
             LocalPath = path;
             CloneUrl = uri;
@@ -54,15 +47,15 @@ public void Refresh()
         {
             if (LocalPath == null)
                 return;
-            var uri = Services.IGitService.GetUri(LocalPath);
+            var uri = VisualStudio.Services.IGitService.GetUri(LocalPath);
             if (CloneUrl != uri)
                 CloneUrl = uri;
         }
 
-        public string Name { get; private set; }
+        public string Name { get; }
         UriString cloneUrl;
         public UriString CloneUrl { get { return cloneUrl; } set { cloneUrl = value; this.RaisePropertyChange(); } }
-        public string LocalPath { get; private set; }
+        public string LocalPath { get; }
         Octicon icon;
         public Octicon Icon { get { return icon; } set { icon = value; this.RaisePropertyChange(); } }
 
@@ -91,13 +84,12 @@ bool IEquatable<SimpleRepositoryModel>.Equals(SimpleRepositoryModel other)
             return other != null && String.Equals(Name, other.Name) && String.Equals(CloneUrl, other.CloneUrl) && String.Equals(LocalPath?.TrimEnd('\\'), other.LocalPath?.TrimEnd('\\'), StringComparison.CurrentCultureIgnoreCase);
         }
 
-        internal string DebuggerDisplay
-        {
-            get
-            {
-                return String.Format(CultureInfo.InvariantCulture,
-                    "{3}\tName: {0} CloneUrl: {1} LocalPath: {2}", Name, CloneUrl, LocalPath, GetHashCode());
-            }
-        }
+        internal string DebuggerDisplay => String.Format(
+            CultureInfo.InvariantCulture,
+            "{3}\tName: {0} CloneUrl: {1} LocalPath: {2}",
+            Name,
+            CloneUrl,
+            LocalPath,
+            GetHashCode());
     }
 }

src/GitHub.Exports/Services/Services.cs

@@ -1,18 +1,17 @@
 using System;
 using EnvDTE;
 using EnvDTE80;
+using GitHub.Extensions;
+using GitHub.Info;
+using GitHub.Primitives;
 using GitHub.Services;
 using LibGit2Sharp;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Shell.Interop;
-using GitHub.Info;
-using GitHub.Primitives;
-using GitHub.Extensions;
 
 namespace GitHub.VisualStudio
 {
-
     public static class Services
     {
         public static IServiceProvider PackageServiceProvider { get; set; }
@@ -37,20 +36,14 @@ static Ret GetGlobalService<T, Ret>(IServiceProvider provider = null) where T :
             return PackageServiceProvider.GetService(typeof(T)) as Ret;
         }
 
-        public static IComponentModel ComponentModel
-        {
-            get { return GetGlobalService<SComponentModel, IComponentModel>(); }
-        }
+        public static IComponentModel ComponentModel => GetGlobalService<SComponentModel, IComponentModel>();
 
         public static IVsWebBrowsingService GetWebBrowsingService(this IServiceProvider provider)
         {
             return GetGlobalService<SVsWebBrowsingService, IVsWebBrowsingService>(provider);
         }
 
-        public static IVsOutputWindow OutputWindow
-        {
-            get { return GetGlobalService<SVsOutputWindow, IVsOutputWindow>(); }
-        }
+        public static IVsOutputWindow OutputWindow => GetGlobalService<SVsOutputWindow, IVsOutputWindow>();
 
         static IVsOutputWindowPane outputWindowPane = null;
         public static IVsOutputWindowPane OutputWindowPane
@@ -62,14 +55,14 @@ public static IVsOutputWindowPane OutputWindowPane
                     // First make sure the output window is visible
                     var uiShell = GetGlobalService<SVsUIShell, IVsUIShell>();
                     // Get the frame of the output window
-                    Guid outputWindowGuid = new Guid("{34e76e81-ee4a-11d0-ae2e-00a0c90fffc3}");
+                    var outputWindowGuid = new Guid("{34e76e81-ee4a-11d0-ae2e-00a0c90fffc3}");
                     IVsWindowFrame outputWindowFrame = null;
                     ErrorHandler.ThrowOnFailure(uiShell.FindToolWindow((uint)__VSCREATETOOLWIN.CTW_fForceCreate, ref outputWindowGuid, out outputWindowFrame));
                     // Show the output window
                     if (outputWindowFrame != null)
                         ErrorHandler.ThrowOnFailure(outputWindowFrame.Show());
 
-                    Guid paneGuid = new Guid("E37A42B1-C1AE-475C-9982-7F49FE61918D");
+                    var paneGuid = new Guid("E37A42B1-C1AE-475C-9982-7F49FE61918D");
                     ErrorHandler.ThrowOnFailure(OutputWindow.CreatePane(ref paneGuid, ApplicationInfo.ApplicationSafeName, 1 /*visible=true*/, 0 /*clearWithSolution=false*/));
                     ErrorHandler.ThrowOnFailure(OutputWindow.GetPane(ref paneGuid, out outputWindowPane));
                 }
@@ -78,15 +71,9 @@ public static IVsOutputWindowPane OutputWindowPane
             }
         }
 
-        public static DTE Dte
-        {
-            get { return GetGlobalService<DTE, DTE>(); }
-        }
+        public static DTE Dte => GetGlobalService<DTE, DTE>();
 
-        public static DTE2 Dte2
-        {
-            get { return Dte as DTE2; }
-        }
+        public static DTE2 Dte2 => Dte as DTE2;
 
         public static IVsActivityLog GetActivityLog(this IServiceProvider provider)
         {
@@ -130,6 +117,6 @@ static UriString GetUri(IRepository repo)
         {
             return UriString.ToUriString(GitService.GetUriFromRepository(repo)?.ToRepositoryUrl());
         }
-        public static IGitService IGitService { get { return PackageServiceProvider.GetService<IGitService>(); } }
+        public static IGitService IGitService => PackageServiceProvider.GetService<IGitService>();
     }
 }