Merge pull request gitkraken#89 from afrisalyp/issue-61

Issue 61: Show line comment from common windows. Blue bookmark icons appear on common editor windows, but "Show comment for this line" button menu doesn't
noside911 · Dec 11, 2018 · ba6715b · ba6715b
2 parents 2b3bc50 + 0bdd25e
commit ba6715b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -2327,7 +2327,7 @@
                 },
                 {
                     "command": "gitlens.showCommentCommitLine",
-                    "when": "isInDiffEditor && gitlens:activeFileStatus =~ /tracked/"
+                    "when": "gitlens:activeFileStatus =~ /tracked/"
                 },
                 {
                     "command": "gitlens.diffFileNext",
@@ -2843,7 +2843,7 @@
                 },
                 {
                     "command": "gitlens.showCommentCommitLine",
-                    "when": "isInDiffEditor && gitlens:activeFileStatus =~ /tracked/ && config.gitlens.menus.editorGroup.compare",
+                    "when": "gitlens:activeFileStatus =~ /tracked/ && config.gitlens.menus.editorGroup.compare",
                     "group": "navigation@97"
                 },
                 {

diff --git a/src/gitCommentService.ts b/src/gitCommentService.ts
@@ -179,9 +179,17 @@ export class GitCommentService implements Disposable {
     }
 
     async showLineComment() {
-        if (!AddLineCommentCommand.currentFileCommit || !window.activeTextEditor) return undefined;
+        if (!window.activeTextEditor) return undefined;
+        let repoPath: string | undefined;
+        if (!AddLineCommentCommand.currentFileCommit) {
+            repoPath = await Container.git.getActiveRepoPath(window.activeTextEditor);
+        }
+        else {
+            repoPath = AddLineCommentCommand.currentFileCommit.repoPath;
+        }
+        if (!repoPath) return undefined;
         const gitUri = await GitUri.fromUri(window.activeTextEditor.document.uri);
-        const filename: string = path.relative(AddLineCommentCommand.currentFileCommit.repoPath, gitUri.fsPath);
+        const filename: string = path.relative(repoPath, gitUri.fsPath);
 
         AddLineCommentCommand.currentFileName = filename;