Merge branch 'master' into fixes/1382-githubpane-foreground

Author: grokys

src/GitHub.App/Factories/ViewViewModelFactory.cs

@@ -20,14 +20,12 @@ public class ViewViewModelFactory : IViewViewModelFactory
 
         [ImportingConstructor]
         public ViewViewModelFactory(
-            IGitHubServiceProvider serviceProvider,
-            ICompositionService cc)
+            IGitHubServiceProvider serviceProvider)
         {
             this.serviceProvider = serviceProvider;
-            cc.SatisfyImportsOnce(this);
         }
 
-        [ImportMany(AllowRecomposition = true)]
+        [ImportMany]
         IEnumerable<ExportFactory<FrameworkElement, IViewModelMetadata>> Views { get; set; }
 
         /// <inheritdoc/>
@@ -45,7 +43,7 @@ public FrameworkElement CreateView<TViewModel>() where TViewModel : IViewModel
         /// <inheritdoc/>
         public FrameworkElement CreateView(Type viewModel)
         {
-            var f = Views.FirstOrDefault(x => x.Metadata.ViewModelType.Contains(viewModel));
+            var f = Views.FirstOrDefault(x => x.Metadata.ViewModelType.Contains(viewModel.FullName));
             return f?.CreateExport().Value;
         }
     }

src/GitHub.App/ViewModels/GitHubPane/GitHubPaneViewModel.cs

@@ -402,8 +402,8 @@ static async Task<bool> IsValidRepository(ISimpleApiClient client)
 
         static Regex CreateRoute(string route)
         {
-            // Build RegEx from route (:foo to named group (?<foo>[a-z0-9]+)).
-            var routeFormat = new Regex("(:([a-z]+))\\b").Replace(route, "(?<$2>[a-z0-9]+)");
+            // Build RegEx from route (:foo to named group (?<foo>[\w_.-]+)).
+            var routeFormat = new Regex("(:([a-z]+))\\b").Replace(route, @"(?<$2>[\w_.-]+)");
             return new Regex(routeFormat, RegexOptions.ExplicitCapture | RegexOptions.IgnoreCase);
         }
     }

src/GitHub.Exports/Exports/ExportMetadata.cs

@@ -32,15 +32,17 @@ public enum LinkType
     /// </summary>
     [MetadataAttribute]
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+    [SuppressMessage("Microsoft.Design", "CA1019:DefineAccessorsForAttributeArguments",
+        Justification = "Store string rather than Type as metadata")]
     public sealed class ExportViewForAttribute : ExportAttribute
     {
         public ExportViewForAttribute(Type viewModelType)
             : base(typeof(FrameworkElement))
         {
-            ViewModelType = viewModelType;
+            ViewModelType = viewModelType.FullName;
         }
 
-        public Type ViewModelType { get; }
+        public string ViewModelType { get; }
     }
 
     /// <summary>
@@ -69,7 +71,7 @@ public ExportMenuAttribute() : base(typeof(IMenuHandler))
     public interface IViewModelMetadata
     {
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        Type[] ViewModelType { get; }
+        string[] ViewModelType { get; }
     }
 
     /// <summary>

src/GitHub.TeamFoundation.14/RegistryHelper.cs

@@ -21,28 +21,42 @@ static RegistryKey OpenGitKey(string path)
 
         internal static IEnumerable<ILocalRepositoryModel> PokeTheRegistryForRepositoryList()
         {
-            using (var key = OpenGitKey("Repositories"))
+            var key = OpenGitKey("Repositories");
+
+            if (key != null)
             {
-                return key.GetSubKeyNames().Select(x =>
+                using (key)
                 {
-                    using (var subkey = key.OpenSubKey(x))
+                    return key.GetSubKeyNames().Select(x =>
                     {
-                        try
-                        {
-                            var path = subkey?.GetValue("Path") as string;
-                            if (path != null && Directory.Exists(path))
-                                return new LocalRepositoryModel(path);
-                        }
-                        catch (Exception)
+                        var subkey = key.OpenSubKey(x);
+
+                        if (subkey != null)
                         {
-                            // no sense spamming the log, the registry might have ton of stale things we don't care about
+                            using (subkey)
+                            {
+                                try
+                                {
+                                    var path = subkey?.GetValue("Path") as string;
+                                    if (path != null && Directory.Exists(path))
+                                        return new LocalRepositoryModel(path);
+                                }
+                                catch (Exception)
+                                {
+                                    // no sense spamming the log, the registry might have ton of stale things we don't care about
+                                }
+
+                            }
                         }
+
                         return null;
-                    }
-                })
-                .Where(x => x != null)
-                .ToList();
+                    })
+                    .Where(x => x != null)
+                    .ToList();
+                }
             }
+
+            return new ILocalRepositoryModel[0];
         }
 
         internal static string PokeTheRegistryForLocalClonePath()

src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml

@@ -317,9 +317,13 @@
                                                 <ui:OcticonImage.Style>
                                                     <Style TargetType="ui:OcticonImage" BasedOn="{StaticResource OcticonImage}">
                                                         <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding Status}" Value="Removed">
+                                                            <MultiDataTrigger>
+                                                                <MultiDataTrigger.Conditions>
+                                                                    <Condition Binding="{Binding Status}" Value="Removed"/>
+                                                                    <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type TreeViewItem}}, Path=IsSelected}" Value="False"/>
+                                                                </MultiDataTrigger.Conditions>
                                                                 <Setter Property="Foreground" Value="{DynamicResource GitHubDeletedFileIconBrush}"/>
-                                                            </DataTrigger>
+                                                            </MultiDataTrigger>
                                                         </Style.Triggers>
                                                     </Style>
                                                 </ui:OcticonImage.Style>
@@ -329,9 +333,15 @@
                                                     <Style TargetType="TextBlock">
                                                         <Style.Triggers>
                                                             <DataTrigger Binding="{Binding Status}" Value="Removed">
-                                                                <Setter Property="Foreground" Value="{DynamicResource GitHubDeletedFileBrush}"/>
                                                                 <Setter Property="TextDecorations" Value="Strikethrough"/>
                                                             </DataTrigger>
+                                                            <MultiDataTrigger>
+                                                                <MultiDataTrigger.Conditions>
+                                                                    <Condition Binding="{Binding Status}" Value="Removed"/>
+                                                                    <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type TreeViewItem}}, Path=IsSelected}" Value="False"/>
+                                                                </MultiDataTrigger.Conditions>
+                                                                <Setter Property="Foreground" Value="{DynamicResource GitHubDeletedFileBrush}"/>
+                                                            </MultiDataTrigger>
                                                         </Style.Triggers>
                                                     </Style>
                                                 </TextBlock.Style>