Merge branch 'feature/inline-reviews' of https://github.com/github/VisualStudio into feature/inline-reviews

grokys · grokys · commit 2c9958ab3b70 · 2017-05-29T12:33:52.000+02:00
diff --git a/src/GitHub.InlineReviews/InlineCommentMarginProvider.cs b/src/GitHub.InlineReviews/InlineCommentMarginProvider.cs
@@ -43,17 +43,18 @@ public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTex
         {
             var textView = wpfTextViewHost.TextView;
             var tagAggregator = tagAggregatorFactory.CreateTagAggregator<InlineCommentTag>(textView);
-            var glyphFactory = new InlineCommentGlyphFactory(peekService, textView, tagAggregator);
+            var editorFormatMap = editorFormatMapService.GetEditorFormatMap(textView);
+            var glyphFactory = new InlineCommentGlyphFactory(peekService, textView, tagAggregator, editorFormatMap);
+
             Func<Grid> gridFactory = () => new GlyphMarginGrid();
-            return CreateMargin(glyphFactory, gridFactory, wpfTextViewHost, parent);
+            return CreateMargin(glyphFactory, gridFactory, wpfTextViewHost, parent, editorFormatMap);
         }
 
         IWpfTextViewMargin CreateMargin<TGlyphTag>(IGlyphFactory<TGlyphTag> glyphFactory, Func<Grid> gridFactory,
-            IWpfTextViewHost wpfTextViewHost, IWpfTextViewMargin parent) where TGlyphTag : ITag
+            IWpfTextViewHost wpfTextViewHost, IWpfTextViewMargin parent, IEditorFormatMap editorFormatMap) where TGlyphTag : ITag
         {
             var tagAggregator = tagAggregatorFactory.CreateTagAggregator<TGlyphTag>(wpfTextViewHost.TextView);
-            return new GlyphMargin<TGlyphTag>(wpfTextViewHost, glyphFactory, gridFactory, tagAggregator,
-                editorFormatMapService.GetEditorFormatMap(wpfTextViewHost.TextView),
+            return new GlyphMargin<TGlyphTag>(wpfTextViewHost, glyphFactory, gridFactory, tagAggregator, editorFormatMap,
                 MarginPropertiesName, MarginName, true, 17.0);
         }
     }
diff --git a/src/GitHub.InlineReviews/Tags/AddInlineCommentGlyph.xaml.cs b/src/GitHub.InlineReviews/Tags/AddInlineCommentGlyph.xaml.cs
@@ -1,8 +1,6 @@
 ﻿using System;
 using System.Windows;
-using System.Windows.Media;
 using System.Windows.Controls;
-using Microsoft.VisualStudio.PlatformUI;
 
 namespace GitHub.InlineReviews.Tags
 {
@@ -12,17 +10,9 @@ public AddInlineCommentGlyph()
         {
             InitializeComponent();
 
-            Loaded += AddInlineCommentGlyph_Loaded;
-
             AddViewbox.Visibility = Visibility.Hidden;
             MouseEnter += (s, e) => AddViewbox.Visibility = Visibility.Visible;
             MouseLeave += (s, e) => AddViewbox.Visibility = Visibility.Hidden;
         }
-
-        void AddInlineCommentGlyph_Loaded(object sender, RoutedEventArgs e)
-        {
-            var backgroundColor = ImageThemingUtilities.GetImageBackgroundColor(this);
-            Background = new SolidColorBrush(backgroundColor);
-        }
     }
 }
diff --git a/src/GitHub.InlineReviews/Tags/AddInlineCommentTag.cs b/src/GitHub.InlineReviews/Tags/AddInlineCommentTag.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using GitHub.Extensions;
 using GitHub.Services;
