Changes code lens and line blame toggles to always work

package.json

@@ -1686,11 +1686,11 @@
                 },
                 {
                     "command": "gitlens.toggleLineBlame",
-                    "when": "gitlens:activeIsBlameable"
+                    "when": "gitlens:enabled"
                 },
                 {
                     "command": "gitlens.toggleCodeLens",
-                    "when": "gitlens:activeIsTracked && gitlens:canToggleCodeLens"
+                    "when": "gitlens:enabled && gitlens:canToggleCodeLens"
                 },
                 {
                     "command": "gitlens.showLastQuickPick",
@@ -3083,7 +3083,7 @@
                 "command": "gitlens.toggleCodeLens",
                 "key": "ctrl+shift+g shift+b",
                 "mac": "cmd+alt+g shift+b",
-                "when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsTracked && gitlens:canToggleCodeLens"
+                "when": "gitlens:keymap == chorded && editorTextFocus && gitlens:enabled && gitlens:canToggleCodeLens"
             },
             {
                 "command": "gitlens.showLastQuickPick",
@@ -3159,7 +3159,7 @@
             {
                 "command": "gitlens.toggleCodeLens",
                 "key": "shift+alt+b",
-                "when": "gitlens:keymap == standard && editorTextFocus && gitlens:activeIsTracked && gitlens:canToggleCodeLens"
+                "when": "gitlens:keymap == standard && editorTextFocus && gitlens:enabled && gitlens:canToggleCodeLens"
             },
             {
                 "command": "gitlens.showLastQuickPick",

src/codeLensController.ts

@@ -1,5 +1,5 @@
 'use strict';
-import { ConfigurationChangeEvent, Disposable, languages, TextEditor } from 'vscode';
+import { ConfigurationChangeEvent, Disposable, languages } from 'vscode';
 import { configuration, ICodeLensConfig } from './configuration';
 import { CommandContext, setCommandContext } from './constants';
 import { Container } from './container';
@@ -79,7 +79,7 @@ export class CodeLensController extends Disposable {
         this._provider.reset('idle');
     }
 
-    toggleCodeLens(editor: TextEditor)
 {
+    toggleCodeLens() {
         if (!this._canToggle) return;
 
         Logger.log(`toggleCodeLens()`);

src/commands/showLineBlame.ts

@@ -1,18 +1,16 @@
 'use strict';
-import { TextEditor, TextEditorEdit, window } from 'vscode';
-import { Commands, EditorCommand } from './common';
+import { TextEditor, Uri, window } from 'vscode';
+import { ActiveEditorCommand, Commands } from './common';
 import { Container } from '../container';
 import { Logger } from '../logger';
 
-export class ShowLineBlameCommand extends EditorCommand {
+export class ShowLineBlameCommand extends ActiveEditorCommand {
 
     constructor() {
         super(Commands.ShowLineBlame);
     }
 
-    async execute(editor: TextEditor, edit: TextEditorEdit): Promise<any> {
-        if (editor === undefined) return undefined;
-
+    async execute(editor?: TextEditor, uri?: Uri): Promise<any> {
         try {
             return Container.lineAnnotations.showAnnotations(editor);
         }

src/commands/toggleCodeLens.ts

@@ -1,15 +1,14 @@
 'use strict';
-import { TextEditor, TextEditorEdit } from 'vscode';
-import { Commands, EditorCommand } from './common';
+import { Command, Commands } from './common';
 import { Container } from '../container';
 
-export class ToggleCodeLensCommand extends EditorCommand {
+export class ToggleCodeLensCommand extends Command {
 
     constructor() {
         super(Commands.ToggleCodeLens);
     }
 
-    execute(editor: TextEditor, edit: TextEditorEdit)
 {
-        return Container.codeLens.toggleCodeLens(editor);
+    execute() {
+        return Container.codeLens.toggleCodeLens();
     }
 }

src/commands/toggleLineBlame.ts

@@ -1,18 +1,16 @@
 'use strict';
-import { TextEditor, TextEditorEdit, Uri, window } from 'vscode';
-import { Commands, EditorCommand } from './common';
+import { TextEditor, Uri, window } from 'vscode';
+import { ActiveEditorCommand, Commands } from './common';
 import { Container } from '../container';
 import { Logger } from '../logger';
 
-export class ToggleLineBlameCommand extends EditorCommand {
+export class ToggleLineBlameCommand extends ActiveEditorCommand {
 
     constructor() {
         super(Commands.ToggleLineBlame);
     }
 
-    async execute(editor: TextEditor, edit: TextEditorEdit, uri?: Uri): Promise<any> {
-        if (editor === undefined) return undefined;
-
+    async execute(editor: TextEditor, uri?: Uri): Promise<any> {
         try {
             return Container.lineAnnotations.toggleAnnotations(editor);
         }

src/currentLineController.ts

@@ -311,8 +311,6 @@ export class CurrentLineController extends Disposable {
     }
 
     async toggleAnnotations(editor: TextEditor | undefined) {
-        if (editor === undefined) return;
-
         const state = this.getBlameAnnotationState();
         this.setBlameAnnotationState(!state.enabled, editor);
     }