ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-16 10:58:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eric Amodio
2017-06-06 13:29:38 -04:00
parent e5e582d300
commit d2dc172042
3 changed files with 434 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/annotations/annotationController.ts
View File

@@ -12,7 +12,8 @@ import { WhitespaceController } from './whitespaceController';
export const Decorations = { export const Decorations = {
annotation: window.createTextEditorDecorationType({ annotation: window.createTextEditorDecorationType({
isWholeLine: true isWholeLine: true,
textDecoration: 'none'
} as DecorationRenderOptions), } as DecorationRenderOptions),
highlight: undefined as TextEditorDecorationType | undefined highlight: undefined as TextEditorDecorationType | undefined
}; };

12
src/annotations/annotations.ts
View File

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

3
src/currentLineController.ts
View File

@@ -11,7 +11,8 @@ import { BlameabilityChangeEvent, CommitFormatter, GitCommit, GitContextTracker,
const annotationDecoration: TextEditorDecorationType = window.createTextEditorDecorationType({ const annotationDecoration: TextEditorDecorationType = window.createTextEditorDecorationType({
after: { after: {
margin: '0 0 0 4em' margin: '0 0 0 3em',
textDecoration: 'none'
} }
} as DecorationRenderOptions); } as DecorationRenderOptions);