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

Author: grokys

src/GitHub.InlineReviews/Glyph/GlyphMargin.cs

@@ -63,12 +63,34 @@ public void Dispose()
 
         public ITextViewMargin GetTextViewMargin(string marginName)
         {
-            if (marginName == this.marginName)
+            return (marginName == this.marginName) ? this : null;
+        }
+
+        public bool Enabled
+        {
+            get
+            {
+                ThrowIfDisposed();
+                return true;
+            }
+        }
+
+        public double MarginSize
+        {
+            get
             {
-                return this;
+                ThrowIfDisposed();
+                return marginVisual.Width;
             }
+        }
 
-            return null;
+        public FrameworkElement VisualElement
+        {
+            get
+            {
+                ThrowIfDisposed();
+                return marginVisual;
+            }
         }
 
         void OnLoaded(object sender, RoutedEventArgs e)
@@ -117,13 +139,11 @@ void OnBatchedTagsChanged(object sender, BatchedTagsChangedEventArgs e)
                 {
                     var span = list[0];
                     int start = span.Start;
-                    span = list[0];
                     int end = span.End;
                     for (int i = 1; i < list.Count; i++)
                     {
                         span = list[i];
                         start = Math.Min(start, span.Start);
-                        span = list[i];
                         end = Math.Max(end, span.End);
                     }
 
@@ -184,32 +204,5 @@ void ThrowIfDisposed()
                 throw new ObjectDisposedException(marginName);
             }
         }
-
-        public bool Enabled
-        {
-            get
-            {
-                ThrowIfDisposed();
-                return true;
-            }
-        }
-
-        public double MarginSize
-        {
-            get
-            {
-                ThrowIfDisposed();
-                return marginVisual.Width;
-            }
-        }
-
-        public FrameworkElement VisualElement
-        {
-            get
-            {
-                ThrowIfDisposed();
-                return marginVisual;
-            }
-        }
     }
 }

src/GitHub.InlineReviews/Glyph/GlyphMarginVisualManager.cs

@@ -73,15 +73,6 @@ public void AddGlyph(TGlyphTag tag, SnapshotSpan span)
                         element.Height = startingLine.TextHeight + 1; // HACK: +1 to fill gaps
                         data.SetTop(startingLine.TextTop - textView.ViewportTop);
 
-                        // draw where line is
-                        //element.Height = startingLine.Height;
-                        //data.SetTop(startingLine.Top - textView.ViewportTop);
-
-                        // center on margin
-                        //element.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-                        //double length = (17.0 - element.DesiredSize.Width) / 2.0;
-                        //Canvas.SetLeft(element, length);
-
                         glyphs[element] = data;
                         visuals[glyphType].Children.Add(element);
                     }
@@ -199,28 +190,6 @@ void UpdateBackgroundColor()
                 var backgroundColor = (Color)properties["BackgroundColor"];
                 ImageThemingUtilities.SetImageBackgroundColor(glyphMarginGrid, backgroundColor);
             }
-
-            // set background color for margin
-            //var properties = editorFormatMap.GetProperties(marginPropertiesName);
-            //if (properties.Contains("BackgroundColor"))
-            //{
-            //    glyphMarginGrid.Background = new SolidColorBrush((Color)properties["BackgroundColor"]);
-            //    glyphMarginGrid.Background.Freeze();
-            //}
-            //else if (properties.Contains("Background"))
-            //{
-            //    glyphMarginGrid.Background = (Brush)properties["Background"];
-            //}
-            //else
-            //{
-            //    glyphMarginGrid.Background = Brushes.Transparent;
-            //}
-
-            //var background = glyphMarginGrid.Background as SolidColorBrush;
-            //if (background != null)
-            //{
-            //    ImageThemingUtilities.SetImageBackgroundColor(glyphMarginGrid, background.Color);
-            //}
         }
     }
 }