@codingame/monaco-vscode-workbench-service-override 38.0.2 → 38.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workbench-service-override",
-  "version": "38.0.2",
+  "version": "38.0.4",
   "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.2",
-    "@codingame/monaco-vscode-environment-service-override": "38.0.2",
-    "@codingame/monaco-vscode-katex-common": "38.0.2",
-    "@codingame/monaco-vscode-keybindings-service-override": "38.0.2",
-    "@codingame/monaco-vscode-quickaccess-service-override": "38.0.2",
-    "@codingame/monaco-vscode-view-banner-service-override": "38.0.2",
-    "@codingame/monaco-vscode-view-common-service-override": "38.0.2",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "38.0.2",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "38.0.2"
+    "@codingame/monaco-vscode-api": "38.0.4",
+    "@codingame/monaco-vscode-environment-service-override": "38.0.4",
+    "@codingame/monaco-vscode-katex-common": "38.0.4",
+    "@codingame/monaco-vscode-keybindings-service-override": "38.0.4",
+    "@codingame/monaco-vscode-quickaccess-service-override": "38.0.4",
+    "@codingame/monaco-vscode-view-banner-service-override": "38.0.4",
+    "@codingame/monaco-vscode-view-common-service-override": "38.0.4",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "38.0.4",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "38.0.4"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/sessions/browser/parts/chatCompositeBar.js

@@ -388,7 +388,7 @@ let ChatCompositeBar = class ChatCompositeBar extends Disposable {
                 EventHelper.stop(e, true);
                 this._delegate?.openChat(chat.resource);
             } else if (( [KeyCode.LeftArrow, KeyCode.RightArrow, KeyCode.Home, KeyCode.End].some(keyCode => event.equals(keyCode)))) {
-                let tabIndex = this._tabs.indexOf(chatTab);
+                let tabIndex = ( this._tabs.indexOf(chatTab));
                 if (event.equals(KeyCode.LeftArrow)) {
                     tabIndex--;
                 } else if (event.equals(KeyCode.RightArrow)) {

package/vscode/src/vs/sessions/browser/parts/chatGroupsView.js

@@ -648,11 +648,11 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
                 }
             }
         }
-        const referenceIndex = this._groups.indexOf(reference);
+        const referenceIndex = ( this._groups.indexOf(reference));
         return this._groups[referenceIndex + 1] ?? this._groups[referenceIndex - 1];
     }
     _insertGroup(group, reference, zone) {
-        const referenceIndex = this._groups.indexOf(reference);
+        const referenceIndex = ( this._groups.indexOf(reference));
         const insertBefore = zone === "left" || zone === "top";
         this._groups.splice(referenceIndex + (insertBefore ? 0 : 1), 0, group);
     }
@@ -828,7 +828,7 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
         }
     }
     focusAdjacentGroup(direction) {
-        const activeIndex = this._activeGroup ? this._groups.indexOf(this._activeGroup) : -1;
+        const activeIndex = this._activeGroup ? ( this._groups.indexOf(this._activeGroup)) : -1;
         if (activeIndex < 0 || this._groups.length < 2) {
             return;
         }
@@ -846,7 +846,7 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
     }
     moveActiveChatToAdjacentGroup(direction) {
         const source = this._activeGroup;
-        const sourceIndex = source ? this._groups.indexOf(source) : -1;
+        const sourceIndex = source ? ( this._groups.indexOf(source)) : -1;
         const resource = source?.activeResourceId.get();
         if (!source || sourceIndex < 0 || !resource || this._groups.length < 2) {
             return;
@@ -965,7 +965,7 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
                 activeResourceId: group.activeResourceId.get(),
                 pinnedResourceId: group.pinnedResourceId.get()
             })),
-            activeGroupIndex: Math.max(0, this._groups.indexOf(this._activeGroup))
+            activeGroupIndex: Math.max(0, ( this._groups.indexOf(this._activeGroup)))
         };
         this._saveStored(sessionId, layout);
     }

package/vscode/src/vs/sessions/contrib/aquarium/browser/aquariumOverlay.js

