@codingame/monaco-vscode-workbench-service-override 38.0.3 → 38.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workbench-service-override",
-  "version": "38.0.3",
+  "version": "38.0.7",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - workbench service-override",
   "keywords": [],
@@ -15,15 +15,15 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "38.0.3",
-    "@codingame/monaco-vscode-environment-service-override": "38.0.3",
-    "@codingame/monaco-vscode-katex-common": "38.0.3",
-    "@codingame/monaco-vscode-keybindings-service-override": "38.0.3",
-    "@codingame/monaco-vscode-quickaccess-service-override": "38.0.3",
-    "@codingame/monaco-vscode-view-banner-service-override": "38.0.3",
-    "@codingame/monaco-vscode-view-common-service-override": "38.0.3",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "38.0.3",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "38.0.3"
+    "@codingame/monaco-vscode-api": "38.0.7",
+    "@codingame/monaco-vscode-environment-service-override": "38.0.7",
+    "@codingame/monaco-vscode-katex-common": "38.0.7",
+    "@codingame/monaco-vscode-keybindings-service-override": "38.0.7",
+    "@codingame/monaco-vscode-quickaccess-service-override": "38.0.7",
+    "@codingame/monaco-vscode-view-banner-service-override": "38.0.7",
+    "@codingame/monaco-vscode-view-common-service-override": "38.0.7",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "38.0.7",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "38.0.7"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/sessions/contrib/terminal/browser/sessionsTerminalContribution.d.ts

@@ -93,6 +93,7 @@ export declare class SessionsTerminalContribution extends Disposable implements
     private _isTerminalTracked;
     private _removeTerminalFromTrackedSessions;
     private _getAvailableTerminal;
+    private _shouldIgnoreTerminal;
     /**
      * Shows background terminals that belong to the active session and hides
      * foreground terminals that belong to other sessions. When the active

package/vscode/src/vs/sessions/contrib/terminal/browser/sessionsTerminalContribution.js

@@ -183,7 +183,7 @@ let SessionsTerminalContribution = class SessionsTerminalContribution extends Di
             this._standaloneTerminalIds.delete(instance.instanceId);
         }));
         this._register(this._terminalService.onDidCreateInstance(instance => {
-            if (instance.shellLaunchConfig.hideFromUser) {
+            if (instance.shellLaunchConfig.hideFromUser || this._shouldIgnoreTerminal(instance)) {
                 return;
             }
             if (instance.shellLaunchConfig.attachPersistentProcess && this._activeKey) {
@@ -400,7 +400,7 @@ let SessionsTerminalContribution = class SessionsTerminalContribution extends Di
     async _findTerminalsForKey(key, options) {
         const result = [];
         for (const instance of this._terminalService.instances) {
-            if (instance.shellLaunchConfig.hideFromUser) {
+            if (instance.shellLaunchConfig.hideFromUser || this._shouldIgnoreTerminal(instance)) {
                 continue;
             }
             if (options?.excludeTracked && (this._isTerminalTracked(instance.instanceId) || ( this._standaloneTerminalIds.has(instance.instanceId)))) {
@@ -425,6 +425,9 @@ let SessionsTerminalContribution = class SessionsTerminalContribution extends Di
             this._sessionTerminals.set(sessionId, terminalIds);
         }
         for (const instance of instances) {
+            if (this._shouldIgnoreTerminal(instance)) {
+                continue;
+            }
             terminalIds.add(instance.instanceId);
             if (scope) {
                 this._trackedTerminalScopes.set(instance.instanceId, scope);
@@ -553,7 +556,13 @@ let SessionsTerminalContribution = class SessionsTerminalContribution extends Di
         }
         return currentInstance;
     }
+    _shouldIgnoreTerminal(instance) {
+        return !instance.shellLaunchConfig.customPtyImplementation;
+    }
     async _terminalMatchesScope(instance, key, agentHostAddress) {
+        if (this._shouldIgnoreTerminal(instance)) {
+            return false;
+        }
         const trackedScope = this._trackedTerminalScopes.get(instance.instanceId);
         if (trackedScope) {
             return trackedScope.key === key && trackedScope.agentHostAddress === agentHostAddress;
@@ -584,7 +593,7 @@ let SessionsTerminalContribution = class SessionsTerminalContribution extends Di
             this._getTrackedTerminalsForSession(activeSession.sessionId).map(instance => instance.instanceId)
         ));
         for (const instance of [...this._terminalService.instances]) {
-            if (instance.shellLaunchConfig.hideFromUser || ( this._standaloneTerminalIds.has(instance.instanceId))) {
+            if (instance.shellLaunchConfig.hideFromUser || ( this._standaloneTerminalIds.has(instance.instanceId)) || this._shouldIgnoreTerminal(instance)) {
                 continue;
             }
             const currentInstance = this._getAvailableTerminal(instance, "update terminal visibility");
@@ -725,7 +734,7 @@ let SessionsTerminalContribution = class SessionsTerminalContribution extends Di
     async _findUntrackedTerminalsForResource(resource) {
         const result = [];
         for (const instance of this._terminalService.instances) {
-            if (!instance.shellLaunchConfig.attachPersistentProcess || instance.shellLaunchConfig.hideFromUser || this._isTerminalTracked(instance.instanceId) || ( this._standaloneTerminalIds.has(instance.instanceId))) {
+            if (!instance.shellLaunchConfig.attachPersistentProcess || this._shouldIgnoreTerminal(instance) || instance.shellLaunchConfig.hideFromUser || this._isTerminalTracked(instance.instanceId) || ( this._standaloneTerminalIds.has(instance.instanceId))) {
                 continue;
             }
             try {