Merge pull request #244 from github/repo-highlight

shana · shana · commit e4139a151618 · 2016-03-22T12:17:39.000-07:00
Compare local paths for proper highlighting Fixes #231
diff --git a/src/GitHub.VisualStudio/UI/Views/GitHubConnectContent.xaml.cs b/src/GitHub.VisualStudio/UI/Views/GitHubConnectContent.xaml.cs
@@ -101,7 +101,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
 
             var item = values[0] as ISimpleRepositoryModel;
             var context = values[1] as IGitAwareItem;
-            return item != null && context != null && context.ActiveRepoUri == item.CloneUrl;
+            return context?.ActiveRepoUri == item?.CloneUrl && context?.ActiveRepo?.LocalPath == item?.LocalPath;
         }
 
         public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur`
`101`	`101`
`102`	`102`	`var item = values[0] as ISimpleRepositoryModel;`
`103`	`103`	`var context = values[1] as IGitAwareItem;`
`104`		`- return item != null && context != null && context.ActiveRepoUri == item.CloneUrl;`
	`104`	`+ return context?.ActiveRepoUri == item?.CloneUrl && context?.ActiveRepo?.LocalPath == item?.LocalPath;`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)`