@@ -457,7 +457,7 @@ function createActiveAquarium(mainContainer, layoutService, accessibilityService
     }));
     const food = [];
     const removeFood = pellet => {
-        const idx = food.indexOf(pellet);
+        const idx = ( food.indexOf(pellet));
         if (idx !== -1) {
             food.splice(idx, 1);
             pellet.element.remove();

package/vscode/src/vs/sessions/contrib/chat/browser/sessionTaskRunner.js

@@ -8,7 +8,7 @@ class SessionTaskRunnerRegistry {
     register(runner) {
         this._runners.push(runner);
         return toDisposable(() => {
-            const idx = this._runners.indexOf(runner);
+            const idx = ( this._runners.indexOf(runner));
             if (idx >= 0) {
                 this._runners.splice(idx, 1);
             }

package/vscode/src/vs/sessions/contrib/onboardingTours/browser/newSessionViewV3Prompt.js

@@ -81,7 +81,7 @@ class GitHubLookupDiagnostics {
         }
         this._durations.set(stage, Math.max(this._durations.get(stage) ?? 0, durationMs));
         const previous = this._outcomes.get(stage) ?? "notRun";
-        if (LOOKUP_STAGE_OUTCOME_SEVERITY.indexOf(outcome) > LOOKUP_STAGE_OUTCOME_SEVERITY.indexOf(previous)) {
+        if (( LOOKUP_STAGE_OUTCOME_SEVERITY.indexOf(outcome)) > ( LOOKUP_STAGE_OUTCOME_SEVERITY.indexOf(previous))) {
             this._outcomes.set(stage, outcome);
         } else if (!( this._outcomes.has(stage))) {
             this._outcomes.set(stage, previous);
@@ -483,10 +483,7 @@ class NewSessionViewV3PromptRunner {
         })).filter(entry => entry.candidate !== undefined);
         const secondDirectCandidateIndex = directCandidates[1]?.index ?? pullRequests.length;
         const reviewPullRequests = pullRequests.slice(0, secondDirectCandidateIndex).filter(pullRequest => !toDirectPullRequestCandidate(pullRequest));
-        const stableCandidates = getCandidatesInPullRequestOrder(pullRequests.slice(
-            0,
-            reviewPullRequests[0] ? pullRequests.indexOf(reviewPullRequests[0]) : secondDirectCandidateIndex
-        ), directCandidates.map(entry => entry.candidate)).slice(0, 2);
+        const stableCandidates = getCandidatesInPullRequestOrder(pullRequests.slice(0, reviewPullRequests[0] ? ( pullRequests.indexOf(reviewPullRequests[0])) : secondDirectCandidateIndex), directCandidates.map(entry => entry.candidate)).slice(0, 2);
         if (stableCandidates.length > 0) {
             reportCandidates(stableCandidates);
         }

package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/connectionDiagnosticsLogs.js

@@ -21,7 +21,7 @@ async function collectConnectionLogs(fileService, logFile) {
         });
         let text = ( result.value.toString());
         if (position > 0) {
-            const newline = text.indexOf("\n");
+            const newline = ( text.indexOf("\n"));
             text = newline === -1 ? "" : text.slice(newline + 1);
         }
         const lines = selectConnectionLogLines(text);

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 {

package/vscode/src/vs/sessions/services/sessions/browser/sessionComparisonService.js

@@ -1111,7 +1111,7 @@ let SessionComparisonService = class SessionComparisonService extends Disposable
     _pruneAttemptTelemetryState(comparisonIds) {
         let changed = false;
         for (const key of [...this._reportedAttemptTelemetry]) {
-            const separator = key.indexOf("/");
+            const separator = ( key.indexOf("/"));
             if (separator < 0 || !( comparisonIds.has(key.slice(0, separator)))) {
                 this._reportedAttemptTelemetry.delete(key);
                 changed = true;

package/vscode/src/vs/sessions/services/sessions/browser/sessionSectionOrderService.js

@@ -103,7 +103,7 @@ function resolveSectionOrder(persisted, defaultOrderedIds) {
         }
         let insertAt = 0;
         for (let j = i - 1; j >= 0; j--) {
-            const idx = result.indexOf(defaultOrderedIds[j]);
+            const idx = ( result.indexOf(defaultOrderedIds[j]));
             if (idx !== -1) {
                 insertAt = idx + 1;
                 break;
@@ -116,7 +116,7 @@ function resolveSectionOrder(persisted, defaultOrderedIds) {
 }
 function spliceSectionOrder(order, draggedId, targetId, position) {
     const without = order.filter(id => id !== draggedId);
-    const targetIndex = without.indexOf(targetId);
+    const targetIndex = ( without.indexOf(targetId));
     if (targetIndex === -1) {
         return undefined;
     }

package/vscode/src/vs/sessions/services/sessions/browser/visibleSessions.js

@@ -437,7 +437,7 @@ let VisibleSessions = class VisibleSessions extends Disposable {
             }
             if (replaceSlot !== NO_RECENT) {
                 this.transferGridSlot(replaceSlot, targetId);
-                const idx = this._visibleList.indexOf(replaceSlot);
+                const idx = ( this._visibleList.indexOf(replaceSlot));
                 this._visibleList.splice(idx, 1, targetId);
                 if (replaceSlot !== undefined) {
                     const replaced = this._wrappers.get(replaceSlot)?.session;
@@ -469,7 +469,7 @@ let VisibleSessions = class VisibleSessions extends Disposable {
             this._visibleList.push(undefined);
         }
         const id = session?.sessionId;
-        const targetIdx = this._visibleList.indexOf(targetSessionId);
+        const targetIdx = ( this._visibleList.indexOf(targetSessionId));
         if (targetIdx < 0) {
             return;
         }
@@ -486,7 +486,7 @@ let VisibleSessions = class VisibleSessions extends Disposable {
             }
         });
         let destIdx = side === "left" || side === "up" ? targetIdx : targetIdx + 1;
-        const currentIdx = this._visibleList.indexOf(id);
+        const currentIdx = ( this._visibleList.indexOf(id));
         if (currentIdx >= 0) {
             if (currentIdx !== destIdx && currentIdx + 1 !== destIdx) {
                 this._visibleList.splice(currentIdx, 1);
@@ -565,7 +565,7 @@ let VisibleSessions = class VisibleSessions extends Disposable {
                 sticky: false
             };
         }
-        const index = this._visibleList.indexOf(sessionId);
+        const index = ( this._visibleList.indexOf(sessionId));
         return index < 0 ? undefined : {
             index,
             sticky: this._isStickySlot(sessionId)
@@ -597,7 +597,7 @@ let VisibleSessions = class VisibleSessions extends Disposable {
     }
     replaceSlot(slotId, session, sticky) {
         const id = session.sessionId;
-        const idx = this._visibleList.indexOf(slotId);
+        const idx = ( this._visibleList.indexOf(slotId));
         if (idx < 0 || this._visibleList.includes(id)) {
             return undefined;
         }
@@ -644,7 +644,7 @@ let VisibleSessions = class VisibleSessions extends Disposable {
             const activeId = this._activeSession.get()?.sessionId;
             const emptySlotIsActive = activeId === undefined && this._visibleList.includes(undefined);
             const activeSlotId = emptySlotIsActive ? undefined : activeId;
-            const activeIdx = activeId !== undefined || emptySlotIsActive ? this._visibleList.indexOf(activeSlotId) : -1;
+            const activeIdx = activeId !== undefined || emptySlotIsActive ? ( this._visibleList.indexOf(activeSlotId)) : -1;
             let activeRemoved = false;
             for (const id of sessionIds) {
                 if (this._removeFromModel(id)) {
@@ -705,7 +705,7 @@ let VisibleSessions = class VisibleSessions extends Disposable {
         if (fromId === toId) {
             return;
         }
-        const idx = this._visibleList.indexOf(fromId);
+        const idx = ( this._visibleList.indexOf(fromId));
         if (idx >= 0) {
             this.transferGridSlot(fromId, toId);
             this._visibleList.splice(idx, 1, toId);
@@ -744,7 +744,7 @@ let VisibleSessions = class VisibleSessions extends Disposable {
     }
     _removeFromModel(sessionId) {
         let changed = false;
-        const idx = this._visibleList.indexOf(sessionId);
+        const idx = ( this._visibleList.indexOf(sessionId));
         if (idx >= 0) {
             this._visibleList.splice(idx, 1);
             changed = true;