From c478b0f031c03cf9e2eb0cd5810d2f5ec73fde6b Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 6 Feb 2022 00:39:23 -0500 Subject: [PATCH] Fixes changes hover with uncommitted changes --- src/hovers/hovers.ts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/hovers/hovers.ts b/src/hovers/hovers.ts index 8fb3ffc..a8eb4bb 100644 --- a/src/hovers/hovers.ts +++ b/src/hovers/hovers.ts @@ -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,