+using GitHub.Models;
 
 namespace GitHub.InlineReviews.Tags
 {
@@ -11,8 +12,9 @@ public AddInlineCommentTag(
             string commitSha,
             string filePath,
             int diffLine,
-            int lineNumber)
-            : base(session, lineNumber)
+            int lineNumber,
+            DiffChangeType diffChangeType)
+            : base(session, lineNumber, diffChangeType)
         {
             Guard.ArgumentNotNull(commitSha, nameof(commitSha));
 
diff --git a/src/GitHub.InlineReviews/Tags/InlineCommentGlyphFactory.cs b/src/GitHub.InlineReviews/Tags/InlineCommentGlyphFactory.cs
@@ -1,12 +1,15 @@
 ﻿using System;
 using System.Windows;
+using System.Windows.Media;
 using System.Windows.Controls;
 using System.Collections.Generic;
 using GitHub.InlineReviews.Glyph;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Tagging;
 using Microsoft.VisualStudio.Text.Formatting;
+using Microsoft.VisualStudio.Text.Classification;
 using GitHub.InlineReviews.Services;
+using GitHub.Models;
 
 namespace GitHub.InlineReviews.Tags
 {
@@ -15,15 +18,53 @@ class InlineCommentGlyphFactory : IGlyphFactory<InlineCommentTag>
         readonly IInlineCommentPeekService peekService;
         readonly ITextView textView;
         readonly ITagAggregator<InlineCommentTag> tagAggregator;
+        readonly BrushesManager brushesManager;
 
         public InlineCommentGlyphFactory(
             IInlineCommentPeekService peekService,
             ITextView textView,
-            ITagAggregator<InlineCommentTag> tagAggregator)
+            ITagAggregator<InlineCommentTag> tagAggregator,
+            IEditorFormatMap editorFormatMap)
         {
             this.peekService = peekService;
             this.textView = textView;
             this.tagAggregator = tagAggregator;
+
+            brushesManager = new BrushesManager(editorFormatMap);
+        }
+
+        class BrushesManager
+        {
+            readonly Brush addBackground;
+            readonly Brush deleteBackground;
+            readonly Brush noneBackground;
+
+            internal BrushesManager(IEditorFormatMap editorFormatMap)
+            {
+                addBackground = TryGetValue<Brush>(editorFormatMap, "deltadiff.add.word", "Background");
+                deleteBackground = TryGetValue<Brush>(editorFormatMap, "deltadiff.remove.word", "Background");
+                noneBackground = TryGetValue<Brush>(editorFormatMap, "Indicator Margin", "Background");
+            }
+
+            T TryGetValue<T>(IEditorFormatMap editorFormatMap, string key, string name) where T : class
+            {
+                var properties = editorFormatMap.GetProperties(key);
+                return properties?[name] as T;
+            }
+
+            internal Brush GetBrush(DiffChangeType diffChangeType)
+            {
+                switch (diffChangeType)
+                {
+                    case DiffChangeType.Add:
+                        return addBackground;
+                    case DiffChangeType.Delete:
+                        return deleteBackground;
+                    case DiffChangeType.None:
+                    default:
+                        return noneBackground;
+                }
+            }
         }
 
         public UIElement GenerateGlyph(IWpfTextViewLine line, InlineCommentTag tag)
@@ -34,6 +75,7 @@ public UIElement GenerateGlyph(IWpfTextViewLine line, InlineCommentTag tag)
                 if (OpenThreadView(tag)) e.Handled = true;
             };
 
+            glyph.Background = brushesManager.GetBrush(tag.DiffChangeType);
             return glyph;
         }
 
diff --git a/src/GitHub.InlineReviews/Tags/InlineCommentTag.cs b/src/GitHub.InlineReviews/Tags/InlineCommentTag.cs
@@ -1,6 +1,6 @@
 ﻿using GitHub.Extensions;
 using GitHub.Services;
-using Microsoft.VisualStudio.Text.Editor;
+using GitHub.Models;
 using Microsoft.VisualStudio.Text.Tagging;
 
 namespace GitHub.InlineReviews.Tags
@@ -9,15 +9,18 @@ abstract class InlineCommentTag : ITag
     {
         public InlineCommentTag(
             IPullRequestSession session,
-            int lineNumber)
+            int lineNumber,
+            DiffChangeType diffChangeType)
         {
             Guard.ArgumentNotNull(session, nameof(session));
 
             LineNumber = lineNumber;
             Session = session;
+            DiffChangeType = diffChangeType;
         }
 
         public int LineNumber { get; }
         public IPullRequestSession Session { get; }
+        public DiffChangeType DiffChangeType { get; }
     }
 }
diff --git a/src/GitHub.InlineReviews/Tags/InlineCommentTagger.cs b/src/GitHub.InlineReviews/Tags/InlineCommentTagger.cs
@@ -130,7 +130,7 @@ public IEnumerable<ITagSpan<InlineCommentTag>> GetTags(NormalizedSnapshotSpanCol
                                     var snapshotLine = span.Snapshot.GetLineFromLineNumber(lineNumber);
                                     yield return new TagSpan<InlineCommentTag>(
                                         new SnapshotSpan(snapshotLine.Start, snapshotLine.End),
-                                        new AddInlineCommentTag(session, file.CommitSha, relativePath, line.DiffLineNumber, lineNumber));
+                                        new AddInlineCommentTag(session, file.CommitSha, relativePath, line.DiffLineNumber, lineNumber, line.Type));
                                 }
                             }
                         }
