From 835d1f6d868d26bd181db92a54c55de2b07bfd7e Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 29 Mar 2023 16:58:23 -0400 Subject: [PATCH] Fixes incorrect id for rebase editor --- src/constants.ts | 2 +- src/eventBus.ts | 2 +- src/webviews/rebase/rebaseEditor.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/constants.ts b/src/constants.ts index a2d3552..8b252b8 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -300,7 +300,7 @@ export const enum Commands { Deprecated_ShowFileHistoryInView = 'gitlens.showFileHistoryInView', } -export type CustomEditorIds = 'rebaseEditor'; +export type CustomEditorIds = 'rebase'; export type WebviewIds = 'graph' | 'settings' | 'timeline' | 'welcome' | 'focus'; export type WebviewViewIds = 'commitDetails' | 'graph' | 'home' | 'timeline'; diff --git a/src/eventBus.ts b/src/eventBus.ts index f761f0e..ba4b659 100644 --- a/src/eventBus.ts +++ b/src/eventBus.ts @@ -40,7 +40,7 @@ interface EventBusEvent { } export type EventBusSource = - | 'gitlens.rebase' + | `gitlens.${CustomEditorIds}` | `gitlens.${WebviewIds}` | `gitlens.views.${WebviewViewIds}` | `gitlens.views.${ViewsConfigKeys}`; diff --git a/src/webviews/rebase/rebaseEditor.ts b/src/webviews/rebase/rebaseEditor.ts index 36d1604..7a46043 100644 --- a/src/webviews/rebase/rebaseEditor.ts +++ b/src/webviews/rebase/rebaseEditor.ts @@ -133,7 +133,7 @@ export class RebaseEditorProvider implements CustomTextEditorProvider, Disposabl } private get contextKeyPrefix() { - return `gitlens:webview:rebaseEditor` as const; + return `gitlens:webview:rebase` as const; } get enabled(): boolean {