Browse Source

Fixes changes hover with uncommitted changes

main
Eric Amodio 2 years ago
parent
commit
c478b0f031
1 changed files with 2 additions and 8 deletions
  1. +2
    -8
      src/hovers/hovers.ts

+ 2
- 8
src/hovers/hovers.ts View File

@ -25,16 +25,10 @@ export namespace Hovers {
// TODO: Figure out how to optimize this
let ref;
let ref2 = documentRef;
if (commit.isUncommitted) {
if (GitRevision.isUncommittedStaged(documentRef)) {
ref = documentRef;
}
// Check for a staged diff
if (ref == null && ref2 == null) {
ref2 = GitRevision.uncommittedStaged;
}
} else {
ref = commit.file.previousSha;
if (ref == null) {
@ -54,10 +48,10 @@ export namespace Hovers {
editorLine = commitLine.line - 1;
// TODO: Doesn't work with dirty files -- pass in editor? or contents?
let hunkLine = await Container.instance.git.getDiffForLine(uri, editorLine, ref, ref2);
let hunkLine = await Container.instance.git.getDiffForLine(uri, editorLine, ref, documentRef);
// If we didn't find a diff & ref is undefined (meaning uncommitted), check for a staged diff
if (hunkLine == null && ref == null && ref2 !== GitRevision.uncommittedStaged) {
if (hunkLine == null && ref == null && documentRef !== GitRevision.uncommittedStaged) {
hunkLine = await Container.instance.git.getDiffForLine(
uri,
editorLine,

Loading…
Cancel
Save