Fixes repo fallback on many commandsFixes #366 - deals null parameters from command callbacks

Author: eamodio

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+### Fixed
+- Fixes many issues where commands wouldn't work if the active file wasn't part of an open repository — now GitLens will try to find the best repository otherwise it will open a repository quick pick menu if there is more than one
+- Fixes [#366](https://github.com/eamodio/vscode-gitlens/issues/366) - Running a GitLens command from a keybinding fails (more cases)
+
 ## [8.3.1] - 2018-05-18
 ### Added
 - Adds the ability to control where the *GitLens*, *GitLens History*, and *GitLens Results* explorers are shown 🎉 — closes [#213](https://github.com/eamodio/vscode-gitlens/issues/213), [#377](https://github.com/eamodio/vscode-gitlens/issues/377)

src/commands/clearFileAnnotations.ts

@@ -12,10 +12,10 @@ export class ClearFileAnnotationsCommand extends EditorCommand {
     }
 
     async execute(editor: TextEditor, edit: TextEditorEdit, uri?: Uri): Promise<any> {
-        if (editor === undefined) return undefined;
+        if (editor == null) return undefined;
 
         // Handle the case where we are focused on a non-editor editor (output, debug console)
-        if (uri !== undefined && !UriComparer.equals(uri, editor.document.uri)) {
+        if (uri != null && !UriComparer.equals(uri, editor.document.uri)) {
             const e = window.visibleTextEditors.find(e => UriComparer.equals(uri, e.document.uri));
             if (e !== undefined) {
                 editor = e;

src/commands/closeUnchangedFiles.ts

@@ -1,12 +1,11 @@
 'use strict';
 import { commands, TextEditor, Uri, window } from 'vscode';
 import { ActiveEditorTracker } from '../trackers/activeEditorTracker';
-import { ActiveEditorCommand, Commands, getCommandUri } from './common';
+import { ActiveEditorCommand, Commands, getCommandUri, getRepoPathOrActiveOrPrompt } from './common';
 import { TextEditorComparer, UriComparer } from '../comparers';
-import { BuiltInCommands } from '../constants';
+import { BuiltInCommands, GlyphChars } from '../constants';
 import { Container } from '../container';
 import { Logger } from '../logger';
-import { Messages } from '../messages';
 
 export interface CloseUnchangedFilesCommandArgs {
     uris?: Uri[];
@@ -25,8 +24,8 @@ export class CloseUnchangedFilesCommand extends ActiveEditorCommand {
             if (args.uris === undefined) {
                 args = { ...args };
 
-                const repoPath = await Container.git.getRepoPath(uri);
-                if (!repoPath) return Messages.showNoRepositoryWarningMessage(`Unable to close unchanged files`);
+                const repoPath = await getRepoPathOrActiveOrPrompt(uri, editor, `Close unchanged files in which repository${GlyphChars.Ellipsis}`);
+                if (!repoPath) return undefined;
 
                 const status = await Container.git.getStatusForRepo(repoPath);
                 if (status === undefined) return window.showWarningMessage(`Unable to close unchanged files`);
@@ -40,9 +39,9 @@ export class CloseUnchangedFilesCommand extends ActiveEditorCommand {
 
             let count = 0;
             let previous = undefined;
-            let editor = window.activeTextEditor;
+            editor = window.activeTextEditor;
             while (true) {
-                if (editor !== undefined) {
+                if (editor != null) {
                     if (TextEditorComparer.equals(previous, editor, { useId: true, usePosition: true })) {
                         break;
                     }
@@ -63,7 +62,7 @@ export class CloseUnchangedFilesCommand extends ActiveEditorCommand {
                 previous = editor;
                 editor = await editorTracker.awaitClose(500);
 
-                if (previous === undefined && editor === undefined) {
+                if (previous === undefined && editor == null) {
                     count++;
                     // This is such a shitty hack, but I can't figure out any other reliable way to know that we've cycled through all the editors :(
                     if (count >= 4) {

src/commands/common.ts

@@ -7,6 +7,7 @@ import { GitBranch, GitCommit, GitRemote, GitUri } from '../gitService';
 import { Logger } from '../logger';
 // import { Telemetry } from '../telemetry';
 import * as path from 'path';
+import { CommandQuickPickItem, RepositoriesQuickPick } from '../quickPicks/quickPicks';
 
 export enum Commands {
     ClearFileAnnotations = 'gitlens.clearFileAnnotations',
@@ -77,6 +78,27 @@ export function getCommandUri(uri?: Uri, editor?: TextEditor): Uri | undefined {
     return document.uri;
 }
 
+export async function getRepoPathOrActiveOrPrompt(uri: Uri | undefined, editor: TextEditor | undefined, placeholder: string, goBackCommand?: CommandQuickPickItem) {
+    let repoPath = await Container.git.getRepoPathOrActive(uri, editor);
+    if (!repoPath) {
+        const pick = await RepositoriesQuickPick.show(placeholder, goBackCommand);
+        if (pick instanceof CommandQuickPickItem) {
+            await pick.execute();
+            return undefined;
+        }
+
+        if (pick === undefined) {
+            if (goBackCommand !== undefined) {
+                await goBackCommand.execute();
+            }
+            return undefined;
+        }
+
+        repoPath = pick.repoPath;
+    }
+    return repoPath;
+}
+
 export interface CommandContextParsingOptions {
     editor: boolean;
     uri: boolean;
@@ -138,7 +160,7 @@ function isScmResourceGroup(group: any): group is SourceControlResourceGroup {
 function isScmResourceState(state: any): state is SourceControlResourceState {
     if (state == null) return false;
 
-    return (state as SourceControlResourceState).resourceUri !== undefined;
+    return (state as SourceControlResourceState).resourceUri != null;
 }
 
 function isTextEditor(editor: any): editor is TextEditor {

src/commands/copyMessageToClipboard.ts

@@ -36,7 +36,7 @@ export class CopyMessageToClipboardCommand extends ActiveEditorCommand {
             args = { ...args };
 
             // If we don't have an editor then get the message of the last commit to the branch
-            if (uri === undefined) {
+            if (uri == null) {
                 const repoPath = await Container.git.getActiveRepoPath(editor);
                 if (!repoPath) return undefined;
 

src/commands/copyShaToClipboard.ts

@@ -34,7 +34,7 @@ export class CopyShaToClipboardCommand extends ActiveEditorCommand {
             args = { ...args };
 
             // If we don't have an editor then get the sha of the last commit to the branch
-            if (uri === undefined) {
+            if (uri == null) {
                 const repoPath = await Container.git.getActiveRepoPath(editor);
                 if (!repoPath) return undefined;
 

src/commands/diffBranchWithBranch.ts

@@ -1,10 +1,9 @@
 'use strict';
 import { CancellationTokenSource, TextEditor, Uri, window } from 'vscode';
-import { ActiveEditorCommand, CommandContext, Commands, getCommandUri } from './common';
+import { ActiveEditorCommand, CommandContext, Commands, getCommandUri, getRepoPathOrActiveOrPrompt } from './common';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
 import { Logger } from '../logger';
-import { Messages } from '../messages';
 import { BranchesAndTagsQuickPick, CommandQuickPickItem } from '../quickPicks/quickPicks';
 
 export interface DiffBranchWithBranchCommandArgs {
@@ -40,8 +39,8 @@ export class DiffBranchWithBranchCommand extends ActiveEditorCommand {
         let progressCancellation: CancellationTokenSource | undefined;
 
         try {
-            const repoPath = await Container.git.getRepoPath(uri);
-            if (!repoPath) return Messages.showNoRepositoryWarningMessage(`Unable to open branch compare`);
+            const repoPath = await getRepoPathOrActiveOrPrompt(uri, editor, `Compare with branch or tag in which repository${GlyphChars.Ellipsis}`);
+            if (!repoPath) return undefined;
 
             if (!args.ref1) {
                 let placeHolder;

src/commands/diffDirectory.ts

@@ -1,12 +1,11 @@
 'use strict';
 import { CancellationTokenSource, commands, TextEditor, Uri, window } from 'vscode';
-import { ActiveEditorCommand, Commands, getCommandUri } from './common';
+import { ActiveEditorCommand, Commands, getCommandUri, getRepoPathOrActiveOrPrompt } from './common';
 import { CommandContext, isCommandViewContextWithRef } from '../commands';
 import { BuiltInCommands, GlyphChars } from '../constants';
 import { Container } from '../container';
 import { ComparisonResultsNode } from '../views/explorerNodes';
 import { Logger } from '../logger';
-import { Messages } from '../messages';
 import { BranchesAndTagsQuickPick, CommandQuickPickItem } from '../quickPicks/quickPicks';
 
 export interface DiffDirectoryCommandArgs {
@@ -51,8 +50,8 @@ export class DiffDirectoryCommand extends ActiveEditorCommand {
         let progressCancellation: CancellationTokenSource | undefined;
 
         try {
-            const repoPath = await Container.git.getRepoPath(uri);
-            if (!repoPath) return Messages.showNoRepositoryWarningMessage(`Unable to open directory compare`);
+            const repoPath = await getRepoPathOrActiveOrPrompt(uri, editor, `Compare directory in which repository${GlyphChars.Ellipsis}`);
+            if (!repoPath) return undefined;
 
             if (!args.ref1) {
                 args = { ...args };

src/commands/diffLineWithPrevious.ts

@@ -22,13 +22,13 @@ export class DiffLineWithPreviousCommand extends ActiveEditorCommand {
 
     async execute(editor?: TextEditor, uri?: Uri, args: DiffLineWithPreviousCommandArgs = {}): Promise<any> {
         uri = getCommandUri(uri, editor);
-        if (uri === undefined) return undefined;
+        if (uri == null) return undefined;
 
         const gitUri = await GitUri.fromUri(uri);
 
         args = { ...args };
         if (args.line === undefined) {
-            args.line = editor === undefined ? 0 : editor.selection.active.line;
+            args.line = editor == null ? 0 : editor.selection.active.line;
         }
 
         if (args.commit === undefined || GitService.isUncommitted(args.commit.sha)) {

src/commands/diffLineWithWorking.ts

@@ -22,13 +22,13 @@ export class DiffLineWithWorkingCommand extends ActiveEditorCommand {
 
     async execute(editor?: TextEditor, uri?: Uri, args: DiffLineWithWorkingCommandArgs = {}): Promise<any> {
         uri = getCommandUri(uri, editor);
-        if (uri === undefined) return undefined;
+        if (uri == null) return undefined;
 
         const gitUri = await GitUri.fromUri(uri);
 
         args = { ...args };
         if (args.line === undefined) {
-            args.line = editor === undefined ? 0 : editor.selection.active.line;
+            args.line = editor == null ? 0 : editor.selection.active.line;
         }
 
         if (args.commit === undefined || GitService.isUncommitted(args.commit.sha)) {