@codingame/monaco-vscode-editor-service-override 2.2.1 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-editor-service-override",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.0.0",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }

package/tools/editor.js

@@ -192,8 +192,8 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
         this.onWillOpenEditor = this._onWillOpenEditor.event;
         this.id = --StandaloneEditorGroup_1.idCounter;
         this.index = -1;
-        this.label = `standalone editor ${this.editor.getId()}`;
-        this.ariaLabel = `standalone editor ${this.editor.getId()}`;
+        this.label = `standalone editor ${-this.id}`;
+        this.ariaLabel = `standalone editor ${-this.id}`;
         this.previewEditor = null;
         this.isLocked = true;
         this.stickyCount = 0;
@@ -201,8 +201,22 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
         this.findEditors = (resource) => this.pane != null && ( resource.toString()) === ( this.pane.input.resource.toString()) ? [this.pane.input] : [];
         this.getEditorByIndex = (index) => this.pane != null && index === 0 ? this.pane.input : undefined;
         this.getIndexOfEditor = (editorInput) => this.pane != null && this.pane.input === editorInput ? 0 : -1;
-        this.openEditor = unsupported;
-        this.openEditors = unsupported;
+        this.openEditor = async (editor) => {
+            if (editor.isDisposed()) {
+                return undefined;
+            }
+            if (editor instanceof TextResourceEditorInput && ( editor.resource.toString()) === this.pane?.input.resource.toString()) {
+                this.focus();
+                return this.pane;
+            }
+            return undefined;
+        };
+        this.openEditors = async (editors) => {
+            if (editors.length === 1) {
+                return this.openEditor(editors[0].editor);
+            }
+            return undefined;
+        };
         this.isPinned = () => false;
         this.isSticky = () => false;
         this.isActive = () => this.editor.hasWidgetFocus();
@@ -318,6 +332,7 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
     }
     focus() {
         this.editor.focus();
+        this.editor.getContainerDomNode().scrollIntoView();
     }
 };
 StandaloneEditorGroup.idCounter = 0;
@@ -397,15 +412,23 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
             const codeEditorService = StandaloneServices.get(ICodeEditorService);
             const handleCodeEditor = (editor) => {
                 if (editor instanceof StandaloneEditor) {
+                    let timeout;
                     const onEditorFocused = () => {
+                        if (timeout != null)
+                            window.clearTimeout(timeout);
                         this.activeGroupOverride = this.additionalGroups.find(group => group.editor === editor);
                         this._onDidChangeActiveGroup.fire(this.activeGroup);
                     };
                     const onEditorBlurred = () => {
-                        if (this.activeGroupOverride === this.additionalGroups.find(group => group.editor === editor)) {
-                            this.activeGroupOverride = undefined;
-                            this._onDidChangeActiveGroup.fire(this.activeGroup);
-                        }
+                        if (timeout != null)
+                            window.clearTimeout(timeout);
+                        timeout = window.setTimeout(() => {
+                            timeout = undefined;
+                            if (this.activeGroupOverride === this.additionalGroups.find(group => group.editor === editor)) {
+                                this.activeGroupOverride = undefined;
+                                this._onDidChangeActiveGroup.fire(this.activeGroup);
+                            }
+                        }, 100);
                     };
                     editor.onDidFocusEditorText(onEditorFocused);
                     editor.onDidFocusEditorWidget(onEditorFocused);