Attempts to fix #80 - on line with link, annotation gets underlined

Author: eamodio

src/annotations/annotationController.ts

@@ -12,7 +12,8 @@ import { WhitespaceController } from './whitespaceController';
 
 export const Decorations = {
     annotation: window.createTextEditorDecorationType({
-        isWholeLine: true
+        isWholeLine: true,
+        textDecoration: 'none'
     } as DecorationRenderOptions),
     highlight: undefined as TextEditorDecorationType | undefined
 };
@@ -233,7 +234,7 @@ export class AnnotationController extends Disposable {
         for (const [key, p] of this._annotationProviders) {
             if (!TextDocumentComparer.equals(p.document, e.document)) continue;
 
-            // TODO: Rework this once https://github.com/Microsoft/vscode/issues/27231 is released in v1.13
+            // TODO: Rework this once https://github.com/Microsoft/vscode/issues/27231 is released in v1.13
             // We have to defer because isDirty is not reliable inside this event
             setTimeout(() => {
                 // If the document is dirty all is fine, just kick out since the GitContextTracker will handle it

src/annotations/annotations.ts

@@ -77,8 +77,7 @@ export class Annotations {
                 before: {
                     ...renderOptions.before,
                     ...{
-                        contentText: content,
-                        margin: '0 26px 0 0'
+                        contentText: content
                     }
                 },
                 dark: {
@@ -113,7 +112,9 @@ export class Annotations {
             before: {
                 borderStyle: borderStyle,
                 borderWidth: borderWidth,
-                height: cfgFileTheme.separateLines ? 'calc(100% - 1px)' : '100%'
+                height: cfgFileTheme.separateLines ? 'calc(100% - 1px)' : '100%',
+                margin: '0 26px 0 0',
+                textDecoration: 'none'
             },
             dark: {
                 backgroundColor: cfgFileTheme.dark.backgroundColor || undefined,
@@ -123,7 +124,7 @@ export class Annotations {
                 backgroundColor: cfgFileTheme.light.backgroundColor || undefined,
                 color: cfgFileTheme.light.foregroundColor || themeDefaults.annotations.file.gutter.light.foregroundColor
             } as DecorationInstanceRenderOptions
-        };
+        } as IRenderOptions;
     }
 
     static hover(commit: GitCommit, renderOptions: IRenderOptions, heatmap: boolean): DecorationOptions {
@@ -142,7 +143,8 @@ export class Annotations {
                 borderWidth: '0 0 0 2px',
                 contentText: '\u200B',
                 height: cfgTheme.annotations.file.hover.separateLines ? 'calc(100% - 1px)' : '100%',
-                margin: '0 26px 0 0'
+                margin: '0 26px 0 0',
+                textDecoration: 'none'
             }
         } as IRenderOptions;
     }