diff --git a/src/GitHub.InlineReviews/Tags/ShowInlineCommentGlyph.xaml.cs b/src/GitHub.InlineReviews/Tags/ShowInlineCommentGlyph.xaml.cs
@@ -1,7 +1,5 @@
 ﻿using System;
-using System.Windows.Media;
 using System.Windows.Controls;
-using Microsoft.VisualStudio.PlatformUI;
 
 namespace GitHub.InlineReviews.Tags
 {
@@ -10,14 +8,7 @@ public partial class ShowInlineCommentGlyph : UserControl
         public ShowInlineCommentGlyph()
         {
             InitializeComponent();
-
-            Loaded += ShowInlineCommentGlyph_Loaded;
         }
 
-        void ShowInlineCommentGlyph_Loaded(object sender, System.Windows.RoutedEventArgs e)
-        {
-            var backgroundColor = ImageThemingUtilities.GetImageBackgroundColor(this);
-            Background = new SolidColorBrush(backgroundColor);
-        }
     }
 }
diff --git a/src/GitHub.InlineReviews/Tags/ShowInlineCommentTag.cs b/src/GitHub.InlineReviews/Tags/ShowInlineCommentTag.cs
@@ -10,7 +10,7 @@ class ShowInlineCommentTag : InlineCommentTag
         public ShowInlineCommentTag(
             IPullRequestSession session,
             IInlineCommentThreadModel thread)
