From 67fd09f6b8b6eb6dcf2800f293986ac16dab1aa2 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Wed, 27 Nov 2024 12:34:24 +0100 Subject: [PATCH] feat(1.96): update patches and build process (#2131) --- build/build.sh | 18 ++++ build/update_patches.sh | 28 ++++- include_osx.gypi | 11 ++ insider.json | 2 +- package_linux_reh.sh | 6 +- patches/brand.patch | 183 ++++++++++++++++---------------- patches/fix-remote-libs.patch | 14 +-- patches/update-electron.patch | 192 ---------------------------------- prepare_vscode.sh | 6 +- 9 files changed, 158 insertions(+), 302 deletions(-) create mode 100644 include_osx.gypi delete mode 100644 patches/update-electron.patch diff --git a/build/build.sh b/build/build.sh index ec7f6d9..1ab7075 100755 --- a/build/build.sh +++ b/build/build.sh @@ -113,8 +113,26 @@ if [[ "${SKIP_BUILD}" == "no" ]]; then cd .. fi + if [[ -f "./include_${OS_NAME}.gypi" ]]; then + echo "Installing custom ~/.gyp/include.gypi" + + mkdir -p ~/.gyp + + if [[ -f "${HOME}/.gyp/include.gypi" ]]; then + mv ~/.gyp/include.gypi ~/.gyp/include.gypi.pre-vscodium + else + echo "{}" > ~/.gyp/include.gypi.pre-vscodium + fi + + cp ./include_osx.gypi ~/.gyp/include.gypi + fi + . build.sh + if [[ -f "./include_${OS_NAME}.gypi" ]]; then + mv ~/.gyp/include.gypi.pre-vscodium ~/.gyp/include.gypi + fi + if [[ "${VSCODE_LATEST}" == "yes" ]]; then jsonTmp=$( cat "${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' ) echo "${jsonTmp}" > "${VSCODE_QUALITY}.json" && unset jsonTmp diff --git a/build/update_patches.sh b/build/update_patches.sh index 98af370..71fdfac 100755 --- a/build/update_patches.sh +++ b/build/update_patches.sh @@ -13,6 +13,12 @@ while getopts ":i" opt; do done check_file() { + while [ $# -gt 1 ]; do + git apply --reject "${1}" + + shift + done + if [[ -f "${1}" ]]; then echo applying patch: "${1}" if ! git apply --ignore-whitespace "${1}"; then @@ -49,10 +55,26 @@ fi for ARCH in alpine linux osx windows; do for FILE in "../patches/${ARCH}/"*.patch; do - check_file "${FILE}" + if [[ "${FILE}" != *"/arch-"* ]]; then + check_file "${FILE}" + fi done - for FILE in "../patches/${ARCH}/"*/*.patch; do - check_file "${FILE}" + if [[ "${ARCH}" == "linux" ]]; then + check_file "../patches/linux/arch-0-support.patch" + check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" + check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" + check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch" + check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch" "../patches/linux/arch-4-s390x.patch" + fi + + for TARGET in client reh; do + for FILE in "../patches/${ARCH}/${TARGET}/"*.patch; do + check_file "${FILE}" + done + + for FILE in "../patches/${ARCH}/${TARGET}/"*/*.patch; do + check_file "${FILE}" + done done done diff --git a/include_osx.gypi b/include_osx.gypi new file mode 100644 index 0000000..2cb6476 --- /dev/null +++ b/include_osx.gypi @@ -0,0 +1,11 @@ +{ + 'target_defaults': { + 'conditions': [ + ['OS=="mac"', { + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS': ['-std=c++20'] + } + }] + ] + } +} diff --git a/insider.json b/insider.json index 7fce156..9a31c88 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { "tag": "1.96.0", - "commit": "f87f8a56f3a30238076bee3db39c245bd69be264" + "commit": "ba849fc973f4d6f7421a9ef5d0433aa879ae3c7d" } diff --git a/package_linux_reh.sh b/package_linux_reh.sh index 5e1e00a..a4cbfed 100755 --- a/package_linux_reh.sh +++ b/package_linux_reh.sh @@ -127,11 +127,11 @@ if [[ -n "${USE_GNUPP2A}" ]]; then EOF ) - if [ ! -d "$HOME/.gyp" ]; then - mkdir -p "$HOME/.gyp" + if [ ! -d "${HOME}/.gyp" ]; then + mkdir -p "${HOME}/.gyp" fi - echo "${INCLUDES}" > "$HOME/.gyp/include.gypi" + echo "${INCLUDES}" > "${HOME}/.gyp/include.gypi" fi for i in {1..5}; do # try 5 times diff --git a/patches/brand.patch b/patches/brand.patch index 3fd3d22..7516404 100644 --- a/patches/brand.patch +++ b/patches/brand.patch @@ -73,7 +73,7 @@ index be7eea1..389e89e 100644 +const bumpEngineForImplicitActivationEvents = l10n.t("This activation event can be removed for extensions targeting engine version ^1.75 as VSCodium will generate these automatically from your package.json contribution declarations."); const starActivation = l10n.t("Using '*' activation is usually a bad idea as it impacts performance."); diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json -index 78a6b0f..10712a2 100644 +index 1f6775a..8d4a49a 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json @@ -222,3 +222,3 @@ @@ -88,22 +88,22 @@ index 78a6b0f..10712a2 100644 + "config.terminalAuthentication": "Controls whether to enable VSCodium to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.", + "config.terminalGitEditor": "Controls whether to enable VSCodium to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.", "config.timeline.showAuthor": "Controls whether to show the commit author in the Timeline view.", -@@ -306,3 +306,3 @@ +@@ -311,3 +311,3 @@ "{Locked='](command:workbench.action.reloadWindow'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -314,3 +314,3 @@ +@@ -319,3 +319,3 @@ "{Locked='](command:workbench.action.reloadWindow'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -322,3 +322,3 @@ +@@ -327,3 +327,3 @@ "{Locked='](command:workbench.action.reloadWindow'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -328,6 +328,6 @@ +@@ -333,6 +333,6 @@ "view.workbench.scm.disabled": { - "message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).", @@ -112,7 +112,7 @@ index 78a6b0f..10712a2 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -336,6 +336,6 @@ +@@ -341,6 +341,6 @@ "view.workbench.scm.empty": { - "message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).", @@ -121,7 +121,7 @@ index 78a6b0f..10712a2 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -344,6 +344,6 @@ +@@ -349,6 +349,6 @@ "view.workbench.scm.folder": { - "message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).", @@ -130,7 +130,7 @@ index 78a6b0f..10712a2 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -352,6 +352,6 @@ +@@ -357,6 +357,6 @@ "view.workbench.scm.workspace": { - "message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).", @@ -139,7 +139,7 @@ index 78a6b0f..10712a2 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -360,6 +360,6 @@ +@@ -365,6 +365,6 @@ "view.workbench.scm.emptyWorkspace": { - "message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).", @@ -148,27 +148,27 @@ index 78a6b0f..10712a2 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -378,3 +378,3 @@ +@@ -383,3 +383,3 @@ "{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -387,3 +387,3 @@ +@@ -392,3 +392,3 @@ "{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -395,3 +395,3 @@ +@@ -400,3 +400,3 @@ "{Locked='](command:git.manageUnsafeRepositories'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -403,3 +403,3 @@ +@@ -408,3 +408,3 @@ "{Locked='](command:git.manageUnsafeRepositories'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -408,6 +408,6 @@ +@@ -413,6 +413,6 @@ "view.workbench.scm.closedRepository": { - "message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).", @@ -177,7 +177,7 @@ index 78a6b0f..10712a2 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -416,6 +416,6 @@ +@@ -421,6 +421,6 @@ "view.workbench.scm.closedRepositories": { - "message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).", @@ -186,12 +186,12 @@ index 78a6b0f..10712a2 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -427,3 +427,3 @@ +@@ -432,3 +432,3 @@ "{Locked='](command:git.clone'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -431,3 +431,3 @@ +@@ -436,3 +436,3 @@ }, - "view.workbench.learnMore": "To learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm)." + "view.workbench.learnMore": "To learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm)." @@ -359,7 +359,7 @@ index b18b340..ca2eb2d 100644 + "comment": "The simpler (?<=\\bProcess\\.|\\bCommandLine\\.) breaks VSCodium / Atom, see https://github.com/textmate/swift.tmbundle/issues/29", "name": "support.variable.swift", diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json -index 22fa2fc..a9f134c 100644 +index 1e5ca17..ef1e18d 100644 --- a/extensions/typescript-language-features/package.nls.json +++ b/extensions/typescript-language-features/package.nls.json @@ -75,4 +75,4 @@ @@ -394,7 +394,7 @@ index 22fa2fc..a9f134c 100644 "configuration.tsserver.web.typeAcquisition.enabled": "Enable/disable package acquisition on the web. This enables IntelliSense for imported packages. Requires `#typescript.tsserver.web.projectWideIntellisense.enabled#`. Currently not supported for Safari.", - "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.", + "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VSCodium to detect a Node installation.", - "configuration.updateImportsOnPaste": "Enable updating imports when pasting code. Requires TypeScript 5.7+.\n\nBy default this shows a option to update imports after pasting. You can use the `#editor.pasteAs.preferences#` setting to update imports automatically when pasting: `\"editor.pasteAs.preferences\": [{ \"kind\": \"text.jsts.pasteWithImports\" }]`.", + "configuration.updateImportsOnPaste": "Enable updating imports when pasting code. Requires TypeScript 5.7+.\n\nBy default this shows a option to update imports after pasting. You can use the `#editor.pasteAs.preferences#` setting to update imports automatically when pasting: `\"editor.pasteAs.preferences\": [ \"text.updateImports.jsts\" ]`.", @@ -229,3 +229,3 @@ "walkthroughs.nodejsWelcome.title": "Get started with JavaScript and Node.js", - "walkthroughs.nodejsWelcome.description": "Make the most of Visual Studio Code's first-class JavaScript experience.", @@ -440,26 +440,26 @@ index e85c715..9059335 100644 + vscode.l10n.t("Please open a folder in VSCodium to use a TypeScript or JavaScript project")); return; diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts -index b5fdb18..22cb40c 100644 +index 7e18022..1243c69 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts -@@ -663,3 +663,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType +@@ -665,3 +665,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType prompt = vscode.window.showErrorMessage( - vscode.l10n.t("The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList)); + vscode.l10n.t("The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList)); } else { -@@ -684,3 +684,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType +@@ -686,3 +686,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType prompt = vscode.window.showWarningMessage( - vscode.l10n.t("The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList)); + vscode.l10n.t("The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList)); } else { -@@ -698,3 +698,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType +@@ -700,3 +700,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType prompt = vscode.window.showWarningMessage( - vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList)); + vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList)); } else { diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json -index f62982e..ec2f05c 100644 +index 5f7681b..58bc70b 100644 --- a/extensions/vscode-api-tests/package.json +++ b/extensions/vscode-api-tests/package.json @@ -2,3 +2,3 @@ @@ -537,7 +537,7 @@ index a351aa7..32bfdb6 100644 + throw Error(`Failed to download and unzip VSCodium ${quality} - ${commit}`); } diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts -index d8880a9..80a4436 100644 +index 11ca66e..9fc3414 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -540,3 +540,3 @@ export class CodeApplication extends Disposable { @@ -564,34 +564,34 @@ index c256dba..0ae2e47 100644 +export const ProductQualityContext = new RawContextKey('productQualityType', '', localize('productQualityType', "Quality type of VSCodium")); diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts -index 4d68a00..4e486e7 100644 +index a55978c..4194925 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts -@@ -149,3 +149,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi +@@ -151,3 +151,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi if (manifest.engines && manifest.engines.vscode && !isEngineValid(manifest.engines.vscode, this.productService.version, this.productService.date)) { - throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with VS Code '{1}'.", extensionId, this.productService.version)); + throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with VSCodium '{1}'.", extensionId, this.productService.version)); } -@@ -226,3 +226,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi +@@ -233,3 +233,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi } catch (e) { - throw new Error(nls.localize('removeError', "Error while removing the extension: {0}. Please Quit and Start VS Code before trying again.", toErrorMessage(e))); + throw new Error(nls.localize('removeError', "Error while removing the extension: {0}. Please Quit and Start VSCodium before trying again.", toErrorMessage(e))); } -@@ -1027,3 +1027,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask('columnOrOptions', 'Either the column in which to open or editor options, see vscode.TextDocumentShowOptions', diff --git a/src/vs/workbench/api/common/extHostCommands.ts b/src/vs/workbench/api/common/extHostCommands.ts -index c40a194..d76e2cd 100644 +index b1ff981..639ada5 100644 --- a/src/vs/workbench/api/common/extHostCommands.ts +++ b/src/vs/workbench/api/common/extHostCommands.ts -@@ -460,3 +460,3 @@ export class ApiCommandArgument { +@@ -460,4 +460,4 @@ export class ApiCommandArgument { static readonly TypeHierarchyItem = new ApiCommandArgument('item', 'A type hierarchy item', v => v instanceof extHostTypes.TypeHierarchyItem, extHostTypeConverter.TypeHierarchyItem.from); - static readonly TestItem = new ApiCommandArgument('testItem', 'A VS Code TestItem', v => v instanceof TestItemImpl, extHostTypeConverter.TestItem.from); +- static readonly TestProfile = new ApiCommandArgument('testProfile', 'A VS Code test profile', v => v instanceof extHostTypes.TestRunProfileBase, extHostTypeConverter.TestRunProfile.from); + static readonly TestItem = new ApiCommandArgument('testItem', 'A VSCodium TestItem', v => v instanceof TestItemImpl, extHostTypeConverter.TestItem.from); ++ static readonly TestProfile = new ApiCommandArgument('testProfile', 'A VSCodium test profile', v => v instanceof extHostTypes.TestRunProfileBase, extHostTypeConverter.TestRunProfile.from); diff --git a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts index 54b14a3..c075afb 100644 @@ -697,10 +699,10 @@ index 54b14a3..c075afb 100644 + test('Opening a notebook results in VSCodium firing the event onDidChangeActiveNotebookEditor twice #118470', function () { let count = 0; diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts -index 4d2143e..d712f4a 100644 +index 5754b8a..f4385bd 100644 --- a/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts -@@ -654,3 +654,3 @@ const registry = Registry.as(ConfigurationExtensions.Con +@@ -661,3 +661,3 @@ const registry = Registry.as(ConfigurationExtensions.Con localize('profileName', "`${profileName}`: name of the profile in which the workspace is opened (e.g. Data Science (Profile)). Ignored if default profile is used."), - localize('appName', "`${appName}`: e.g. VS Code."), + localize('appName', "`${appName}`: e.g. VSCodium."), @@ -715,45 +717,45 @@ index 50ae856..de6bb10 100644 + localize('screenReaderDetectedExplanation.question', "Are you using a screen reader to operate VSCodium?"), [{ diff --git a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts -index 20f77ec..b12cac0 100644 +index 0a13063..c62db65 100644 --- a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts +++ b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts -@@ -176,3 +176,3 @@ export class AdapterManager extends Disposable implements IAdapterManager { +@@ -177,3 +177,3 @@ export class AdapterManager extends Disposable implements IAdapterManager { type: 'number', - description: nls.localize('debugServer', "For debug extension development only: if a port is specified VS Code tries to connect to a debug adapter running in server mode"), + description: nls.localize('debugServer', "For debug extension development only: if a port is specified VSCodium tries to connect to a debug adapter running in server mode"), default: 4711 diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts -index f4d62c7..dde4827 100644 +index 575eebe..a0ba2a8 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts -@@ -304,3 +304,3 @@ CommandsRegistry.registerCommand({ +@@ -375,3 +375,3 @@ CommandsRegistry.registerCommand({ description: '(optional) Options for installing the extension. Object with the following properties: ' + - '`installOnlyNewlyAddedFromExtensionPackVSIX`: When enabled, VS Code installs only newly added extensions from the extension pack VSIX. This option is considered only when installing VSIX. ', + '`installOnlyNewlyAddedFromExtensionPackVSIX`: When enabled, VSCodium installs only newly added extensions from the extension pack VSIX. This option is considered only when installing VSIX. ', isOptional: true, -@@ -311,3 +311,3 @@ CommandsRegistry.registerCommand({ +@@ -382,3 +382,3 @@ CommandsRegistry.registerCommand({ 'type': 'boolean', - 'description': localize('workbench.extensions.installExtension.option.installOnlyNewlyAddedFromExtensionPackVSIX', "When enabled, VS Code installs only newly added extensions from the extension pack VSIX. This option is considered only while installing a VSIX."), + 'description': localize('workbench.extensions.installExtension.option.installOnlyNewlyAddedFromExtensionPackVSIX', "When enabled, VSCodium installs only newly added extensions from the extension pack VSIX. This option is considered only while installing a VSIX."), default: false -@@ -316,3 +316,3 @@ CommandsRegistry.registerCommand({ +@@ -387,3 +387,3 @@ CommandsRegistry.registerCommand({ 'type': 'boolean', - 'description': localize('workbench.extensions.installExtension.option.installPreReleaseVersion', "When enabled, VS Code installs the pre-release version of the extension if available."), + 'description': localize('workbench.extensions.installExtension.option.installPreReleaseVersion', "When enabled, VSCodium installs the pre-release version of the extension if available."), default: false -@@ -321,3 +321,3 @@ CommandsRegistry.registerCommand({ +@@ -392,3 +392,3 @@ CommandsRegistry.registerCommand({ 'type': 'boolean', - 'description': localize('workbench.extensions.installExtension.option.donotSync', "When enabled, VS Code do not sync this extension when Settings Sync is on."), + 'description': localize('workbench.extensions.installExtension.option.donotSync', "When enabled, VSCodium do not sync this extension when Settings Sync is on."), default: false -@@ -824,3 +824,3 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi +@@ -896,3 +896,3 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi Severity.Info, - localize('InstallVSIXAction.successReload', "Completed installing extension from VSIX. Please reload Visual Studio Code to enable it."), + localize('InstallVSIXAction.successReload', "Completed installing extension from VSIX. Please reload VSCodium to enable it."), [{ diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts -index 3930f44..89051bd 100644 +index 196334c..f4b82ea 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts @@ -105,3 +105,3 @@ export class PromptExtensionInstallFailureAction extends Action { @@ -761,41 +763,36 @@ index 3930f44..89051bd 100644 - const productName = isWeb ? localize('VS Code for Web', "{0} for the Web", this.productService.nameLong) : this.productService.nameLong; + const productName = isWeb ? localize('VSCodium for Web', "{0} for the Web", this.productService.nameLong) : this.productService.nameLong; const message = localize('cannot be installed', "The '{0}' extension is not available in {1}. Click 'More Information' to learn more.", this.extension.displayName || this.extension.identifier.id, productName); -@@ -512,3 +512,3 @@ export class InstallAction extends ExtensionAction { +@@ -514,3 +514,3 @@ export class InstallAction extends ExtensionAction { } else if (this.extension.deprecationInfo.settings) { - detail = localize('deprecated with alternate settings message', "This extension is deprecated as this functionality is now built-in to VS Code."); + detail = localize('deprecated with alternate settings message', "This extension is deprecated as this functionality is now built-in to VSCodium."); -@@ -900,3 +900,3 @@ export class UninstallAction extends ExtensionAction { +@@ -902,3 +902,3 @@ export class UninstallAction extends ExtensionAction { await this.extensionsWorkbenchService.uninstall(this.extension); - alert(localize('uninstallExtensionComplete', "Please reload Visual Studio Code to complete the uninstallation of the extension {0}.", this.extension.displayName)); + alert(localize('uninstallExtensionComplete', "Please reload VSCodium to complete the uninstallation of the extension {0}.", this.extension.displayName)); } catch (error) { -@@ -2526,3 +2526,3 @@ export class ExtensionStatusAction extends ExtensionAction { +@@ -2540,3 +2540,3 @@ export class ExtensionStatusAction extends ExtensionAction { const link = `[${localize('settings', "settings")}](${URI.parse(`command:workbench.action.openSettings?${encodeURIComponent(JSON.stringify([this.extension.deprecationInfo.settings.map(setting => `@id:${setting}`).join(' ')]))}`)})`; - this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to VS Code. Configure these {0} to use this functionality.", link)) }, true); + this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to VSCodium. Configure these {0} to use this functionality.", link)) }, true); } else { -@@ -2567,3 +2567,3 @@ export class ExtensionStatusAction extends ExtensionAction { - if (this.extensionManagementServerService.webExtensionManagementServer) { -- const productName = localize('VS Code for Web', "{0} for the Web", this.productService.nameLong); -+ const productName = localize('VSCodium for Web', "{0} for the Web", this.productService.nameLong); - const message = new MarkdownString(`${localize('not web tooltip', "The '{0}' extension is not available in {1}.", this.extension.displayName || this.extension.identifier.id, productName)} [${localize('learn why', "Learn Why")}](https://aka.ms/vscode-web-extensions-guide)`); -@@ -2866,3 +2866,3 @@ export class ReinstallAction extends Action { +@@ -2879,3 +2879,3 @@ export class ReinstallAction extends Action { const requireReload = !(extension.local && this.extensionService.canAddExtension(toExtensionDescription(extension.local))); - const message = requireReload ? localize('ReinstallAction.successReload', "Please reload Visual Studio Code to complete reinstalling the extension {0}.", extension.identifier.id) + const message = requireReload ? localize('ReinstallAction.successReload', "Please reload VSCodium to complete reinstalling the extension {0}.", extension.identifier.id) : localize('ReinstallAction.success', "Reinstalling the extension {0} is completed.", extension.identifier.id); diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -index 1575be2..74384e1 100644 +index 3325a34..ec9bac4 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -452,3 +452,3 @@ export class Extension implements IExtension { +@@ -456,3 +456,3 @@ export class Extension implements IExtension { return Promise.resolve(`# ${this.displayName || this.name} -**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled. +**Notice:** This extension is bundled with VSCodium. It can be disabled but not uninstalled. ## Features -@@ -490,3 +490,3 @@ ${this.description} +@@ -494,3 +494,3 @@ ${this.description} if (this.type === ExtensionType.System) { - return Promise.resolve(`Please check the [VS Code Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`); + return Promise.resolve(`Please check the [VSCodium Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`); @@ -920,68 +917,68 @@ index 6a5728c..2c561bd 100644 + message: nls.localize('TaskSystem.noProcess', 'The launched task doesn\'t exist anymore. If the task spawned background processes exiting VSCodium might result in orphaned processes. To avoid this start the last background process with a wait flag.'), primaryButton: nls.localize({ key: 'TaskSystem.exitAnyways', comment: ['&& denotes a mnemonic'] }, "&&Exit Anyways"), diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts -index 903d561..34a247c 100644 +index b71064b..d558dae 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts -@@ -203,3 +203,3 @@ export class TerminalViewPane extends ViewPane { +@@ -204,3 +204,3 @@ export class TerminalViewPane extends ViewPane { }]; - this._notificationService.prompt(Severity.Warning, nls.localize('terminal.monospaceOnly', "The terminal only supports monospace fonts. Be sure to restart VS Code if this is a newly installed font."), choices); + this._notificationService.prompt(Severity.Warning, nls.localize('terminal.monospaceOnly', "The terminal only supports monospace fonts. Be sure to restart VSCodium if this is a newly installed font."), choices); } diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts -index 8c1aae8..1b1fc21 100644 +index 752b9e8..5d27d5e 100644 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts -@@ -287,3 +287,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -290,3 +290,3 @@ const terminalConfiguration: IConfigurationNode = { [TerminalSettingId.DetectLocale]: { - markdownDescription: localize('terminal.integrated.detectLocale', "Controls whether to detect and set the `$LANG` environment variable to a UTF-8 compliant option since VS Code's terminal only supports UTF-8 encoded data coming from the shell."), + markdownDescription: localize('terminal.integrated.detectLocale', "Controls whether to detect and set the `$LANG` environment variable to a UTF-8 compliant option since VSCodium's terminal only supports UTF-8 encoded data coming from the shell."), type: 'string', -@@ -301,3 +301,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -304,3 +304,3 @@ const terminalConfiguration: IConfigurationNode = { markdownEnumDescriptions: [ - localize('terminal.integrated.gpuAcceleration.auto', "Let VS Code detect which renderer will give the best experience."), + localize('terminal.integrated.gpuAcceleration.auto', "Let VSCodium detect which renderer will give the best experience."), localize('terminal.integrated.gpuAcceleration.on', "Enable GPU acceleration within the terminal."), -@@ -389,3 +389,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -392,3 +392,3 @@ const terminalConfiguration: IConfigurationNode = { 'terminal.integrated.commandsToSkipShell', - "A set of command IDs whose keybindings will not be sent to the shell but instead always be handled by VS Code. This allows keybindings that would normally be consumed by the shell to act instead the same as when the terminal is not focused, for example `Ctrl+P` to launch Quick Open.\n\n \n\nMany commands are skipped by default. To override a default and pass that command's keybinding to the shell instead, add the command prefixed with the `-` character. For example add `-workbench.action.quickOpen` to allow `Ctrl+P` to reach the shell.\n\n \n\nThe following list of default skipped commands is truncated when viewed in Settings Editor. To see the full list, {1} and search for the first command from the list below.\n\n \n\nDefault Skipped Commands:\n\n{0}", + "A set of command IDs whose keybindings will not be sent to the shell but instead always be handled by VSCodium. This allows keybindings that would normally be consumed by the shell to act instead the same as when the terminal is not focused, for example `Ctrl+P` to launch Quick Open.\n\n \n\nMany commands are skipped by default. To override a default and pass that command's keybinding to the shell instead, add the command prefixed with the `-` character. For example add `-workbench.action.quickOpen` to allow `Ctrl+P` to reach the shell.\n\n \n\nThe following list of default skipped commands is truncated when viewed in Settings Editor. To see the full list, {1} and search for the first command from the list below.\n\n \n\nDefault Skipped Commands:\n\n{0}", DEFAULT_COMMANDS_TO_SKIP_SHELL.sort().map(command => `- ${command}`).join('\n'), -@@ -401,3 +401,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -404,3 +404,3 @@ const terminalConfiguration: IConfigurationNode = { [TerminalSettingId.AllowChords]: { - markdownDescription: localize('terminal.integrated.allowChords', "Whether or not to allow chord keybindings in the terminal. Note that when this is true and the keystroke results in a chord it will bypass {0}, setting this to false is particularly useful when you want ctrl+k to go to your shell (not VS Code).", '`#terminal.integrated.commandsToSkipShell#`'), + markdownDescription: localize('terminal.integrated.allowChords', "Whether or not to allow chord keybindings in the terminal. Note that when this is true and the keystroke results in a chord it will bypass {0}, setting this to false is particularly useful when you want ctrl+k to go to your shell (not VSCodium).", '`#terminal.integrated.commandsToSkipShell#`'), type: 'boolean', -@@ -412,3 +412,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -415,3 +415,3 @@ const terminalConfiguration: IConfigurationNode = { restricted: true, - markdownDescription: localize('terminal.integrated.env.osx', "Object with environment variables that will be added to the VS Code process to be used by the terminal on macOS. Set to `null` to delete the environment variable."), + markdownDescription: localize('terminal.integrated.env.osx', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on macOS. Set to `null` to delete the environment variable."), type: 'object', -@@ -421,3 +421,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -424,3 +424,3 @@ const terminalConfiguration: IConfigurationNode = { restricted: true, - markdownDescription: localize('terminal.integrated.env.linux', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Linux. Set to `null` to delete the environment variable."), + markdownDescription: localize('terminal.integrated.env.linux', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on Linux. Set to `null` to delete the environment variable."), type: 'object', -@@ -430,3 +430,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -433,3 +433,3 @@ const terminalConfiguration: IConfigurationNode = { restricted: true, - markdownDescription: localize('terminal.integrated.env.windows', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Windows. Set to `null` to delete the environment variable."), + markdownDescription: localize('terminal.integrated.env.windows', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on Windows. Set to `null` to delete the environment variable."), type: 'object', -@@ -459,3 +459,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -462,3 +462,3 @@ const terminalConfiguration: IConfigurationNode = { [TerminalSettingId.ExperimentalWindowsUseConptyDll]: { - markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll shipped with VS Code, instead of the one bundled with Windows."), + markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll shipped with VSCodium, instead of the one bundled with Windows."), type: 'boolean', -@@ -560,3 +560,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -563,3 +563,3 @@ const terminalConfiguration: IConfigurationNode = { restricted: true, -- markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VS Code insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegrations.decorationsEnabled#`', '`#editor.accessibilitySupport#`'), -+ markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VSCodium insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegrations.decorationsEnabled#`', '`#editor.accessibilitySupport#`'), +- markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VS Code insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegration.decorationsEnabled#`', '`#editor.accessibilitySupport#`'), ++ markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VSCodium insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegration.decorationsEnabled#`', '`#editor.accessibilitySupport#`'), type: 'boolean', diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts -index c0a82e3..b0b75e4 100644 +index 860bb28..05f4eba 100644 --- a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts +++ b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts -@@ -69,3 +69,3 @@ export const terminalSuggestConfiguration: IStringDictionary|VSCodium Team https://github.com/VSCodium/vscodium/graphs/contributors|' resources/linux/debian/control.template - sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/debian/control.template sed -i 's|Visual Studio Code|VSCodium|g' resources/linux/debian/control.template sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/debian/control.template + sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/debian/control.template # code.spec.template - sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/rpm/code.spec.template sed -i 's|Microsoft Corporation|VSCodium Team|' resources/linux/rpm/code.spec.template sed -i 's|Visual Studio Code Team |VSCodium Team https://github.com/VSCodium/vscodium/graphs/contributors|' resources/linux/rpm/code.spec.template - sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/rpm/code.spec.template sed -i 's|Visual Studio Code|VSCodium|' resources/linux/rpm/code.spec.template + sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/rpm/code.spec.template + sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/rpm/code.spec.template # snapcraft.yaml sed -i 's|Visual Studio Code|VSCodium|' resources/linux/rpm/code.spec.template