ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-14 12:08:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Keeps the hover info in the whitespace area at the start of the current line

Browse Source
This commit is contained in:
Eric Amodio
2017-07-28 18:19:45 -04:00
parent a272f8f6a4
commit 0bd31099ce
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/annotations/gutterBlameAnnotationProvider.ts
View File

@@ -62,8 +62,8 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {
compacted = true; compacted = true;
} }
// const firstNonWhitespace = document.lineAt(line).firstNonWhitespaceCharacterIndex; const endIndex = document.lineAt(line).firstNonWhitespaceCharacterIndex;
gutter.range = new Range(line, 0, line, 0); // document.validateRange(new Range(line, 0, line, firstNonWhitespace)); gutter.range = new Range(line, 0, line, endIndex);
decorations.push(gutter); decorations.push(gutter);
if (details !== undefined) { if (details !== undefined) {
@@ -93,8 +93,8 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {
Annotations.applyHeatmap(gutter, commit.date, now); Annotations.applyHeatmap(gutter, commit.date, now);
} }
// const firstNonWhitespace = document.lineAt(line).firstNonWhitespaceCharacterIndex; const endIndex = document.lineAt(line).firstNonWhitespaceCharacterIndex;
gutter.range = new Range(line, 0, line, 0); // document.validateRange(new Range(line, 0, line, firstNonWhitespace)); gutter.range = new Range(line, 0, line, endIndex);
decorations.push(gutter); decorations.push(gutter);
if (cfg.hover.details) { if (cfg.hover.details) {

10
src/annotations/hoverBlameAnnotationProvider.ts
View File

@@ -24,6 +24,7 @@ export class HoverBlameAnnotationProvider extends BlameAnnotationProviderBase {
const dateFormat = this._config.defaultDateFormat; const dateFormat = this._config.defaultDateFormat;
const decorations: DecorationOptions[] = []; const decorations: DecorationOptions[] = [];
const document = this.document;
let commit: GitBlameCommit | undefined; let commit: GitBlameCommit | undefined;
let hover: DecorationOptions | undefined; let hover: DecorationOptions | undefined;
@@ -36,8 +37,13 @@ export class HoverBlameAnnotationProvider extends BlameAnnotationProviderBase {
hover = Annotations.hover(commit, renderOptions, cfg.heatmap.enabled, dateFormat); hover = Annotations.hover(commit, renderOptions, cfg.heatmap.enabled, dateFormat);
const endIndex = cfg.wholeLine ? endOfLineIndex : this.editor.document.lineAt(line).firstNonWhitespaceCharacterIndex; if (cfg.wholeLine) {
hover.range = this.editor.document.validateRange(new Range(line, 0, line, endIndex)); hover.range = document.validateRange(new Range(line, 0, line, endOfLineIndex));
}
else {
const endIndex = document.lineAt(line).firstNonWhitespaceCharacterIndex;
hover.range = new Range(line, 0, line, endIndex);
}
if (cfg.heatmap.enabled) { if (cfg.heatmap.enabled) {
Annotations.applyHeatmap(hover, commit.date, now); Annotations.applyHeatmap(hover, commit.date, now);