Parcourir la source

Allows toggle CodeLens command to work when set to auto

main
Eric Amodio il y a 7 ans
Parent
révision
ce0842f41c
2 fichiers modifiés avec 3 ajouts et 11 suppressions
  1. +0
    -7
      src/blameActiveLineController.ts
  2. +3
    -4
      src/gitService.ts

+ 0
- 7
src/blameActiveLineController.ts Voir le fichier

@ -62,13 +62,6 @@ export class BlameActiveLineController extends Disposable {
changed = true;
if (config.statusBar.enabled) {
this._statusBarItem = this._statusBarItem || window.createStatusBarItem(StatusBarAlignment.Right, 1000);
switch (config.statusBar.command) {
case StatusBarCommand.ToggleCodeLens:
if (config.codeLens.visibility !== 'ondemand') {
config.statusBar.command = StatusBarCommand.BlameAnnotate;
}
break;
}
this._statusBarItem.command = config.statusBar.command;
}
else if (!config.statusBar.enabled && this._statusBarItem) {

+ 3
- 4
src/gitService.ts Voir le fichier

@ -144,7 +144,7 @@ export class GitService extends Disposable {
this._codeLensProvider = undefined;
}
setCommandContext(CommandContext.CanToggleCodeLens, config.codeLens.visibility === CodeLensVisibility.OnDemand && (config.codeLens.recentChange.enabled || config.codeLens.authors.enabled));
setCommandContext(CommandContext.CanToggleCodeLens, config.codeLens.visibility !== CodeLensVisibility.Off && (config.codeLens.recentChange.enabled || config.codeLens.authors.enabled));
}
if (advancedChanged) {
@ -827,11 +827,10 @@ export class GitService extends Disposable {
}
toggleCodeLens(editor: TextEditor) {
if (this.config.codeLens.visibility !== CodeLensVisibility.OnDemand ||
if (this.config.codeLens.visibility === CodeLensVisibility.Off ||
(!this.config.codeLens.recentChange.enabled && !this.config.codeLens.authors.enabled)) return;
Logger.log(`toggleCodeLens(${editor})`);
Logger.log(`toggleCodeLens()`);
if (this._codeLensProviderDisposable) {
this._codeLensProviderDisposable.dispose();
this._codeLensProviderDisposable = undefined;

Chargement…
Annuler
Enregistrer