fix: peek view context key scoped (#504)

opensumi · Feb 23, 2022 · 43a8d47 · 43a8d47
1 parent 9e7f2ec
commit 43a8d47
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/testing/src/browser/outputPeek/test-output-peek.ts b/packages/testing/src/browser/outputPeek/test-output-peek.ts
@@ -75,7 +75,7 @@ export class TestOutputPeekContribution implements IEditorFeatureContribution {
   private currentPeekUri: URI | undefined;
 
   constructor(@Optional() private readonly editor: IEditor) {
-    this.testContextKey = this.injector.get(TestContextKey, [this.editor.monacoEditor.getContainerDomNode()]);
+    this.testContextKey = this.injector.get(TestContextKey, [(this.editor.monacoEditor as any)._contextKeyService]);
   }
 
   private allMessages(results: readonly ITestResult[]): {

diff --git a/packages/testing/src/browser/test-contextkey.service.ts b/packages/testing/src/browser/test-contextkey.service.ts
@@ -1,3 +1,5 @@
+import { IContextKeyServiceTarget } from '@opensumi/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
+import { ContextKeyService } from '@opensumi/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
 import { Optional, Injectable, Autowired } from '@opensumi/di';
 import { IContextKeyService, IContextKey, IScopedContextKeyService } from '@opensumi/ide-core-browser';
 import { TestingIsPeekVisible } from '@opensumi/ide-core-browser/lib/contextkey/testing';
@@ -11,7 +13,7 @@ export class TestContextKey {
 
   public readonly contextTestingIsPeekVisible: IContextKey<boolean>;
 
-  constructor(@Optional() dom?: HTMLElement) {
+  constructor(@Optional() dom?: HTMLElement | IContextKeyServiceTarget | ContextKeyService) {
     this._contextKeyService = this.globalContextKeyService.createScoped(dom);
     this.contextTestingIsPeekVisible = TestingIsPeekVisible.bind(this.contextKeyScoped);
   }