-            : base(session, thread.LineNumber)
+            : base(session, thread.LineNumber, thread.DiffLineType)
         {
             Guard.ArgumentNotNull(thread, nameof(thread));
 

Original file line number	Diff line number	Diff line change
`@@ -43,17 +43,18 @@ public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTex`
`43`	`43`	`{`
`44`	`44`	`var textView = wpfTextViewHost.TextView;`
`45`	`45`	`var tagAggregator = tagAggregatorFactory.CreateTagAggregator<InlineCommentTag>(textView);`
`46`		`- var glyphFactory = new InlineCommentGlyphFactory(peekService, textView, tagAggregator);`
	`46`	`+ var editorFormatMap = editorFormatMapService.GetEditorFormatMap(textView);`
	`47`	`+ var glyphFactory = new InlineCommentGlyphFactory(peekService, textView, tagAggregator, editorFormatMap);`
	`48`	`+`
`47`	`49`	`Func<Grid> gridFactory = () => new GlyphMarginGrid();`
`48`		`- return CreateMargin(glyphFactory, gridFactory, wpfTextViewHost, parent);`
	`50`	`+ return CreateMargin(glyphFactory, gridFactory, wpfTextViewHost, parent, editorFormatMap);`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`IWpfTextViewMargin CreateMargin<TGlyphTag>(IGlyphFactory<TGlyphTag> glyphFactory, Func<Grid> gridFactory,`
`52`		`- IWpfTextViewHost wpfTextViewHost, IWpfTextViewMargin parent) where TGlyphTag : ITag`
	`54`	`+ IWpfTextViewHost wpfTextViewHost, IWpfTextViewMargin parent, IEditorFormatMap editorFormatMap) where TGlyphTag : ITag`
`53`	`55`	`{`
`54`	`56`	`var tagAggregator = tagAggregatorFactory.CreateTagAggregator<TGlyphTag>(wpfTextViewHost.TextView);`
`55`		`- return new GlyphMargin<TGlyphTag>(wpfTextViewHost, glyphFactory, gridFactory, tagAggregator,`
`56`		`- editorFormatMapService.GetEditorFormatMap(wpfTextViewHost.TextView),`
	`57`	`+ return new GlyphMargin<TGlyphTag>(wpfTextViewHost, glyphFactory, gridFactory, tagAggregator, editorFormatMap,`
`57`	`58`	`MarginPropertiesName, MarginName, true, 17.0);`
`58`	`59`	`}`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Windows;`
`3`		`-using System.Windows.Media;`
`4`	`3`	`using System.Windows.Controls;`
`5`		`-using Microsoft.VisualStudio.PlatformUI;`
`6`	`4`
`7`	`5`	`namespace GitHub.InlineReviews.Tags`
`8`	`6`	`{`
`@@ -12,17 +10,9 @@ public AddInlineCommentGlyph()`
`12`	`10`	`{`
`13`	`11`	`InitializeComponent();`
`14`	`12`
`15`		`- Loaded += AddInlineCommentGlyph_Loaded;`
`16`		`-`
`17`	`13`	`AddViewbox.Visibility = Visibility.Hidden;`
`18`	`14`	`MouseEnter += (s, e) => AddViewbox.Visibility = Visibility.Visible;`
`19`	`15`	`MouseLeave += (s, e) => AddViewbox.Visibility = Visibility.Hidden;`
`20`	`16`	`}`
`21`		`-`
`22`		`- void AddInlineCommentGlyph_Loaded(object sender, RoutedEventArgs e)`
`23`		`- {`
`24`		`- var backgroundColor = ImageThemingUtilities.GetImageBackgroundColor(this);`
`25`		`- Background = new SolidColorBrush(backgroundColor);`
`26`		`- }`
`27`	`17`	`}`
`28`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using GitHub.Extensions;`
`2`	`2`	`using GitHub.Services;`
`3`		`-using Microsoft.VisualStudio.Text.Editor;`
	`3`	`+using GitHub.Models;`
`4`	`4`	`using Microsoft.VisualStudio.Text.Tagging;`
`5`	`5`
`6`	`6`	`namespace GitHub.InlineReviews.Tags`
`@@ -9,15 +9,18 @@ abstract class InlineCommentTag : ITag`
`9`	`9`	`{`
`10`	`10`	`public InlineCommentTag(`
`11`	`11`	`IPullRequestSession session,`
`12`		`- int lineNumber)`
	`12`	`+ int lineNumber,`
	`13`	`+ DiffChangeType diffChangeType)`
`13`	`14`	`{`
`14`	`15`	`Guard.ArgumentNotNull(session, nameof(session));`
`15`	`16`
`16`	`17`	`LineNumber = lineNumber;`
`17`	`18`	`Session = session;`
	`19`	`+ DiffChangeType = diffChangeType;`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`public int LineNumber { get; }`
`21`	`23`	`public IPullRequestSession Session { get; }`
	`24`	`+ public DiffChangeType DiffChangeType { get; }`
`22`	`25`	`}`
`23`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public IEnumerable<ITagSpan<InlineCommentTag>> GetTags(NormalizedSnapshotSpanCol`
`130`	`130`	`var snapshotLine = span.Snapshot.GetLineFromLineNumber(lineNumber);`
`131`	`131`	`yield return new TagSpan<InlineCommentTag>(`
`132`	`132`	`new SnapshotSpan(snapshotLine.Start, snapshotLine.End),`
`133`		`- new AddInlineCommentTag(session, file.CommitSha, relativePath, line.DiffLineNumber, lineNumber));`
	`133`	`+ new AddInlineCommentTag(session, file.CommitSha, relativePath, line.DiffLineNumber, lineNumber, line.Type));`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`using System;`
`2`		`-using System.Windows.Media;`
`3`	`2`	`using System.Windows.Controls;`
`4`		`-using Microsoft.VisualStudio.PlatformUI;`
`5`	`3`
`6`	`4`	`namespace GitHub.InlineReviews.Tags`
`7`	`5`	`{`
`@@ -10,14 +8,7 @@ public partial class ShowInlineCommentGlyph : UserControl`
`10`	`8`	`public ShowInlineCommentGlyph()`
`11`	`9`	`{`
`12`	`10`	`InitializeComponent();`
`13`		`-`
`14`		`- Loaded += ShowInlineCommentGlyph_Loaded;`
`15`	`11`	`}`
`16`	`12`
`17`		`- void ShowInlineCommentGlyph_Loaded(object sender, System.Windows.RoutedEventArgs e)`
`18`		`- {`
`19`		`- var backgroundColor = ImageThemingUtilities.GetImageBackgroundColor(this);`
`20`		`- Background = new SolidColorBrush(backgroundColor);`
`21`		`- }`
`22`	`13`	`}`
`23`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class ShowInlineCommentTag : InlineCommentTag`
`10`	`10`	`public ShowInlineCommentTag(`
`11`	`11`	`IPullRequestSession session,`
`12`	`12`	`IInlineCommentThreadModel thread)`
`13`		`- : base(session, thread.LineNumber)`
	`13`	`+ : base(session, thread.LineNumber, thread.DiffLineType)`
`14`	`14`	`{`
`15`	`15`	`Guard.ArgumentNotNull(thread, nameof(thread));`
`16`	`16`