@codingame/monaco-vscode-xterm-common 25.1.1 → 26.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-xterm-common",
-  "version": "25.1.1",
+  "version": "26.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - common package depending on xterm",
   "keywords": [],
@@ -15,9 +15,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "25.1.1",
-    "@codingame/monaco-vscode-xterm-addons-common": "25.1.1",
-    "@xterm/xterm": "6.1.0-beta.97"
+    "@codingame/monaco-vscode-api": "26.0.0",
+    "@codingame/monaco-vscode-xterm-addons-common": "26.0.0",
+    "@xterm/xterm": "6.1.0-beta.147"
   },
   "exports": {
     ".": {

package/vscode/src/vs/platform/terminal/common/capabilities/naiveCwdDetectionCapability.js

@@ -6,13 +6,13 @@ class NaiveCwdDetectionCapability {
     constructor(_process) {
         this._process = _process;
         this.type = TerminalCapability.NaiveCwdDetection;
-        this._cwd = '';
+        this._cwd = "";
         this._onDidChangeCwd = ( new Emitter());
         this.onDidChangeCwd = this._onDidChangeCwd.event;
     }
     async getCwd() {
         if (!this._process) {
-            return Promise.resolve('');
+            return Promise.resolve("");
         }
         const newCwd = await this._process.getCwd();
         if (newCwd !== this._cwd) {

package/vscode/src/vs/platform/terminal/common/environmentVariableCollection.js

@@ -3,12 +3,12 @@ import { isWindows } from '@codingame/monaco-vscode-api/vscode/vs/base/common/pl
 import { EnvironmentVariableMutatorType } from './environmentVariable.js';
 
 const mutatorTypeToLabelMap = ( new Map([
-    [EnvironmentVariableMutatorType.Append, 'APPEND'],
-    [EnvironmentVariableMutatorType.Prepend, 'PREPEND'],
-    [EnvironmentVariableMutatorType.Replace, 'REPLACE']
+    [EnvironmentVariableMutatorType.Append, "APPEND"],
+    [EnvironmentVariableMutatorType.Prepend, "PREPEND"],
+    [EnvironmentVariableMutatorType.Replace, "REPLACE"]
 ]));
 const PYTHON_ACTIVATION_VARS_PATTERN = /^VSCODE_PYTHON_(PWSH|ZSH|BASH|FISH)_ACTIVATE/;
-const PYTHON_ENV_EXTENSION_ID = 'ms-python.vscode-python-envs';
+const PYTHON_ENV_EXTENSION_ID = "ms-python.vscode-python-envs";
 class MergedEnvironmentVariableCollection {
     constructor(collections) {
         this.collections = collections;
@@ -65,26 +65,26 @@ class MergedEnvironmentVariableCollection {
                 }
                 if (mutator.options?.applyAtProcessCreation ?? true) {
                     switch (mutator.type) {
-                        case EnvironmentVariableMutatorType.Append:
-                            env[actualVariable] = (env[actualVariable] || '') + value;
-                            break;
-                        case EnvironmentVariableMutatorType.Prepend:
-                            env[actualVariable] = value + (env[actualVariable] || '');
-                            break;
-                        case EnvironmentVariableMutatorType.Replace:
-                            env[actualVariable] = value;
-                            break;
+                    case EnvironmentVariableMutatorType.Append:
+                        env[actualVariable] = (env[actualVariable] || "") + value;
+                        break;
+                    case EnvironmentVariableMutatorType.Prepend:
+                        env[actualVariable] = value + (env[actualVariable] || "");
+                        break;
+                    case EnvironmentVariableMutatorType.Replace:
+                        env[actualVariable] = value;
+                        break;
                     }
                 }
                 if (mutator.options?.applyAtShellIntegration ?? false) {
                     const key = `VSCODE_ENV_${mutatorTypeToLabelMap.get(mutator.type)}`;
-                    env[key] = (env[key] ? env[key] + ':' : '') + variable + '=' + this._encodeColons(value);
+                    env[key] = (env[key] ? env[key] + ":" : "") + variable + "=" + this._encodeColons(value);
                 }
             }
         }
     }
     _encodeColons(value) {
-        return value.replaceAll(':', '\\x3a');
+        return value.replaceAll(":", "\\x3a");
     }
     blockPythonActivationVar(variable, extensionIdentifier) {
         if (PYTHON_ACTIVATION_VARS_PATTERN.test(variable) && PYTHON_ENV_EXTENSION_ID !== extensionIdentifier) {
@@ -120,7 +120,11 @@ class MergedEnvironmentVariableCollection {
         if (added.size === 0 && changed.size === 0 && removed.size === 0) {
             return undefined;
         }
-        return { added, changed, removed };
+        return {
+            added,
+            changed,
+            removed
+        };
     }
     getVariableMap(scope) {
         const result = ( new Map());

package/vscode/src/vs/platform/terminal/common/terminalRecorder.js

@@ -1,13 +1,17 @@
 
 
 var Constants;
-(function (Constants) {
+(function(Constants) {
     Constants[Constants["MaxRecorderDataSize"] = 10485760] = "MaxRecorderDataSize";
 })(Constants || (Constants = {}));
 class TerminalRecorder {
     constructor(cols, rows) {
         this._totalDataLength = 0;
-        this._entries = [{ cols, rows, data: [] }];
+        this._entries = [{
+            cols,
+            rows,
+            data: []
+        }];
     }
     handleResize(cols, rows) {
         if (this._entries.length > 0) {
@@ -27,7 +31,11 @@ class TerminalRecorder {
                 return;
             }
         }
-        this._entries.push({ cols, rows, data: [] });
+        this._entries.push({
+            cols,
+            rows,
+            data: []
+        });
     }
     handleData(data) {
         const lastEntry = this._entries[this._entries.length - 1];
@@ -42,28 +50,29 @@ class TerminalRecorder {
                 if (firstEntry.data.length === 0) {
                     this._entries.shift();
                 }
-            }
-            else {
+            } else {
                 firstEntry.data[0] = firstEntry.data[0].substr(remainingToDelete);
                 this._totalDataLength -= remainingToDelete;
             }
         }
     }
     generateReplayEventSync() {
-        this._entries.forEach((entry) => {
+        this._entries.forEach(entry => {
             if (entry.data.length > 0) {
-                entry.data = [entry.data.join('')];
+                entry.data = [entry.data.join("")];
             }
         });
         return {
-            events: ( this._entries.map(
-                entry => ({ cols: entry.cols, rows: entry.rows, data: entry.data[0] ?? '' })
-            )),
+            events: ( this._entries.map(entry => ({
+                cols: entry.cols,
+                rows: entry.rows,
+                data: entry.data[0] ?? ""
+            }))),
             commands: {
                 isWindowsPty: false,
                 hasRichCommandDetection: false,
                 commands: [],
-                promptInputModel: undefined,
+                promptInputModel: undefined
             }
         };
     }

package/vscode/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.js

@@ -24,7 +24,7 @@ let EnvironmentVariableInfoStale = class EnvironmentVariableInfoStale {
         addExtensionIdentifiers(extSet, ( this._diff.removed.values()));
         addExtensionIdentifiers(extSet, ( this._diff.changed.values()));
         let message = ( localize(
-            11494,
+            11820,
             "The following extensions want to relaunch the terminal to contribute to its environment:"
         ));
         message += getMergedDescription(this._collection, scope, this._extensionService, extSet);
@@ -32,10 +32,10 @@ let EnvironmentVariableInfoStale = class EnvironmentVariableInfoStale {
     }
     _getActions() {
         return [{
-                label: ( localize(11495, "Relaunch Terminal")),
-                run: () => this._terminalService.getInstanceFromId(this._terminalId)?.relaunch(),
-                commandId: TerminalCommandId.Relaunch
-            }];
+            label: ( localize(11821, "Relaunch Terminal")),
+            run: () => this._terminalService.getInstanceFromId(this._terminalId)?.relaunch(),
+            commandId: TerminalCommandId.Relaunch
+        }];
     }
     getStatus(scope) {
         return {
@@ -47,10 +47,7 @@ let EnvironmentVariableInfoStale = class EnvironmentVariableInfoStale {
         };
     }
 };
-EnvironmentVariableInfoStale = ( __decorate([
-    ( __param(3, ITerminalService)),
-    ( __param(4, IExtensionService))
-], EnvironmentVariableInfoStale));
+EnvironmentVariableInfoStale = ( __decorate([( __param(3, ITerminalService)), ( __param(4, IExtensionService))], EnvironmentVariableInfoStale));
 let EnvironmentVariableInfoChangesActive = class EnvironmentVariableInfoChangesActive {
     constructor(_collection, _commandService, _extensionService) {
         this._collection = _collection;
@@ -62,7 +59,7 @@ let EnvironmentVariableInfoChangesActive = class EnvironmentVariableInfoChangesA
         const extSet = ( new Set());
         addExtensionIdentifiers(extSet, ( this._collection.getVariableMap(scope).values()));
         let message = ( localize(
-            11496,
+            11822,
             "The following extensions have contributed to this terminal's environment:"
         ));
         message += getMergedDescription(this._collection, scope, this._extensionService, extSet);
@@ -70,10 +67,10 @@ let EnvironmentVariableInfoChangesActive = class EnvironmentVariableInfoChangesA
     }
     _getActions(scope) {
         return [{
-                label: ( localize(11497, "Show Environment Contributions")),
-                run: () => this._commandService.executeCommand(TerminalCommandId.ShowEnvironmentContributions, scope),
-                commandId: TerminalCommandId.ShowEnvironmentContributions
-            }];
+            label: ( localize(11823, "Show Environment Contributions")),
+            run: () => this._commandService.executeCommand(TerminalCommandId.ShowEnvironmentContributions, scope),
+            commandId: TerminalCommandId.ShowEnvironmentContributions
+        }];
     }
     getStatus(scope) {
         return {
@@ -85,12 +82,9 @@ let EnvironmentVariableInfoChangesActive = class EnvironmentVariableInfoChangesA
         };
     }
 };
-EnvironmentVariableInfoChangesActive = ( __decorate([
-    ( __param(1, ICommandService)),
-    ( __param(2, IExtensionService))
-], EnvironmentVariableInfoChangesActive));
+EnvironmentVariableInfoChangesActive = ( __decorate([( __param(1, ICommandService)), ( __param(2, IExtensionService))], EnvironmentVariableInfoChangesActive));
 function getMergedDescription(collection, scope, extensionService, extSet) {
-    const message = ['\n'];
+    const message = ["\n"];
     const globalDescriptions = collection.getDescriptionMap(undefined);
     const workspaceDescriptions = collection.getDescriptionMap(scope);
     for (const ext of extSet) {
@@ -101,7 +95,7 @@ function getMergedDescription(collection, scope, extensionService, extSet) {
         }
         const workspaceDescription = workspaceDescriptions.get(ext);
         if (workspaceDescription) {
-            const workspaceSuffix = globalDescription ? ` (${( localize(11498, 'workspace'))})` : '';
+            const workspaceSuffix = globalDescription ? ` (${( localize(11824, "workspace"))})` : "";
             message.push(`\n- \`${getExtensionName(ext, extensionService)}${workspaceSuffix}\``);
             message.push(`: ${workspaceDescription}`);
         }
@@ -109,7 +103,7 @@ function getMergedDescription(collection, scope, extensionService, extSet) {
             message.push(`\n- \`${getExtensionName(ext, extensionService)}\``);
         }
     }
-    return message.join('');
+    return message.join("");
 }
 function addExtensionIdentifiers(extSet, diff) {
     for (const mutators of diff) {