@codingame/monaco-vscode-xterm-common 37.2.0 → 37.3.1

package/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.js

@@ -1,321 +0,0 @@
-
-import { isAbsolute, join, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
-import { URI, uriToFsPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { sanitizeProcessEnvironment } from '@codingame/monaco-vscode-api/vscode/vs/base/common/processes';
-import { WindowsShellType, TerminalSettingId, ShellIntegrationTimeoutOverride } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
-import { isWindows, isMacintosh, language, OperatingSystem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-import { sanitizeCwd, escapeNonWindowsPath } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminalEnvironment';
-import { isString, isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-
-function mergeEnvironments(parent, other) {
-    if (!other) {
-        return;
-    }
-    if (isWindows) {
-        for (const configKey in other) {
-            let actualKey = configKey;
-            for (const envKey in parent) {
-                if (configKey.toLowerCase() === envKey.toLowerCase()) {
-                    actualKey = envKey;
-                    break;
-                }
-            }
-            const value = other[configKey];
-            if (value !== undefined) {
-                _mergeEnvironmentValue(parent, actualKey, value);
-            }
-        }
-    } else {
-        ( Object.keys(other)).forEach(key => {
-            const value = other[key];
-            if (value !== undefined) {
-                _mergeEnvironmentValue(parent, key, value);
-            }
-        });
-    }
-}
-function _mergeEnvironmentValue(env, key, value) {
-    if (isString(value)) {
-        env[key] = value;
-    } else {
-        delete env[key];
-    }
-}
-function addTerminalEnvironmentKeys(env, version, locale, detectLocale) {
-    env["TERM_PROGRAM"] = "vscode";
-    if (version) {
-        env["TERM_PROGRAM_VERSION"] = version;
-    }
-    if (shouldSetLangEnvVariable(env, detectLocale)) {
-        env["LANG"] = getLangEnvVariable(locale);
-    }
-    env["COLORTERM"] = "truecolor";
-}
-function mergeNonNullKeys(env, other) {
-    if (!other) {
-        return;
-    }
-    for (const key of ( Object.keys(other))) {
-        const value = other[key];
-        if (value !== undefined && value !== null) {
-            env[key] = value;
-        }
-    }
-}
-async function resolveConfigurationVariables(variableResolver, env) {
-    await Promise.all(( Object.entries(env).map(async ([key, value]) => {
-        if (isString(value)) {
-            try {
-                env[key] = await variableResolver(value);
-            } catch (e) {
-                env[key] = value;
-            }
-        }
-    })));
-    return env;
-}
-function shouldSetLangEnvVariable(env, detectLocale) {
-    if (detectLocale === "on") {
-        return true;
-    }
-    if (detectLocale === "auto") {
-        const lang = env["LANG"];
-        return !lang || (lang.search(/\.UTF\-8$/) === -1 && lang.search(/\.utf8$/) === -1 && lang.search(/\.euc.+/) === -1);
-    }
-    return false;
-}
-function getLangEnvVariable(locale) {
-    const parts = locale ? locale.split("-") : [];
-    const n = parts.length;
-    if (n === 0) {
-        return "en_US.UTF-8";
-    }
-    if (n === 1) {
-        const languageVariants = {
-            af: "ZA",
-            am: "ET",
-            be: "BY",
-            bg: "BG",
-            ca: "ES",
-            cs: "CZ",
-            da: "DK",
-            de: "DE",
-            el: "GR",
-            en: "US",
-            es: "ES",
-            et: "EE",
-            eu: "ES",
-            fi: "FI",
-            fr: "FR",
-            he: "IL",
-            hr: "HR",
-            hu: "HU",
-            hy: "AM",
-            is: "IS",
-            it: "IT",
-            ja: "JP",
-            kk: "KZ",
-            ko: "KR",
-            lt: "LT",
-            nl: "NL",
-            no: "NO",
-            pl: "PL",
-            pt: "BR",
-            ro: "RO",
-            ru: "RU",
-            sk: "SK",
-            sl: "SI",
-            sr: "YU",
-            sv: "SE",
-            tr: "TR",
-            uk: "UA",
-            zh: "CN"
-        };
-        if (Object.prototype.hasOwnProperty.call(languageVariants, parts[0])) {
-            parts.push(languageVariants[parts[0]]);
-        }
-    } else {
-        parts[1] = parts[1].toUpperCase();
-    }
-    return parts.join("_") + ".UTF-8";
-}
-async function getCwd(shell, userHome, variableResolver, root, customCwd, logService) {
-    if (shell.cwd) {
-        const unresolved = (typeof shell.cwd === "object") ? shell.cwd.fsPath : shell.cwd;
-        const resolved = await _resolveCwd(unresolved, variableResolver);
-        return sanitizeCwd(resolved || unresolved);
-    }
-    let cwd;
-    if (!shell.ignoreConfigurationCwd && customCwd) {
-        if (variableResolver) {
-            customCwd = await _resolveCwd(customCwd, variableResolver, logService);
-        }
-        if (customCwd) {
-            if (isAbsolute(customCwd)) {
-                cwd = customCwd;
-            } else if (root) {
-                cwd = join(root.fsPath, customCwd);
-            }
-        }
-    }
-    if (!cwd) {
-        cwd = root ? root.fsPath : userHome || "";
-    }
-    return sanitizeCwd(cwd);
-}
-async function _resolveCwd(cwd, variableResolver, logService) {
-    if (variableResolver) {
-        try {
-            return await variableResolver(cwd);
-        } catch (e) {
-            logService?.error("Could not resolve terminal cwd", e);
-            return undefined;
-        }
-    }
-    return cwd;
-}
-function createVariableResolver(lastActiveWorkspace, env, configurationResolverService) {
-    if (!configurationResolverService) {
-        return undefined;
-    }
-    return str => configurationResolverService.resolveWithEnvironment(env, lastActiveWorkspace, str);
-}
-async function createTerminalEnvironment(
-    shellLaunchConfig,
-    envFromConfig,
-    variableResolver,
-    version,
-    detectLocale,
-    baseEnv
-) {
-    const env = {};
-    if (shellLaunchConfig.strictEnv) {
-        mergeNonNullKeys(env, shellLaunchConfig.env);
-    } else {
-        mergeNonNullKeys(env, baseEnv);
-        const allowedEnvFromConfig = {
-            ...envFromConfig
-        };
-        if (variableResolver) {
-            if (allowedEnvFromConfig) {
-                await resolveConfigurationVariables(variableResolver, allowedEnvFromConfig);
-            }
-            if (shellLaunchConfig.env) {
-                await resolveConfigurationVariables(variableResolver, shellLaunchConfig.env);
-            }
-        }
-        if (isMacintosh) {
-            if (env["VSCODE_NODE_OPTIONS"]) {
-                env["NODE_OPTIONS"] = env["VSCODE_NODE_OPTIONS"];
-                delete env["VSCODE_NODE_OPTIONS"];
-            }
-            if (env["VSCODE_NODE_REPL_EXTERNAL_MODULE"]) {
-                env["NODE_REPL_EXTERNAL_MODULE"] = env["VSCODE_NODE_REPL_EXTERNAL_MODULE"];
-                delete env["VSCODE_NODE_REPL_EXTERNAL_MODULE"];
-            }
-        }
-        sanitizeProcessEnvironment(env, "VSCODE_IPC_HOOK_CLI");
-        mergeEnvironments(env, allowedEnvFromConfig);
-        mergeEnvironments(env, shellLaunchConfig.env);
-        addTerminalEnvironmentKeys(env, version, language, detectLocale);
-    }
-    return env;
-}
-async function preparePathForShell(
-    resource,
-    executable,
-    title,
-    shellType,
-    backend,
-    os,
-    isWindowsFrontend = isWindows
-) {
-    let originalPath;
-    if (isString(resource)) {
-        originalPath = resource;
-    } else {
-        originalPath = resource.fsPath;
-        if (isWindowsFrontend && os !== OperatingSystem.Windows) {
-            originalPath = originalPath.replace(/\\/g, "/");
-        } else if (!isWindowsFrontend && os === OperatingSystem.Windows) {
-            originalPath = originalPath.replace(/\//g, "\\");
-        }
-    }
-    if (!executable) {
-        return originalPath;
-    }
-    const hasSpace = originalPath.includes(" ");
-    const hasParens = originalPath.includes("(") || originalPath.includes(")");
-    const pathBasename = basename(executable, ".exe");
-    const isPowerShell = pathBasename === "pwsh" || title === "pwsh" || pathBasename === "powershell" || title === "powershell";
-    if (isPowerShell && (hasSpace || originalPath.includes("'"))) {
-        return `& '${originalPath.replace(/'/g, "''")}'`;
-    }
-    if (hasParens && isPowerShell) {
-        return `& '${originalPath}'`;
-    }
-    if (os === OperatingSystem.Windows) {
-        if (shellType !== undefined) {
-            if (shellType === WindowsShellType.GitBash) {
-                return escapeNonWindowsPath(originalPath.replace(/\\/g, "/"), shellType);
-            } else if (shellType === WindowsShellType.Wsl) {
-                return backend?.getWslPath(originalPath, "win-to-unix") || originalPath;
-            } else if (hasSpace) {
-                return `"${originalPath}"`;
-            }
-            return originalPath;
-        }
-        const lowerExecutable = executable.toLowerCase();
-        if (lowerExecutable.includes("wsl") || (lowerExecutable.includes("bash.exe") && !lowerExecutable.toLowerCase().includes("git"))) {
-            return backend?.getWslPath(originalPath, "win-to-unix") || originalPath;
-        } else if (hasSpace) {
-            return `"${originalPath}"`;
-        }
-        return originalPath;
-    }
-    return escapeNonWindowsPath(originalPath, shellType);
-}
-function getWorkspaceForTerminal(cwd, workspaceContextService, historyService) {
-    const cwdUri = isString(cwd) ? ( URI.parse(cwd)) : cwd;
-    let workspaceFolder = cwdUri ? workspaceContextService.getWorkspaceFolder(cwdUri) ?? undefined : undefined;
-    if (!workspaceFolder) {
-        const activeWorkspaceRootUri = historyService.getLastActiveWorkspaceRoot();
-        workspaceFolder = activeWorkspaceRootUri ? workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri) ?? undefined : undefined;
-    }
-    return workspaceFolder;
-}
-async function getUriLabelForShell(uri, backend, shellType, os, isWindowsFrontend = isWindows) {
-    let path = isString(uri) ? uri : uri.fsPath;
-    if (os === OperatingSystem.Windows) {
-        if (shellType === WindowsShellType.Wsl) {
-            return backend.getWslPath(path.replaceAll("/", "\\"), "win-to-unix");
-        } else if (shellType === WindowsShellType.GitBash) {
-            return path.replaceAll("\\", "/").replace(/^([a-zA-Z]):\//, "/$1/");
-        } else {
-            path = isString(uri) ? path : uriToFsPath(uri, true);
-            return !isWindowsFrontend ? path.replaceAll("/", "\\") : path;
-        }
-    } else {
-        return isWindowsFrontend ? path.replaceAll("\\", "/") : path;
-    }
-}
-function getShellIntegrationTimeout(configurationService, siInjectionEnabled, isRemote, processReadyTimestamp) {
-    const timeoutValue = configurationService.getValue(TerminalSettingId.ShellIntegrationTimeout);
-    let timeoutMs;
-    if (isNumber(timeoutValue) && timeoutValue === ShellIntegrationTimeoutOverride.DisableForTests) {
-        timeoutMs = 0;
-    } else if (!isNumber(timeoutValue) || timeoutValue < 0) {
-        timeoutMs = siInjectionEnabled ? 5000 : (isRemote ? 3000 : 2000);
-    } else if (timeoutValue === 0) {
-        timeoutMs = 0;
-    } else {
-        timeoutMs = Math.max(timeoutValue, 500);
-    }
-    if (processReadyTimestamp !== undefined) {
-        const elapsed = Date.now() - processReadyTimestamp;
-        timeoutMs = Math.max(0, timeoutMs - elapsed);
-    }
-    return timeoutMs;
-}
-
-export { addTerminalEnvironmentKeys, createTerminalEnvironment, createVariableResolver, getCwd, getLangEnvVariable, getShellIntegrationTimeout, getUriLabelForShell, getWorkspaceForTerminal, mergeEnvironments, preparePathForShell, shouldSetLangEnvVariable };

package/vscode/src/vs/workbench/contrib/terminal/common/terminalStorageKeys.d.ts

@@ -1,12 +0,0 @@
-export declare enum TerminalStorageKeys {
-    SuggestedRendererType = "terminal.integrated.suggestedRendererType",
-    TabsListWidthHorizontal = "tabs-list-width-horizontal",
-    TabsListWidthVertical = "tabs-list-width-vertical",
-    TabsShowDetailed = "terminal.integrated.tabs.showDetailed",
-    DeprecatedEnvironmentVariableCollections = "terminal.integrated.environmentVariableCollections",
-    EnvironmentVariableCollections = "terminal.integrated.environmentVariableCollectionsV2",
-    TerminalBufferState = "terminal.integrated.bufferState",
-    TerminalLayoutInfo = "terminal.integrated.layoutInfo",
-    PinnedRecentCommandsPrefix = "terminal.pinnedRecentCommands",
-    TerminalSuggestSize = "terminal.integrated.suggestSize"
-}

package/vscode/src/vs/workbench/contrib/terminal/common/terminalStorageKeys.js

@@ -1,17 +0,0 @@
-
-
-var TerminalStorageKeys;
-(function (TerminalStorageKeys) {
-    TerminalStorageKeys["SuggestedRendererType"] = "terminal.integrated.suggestedRendererType";
-    TerminalStorageKeys["TabsListWidthHorizontal"] = "tabs-list-width-horizontal";
-    TerminalStorageKeys["TabsListWidthVertical"] = "tabs-list-width-vertical";
-    TerminalStorageKeys["TabsShowDetailed"] = "terminal.integrated.tabs.showDetailed";
-    TerminalStorageKeys["DeprecatedEnvironmentVariableCollections"] = "terminal.integrated.environmentVariableCollections";
-    TerminalStorageKeys["EnvironmentVariableCollections"] = "terminal.integrated.environmentVariableCollectionsV2";
-    TerminalStorageKeys["TerminalBufferState"] = "terminal.integrated.bufferState";
-    TerminalStorageKeys["TerminalLayoutInfo"] = "terminal.integrated.layoutInfo";
-    TerminalStorageKeys["PinnedRecentCommandsPrefix"] = "terminal.pinnedRecentCommands";
-    TerminalStorageKeys["TerminalSuggestSize"] = "terminal.integrated.suggestSize";
-})(TerminalStorageKeys || (TerminalStorageKeys = {}));
-
-export { TerminalStorageKeys };

package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/media/stickyScroll.css

@@ -1,49 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.terminal-sticky-scroll {
-	display: none;
-	position: absolute;
-	left: 0;
-	right: 14px; /* Don't overlap terminal scroll bar */
-	z-index: 32; /* Must be higher than decorations */
-	background: var(--vscode-terminalStickyScroll-background, var(--vscode-terminal-background, var(--vscode-panel-background)));
-	box-shadow: var(--vscode-scrollbar-shadow) 0 3px 2px -2px;
-	border-bottom: 1px solid var(--vscode-terminalStickyScroll-border, transparent);
-}
-.part.sidebar .terminal-sticky-scroll,
-.part.auxiliarybar .terminal-sticky-scroll {
-	background: var(--vscode-terminalStickyScroll-background, var(--vscode-terminal-background, var(--vscode-sideBar-background)));
-}
-.editor-instance .terminal-sticky-scroll {
-	background: var(--vscode-terminalStickyScroll-background, var(--vscode-terminal-background, var(--vscode-editor-background)));
-}
-
-.terminal-sticky-scroll.visible {
-	display:block;
-}
-
-.terminal-sticky-scroll:hover {
-	cursor: pointer !important;
-}
-
-.terminal-sticky-scroll .xterm {
-	position: relative !important;
-	pointer-events: none;
-	padding-bottom: 0 !important;
-}
-
-.terminal-sticky-scroll .hover-overlay {
-	position: absolute;
-	left: 0;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	cursor: pointer !important;
-}
-
-.terminal-sticky-scroll .hover-overlay:hover {
-	background-color: var(--vscode-terminalStickyScrollHover-background, transparent);
-}

package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollColorRegistry.d.ts

@@ -1,2 +0,0 @@
-export declare const terminalStickyScrollBackground: string;
-export declare const terminalStickyScrollHoverBackground: string;

package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollColorRegistry.js

@@ -1,25 +0,0 @@
-
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { registerColor } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
-
-const terminalStickyScrollBackground = registerColor("terminalStickyScroll.background", null, ( localize(
-    17739,
-    "The background color of the sticky scroll overlay in the terminal."
-)));
-const terminalStickyScrollHoverBackground = registerColor("terminalStickyScrollHover.background", {
-    dark: "#2A2D2E",
-    light: "#F0F0F0",
-    hcDark: "#E48B39",
-    hcLight: "#0f4a85"
-}, ( localize(
-    17740,
-    "The background color of the sticky scroll overlay in the terminal when hovered."
-)));
-registerColor("terminalStickyScroll.border", {
-    dark: null,
-    light: null,
-    hcDark: "#6fc3df",
-    hcLight: "#0f4a85"
-}, ( localize(17741, "The border of the sticky scroll overlay in the terminal.")));
-
-export { terminalStickyScrollBackground, terminalStickyScrollHoverBackground };

package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.d.ts

@@ -1,58 +0,0 @@
-import type { Terminal as RawXtermTerminal, Terminal as XTermTerminal } from "@xterm/xterm";
-import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
-import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
-import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
-import { ICommandDetectionCapability } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities";
-import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { ITerminalInstance, IXtermColorProvider, IXtermTerminal } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
-import { ITerminalConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
-export declare class TerminalStickyScrollOverlay extends Disposable {
-    private readonly _instance;
-    private readonly _xterm;
-    private readonly _xtermColorProvider;
-    private readonly _commandDetection;
-    private readonly _contextMenuService;
-    private readonly _keybindingService;
-    private readonly _terminalConfigurationService;
-    private readonly _themeService;
-    private _stickyScrollOverlay?;
-    private readonly _xtermAddonLoader;
-    private _serializeAddon?;
-    private readonly _webglAddon;
-    private _webglAddonCustomGlyphs?;
-    private _ligaturesAddon?;
-    private _element?;
-    private _currentStickyCommand?;
-    private _currentContent?;
-    private _contextMenu;
-    private readonly _refreshListeners;
-    private _state;
-    private _isRefreshQueued;
-    private _rawMaxLineCount;
-    private _ignoredCommands;
-    private _pendingShowOperation;
-    constructor(_instance: ITerminalInstance, _xterm: IXtermTerminal & {
-        raw: RawXtermTerminal;
-    }, _xtermColorProvider: IXtermColorProvider, _commandDetection: ICommandDetectionCapability, xtermCtor: Promise<typeof XTermTerminal>, configurationService: IConfigurationService, contextKeyService: IContextKeyService, _contextMenuService: IContextMenuService, _keybindingService: IKeybindingService, menuService: IMenuService, _terminalConfigurationService: ITerminalConfigurationService, _themeService: IThemeService);
-    lockHide(): void;
-    unlockHide(): void;
-    private _setState;
-    private _installRefreshListeners;
-    private _uninstallRefreshListeners;
-    private _setVisible;
-    private _show;
-    private _hide;
-    private _refresh;
-    private _refreshNow;
-    private _updateContent;
-    private _ensureElement;
-    private _syncOptions;
-    private _getOptions;
-    private _refreshGpuAcceleration;
-    private _shouldLoadWebgl;
-    private _getTheme;
-    private _isIgnoredCommand;
-}