From 33711f5a488446e45b38a02c3778cc05880f331f Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Sun, 8 Dec 2024 12:30:19 +0100 Subject: [PATCH] fix: update patch and electron hashes --- electron_linux_loong64.sh | 2 +- electron_linux_loong64.sha256sums | 12 ++- electron_linux_ppc64le.sh | 2 +- electron_linux_ppc64le.sha256sums | 22 ++--- patches/brand.patch | 129 ++++++++++++++++++------------ 5 files changed, 104 insertions(+), 63 deletions(-) diff --git a/electron_linux_loong64.sh b/electron_linux_loong64.sh index 69b1830..02a01e2 100644 --- a/electron_linux_loong64.sh +++ b/electron_linux_loong64.sh @@ -2,5 +2,5 @@ set -ex -export ELECTRON_VERSION="32.2.5" +export ELECTRON_VERSION="32.2.7" export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}" diff --git a/electron_linux_loong64.sha256sums b/electron_linux_loong64.sha256sums index 7963132..d8c0b77 100644 --- a/electron_linux_loong64.sha256sums +++ b/electron_linux_loong64.sha256sums @@ -1 +1,11 @@ -8d8b540e36a62b778b0fb5e3798a2d47c2c0475925b78ff4a101aa864dfb28a9 *electron-v32.2.5-linux-loong64.zip +2324198f130de1f5ccff6f216277eafa76fa53883c8297533f0e0c09d96faf31 *chromedriver-v32.2.7-linux-loong64.zip +724acd5cde9e747b3765f062b9a243af344faa039f9f0218beed1b0e9455e893 *electron-v32.2.7-linux-loong64-debug.zip +dee3600a67cc7f40f0fb4a8938940cb20fba0a95886352145cacc0334baa955e *electron-v32.2.7-linux-loong64-symbols.zip +2904bfaa386deddf968dec71c4b4235635daa318bdbb05ae3f3673983242cefe *electron-v32.2.7-linux-loong64.zip +e8fb755c82a58d98c70c1d3ac4d9c9c77e42021322b188183a550793ba94afe0 *ffmpeg-v32.2.7-linux-loong64.zip +69506c95a7ce4d5270164e0613aec9eb11fdc24f3dc21df3cd78963b764a6b75 *hunspell-dictionaries.zip +e02189a00e5170306289ba2bc0c295a9698f76899d812e35fc69fd8e4e4841d2 *libcxx-headers.zip +0cc5c76d848d9f572ef4050839876afd8533dc71fc90c319edfffcaa3dca0e01 *libcxx-objects-v32.2.7-linux-loong64.zip +caada8fb0a210d660e2150a0fe9f7b84a9e969a5b1110ce2d6b58f5d21637387 *libcxxabi-headers.zip +8736592799acdaafae2214156c7755f3249f4fd577fccc3df11bf42a5481aa12 *mksnapshot-v32.2.7-linux-loong64.zip +3d80771ab908f55cc61416b8b11d572e777b6c613ad2a7ee7aa8fef8b4ede011 *node-v32.2.7-headers.tar.gz diff --git a/electron_linux_ppc64le.sh b/electron_linux_ppc64le.sh index 69b1830..02a01e2 100644 --- a/electron_linux_ppc64le.sh +++ b/electron_linux_ppc64le.sh @@ -2,5 +2,5 @@ set -ex -export ELECTRON_VERSION="32.2.5" +export ELECTRON_VERSION="32.2.7" export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}" diff --git a/electron_linux_ppc64le.sha256sums b/electron_linux_ppc64le.sha256sums index 3c02620..e8c1f04 100644 --- a/electron_linux_ppc64le.sha256sums +++ b/electron_linux_ppc64le.sha256sums @@ -1,11 +1,11 @@ -286fb5f6392b0e937a52901014bc2022a578dea443e20c392d367ed399e8c1ab *chromedriver-v32.2.5-linux-ppc64le.zip -dfaa0a22fe7aca731d20b91deb7aed355de2e35c65bc09c2f2395d8c78cb53c5 *electron-v32.2.5-linux-ppc64le-debug.zip -a6ab217b8d7c9f284fea4ba2e35a8623d6d996c76361f6cc33e4b61e6f38dc1a *electron-v32.2.5-linux-ppc64le-symbols.zip -979479502d505ab2a16907ab8e1b358e88d9374295ce5dbe2207865367bc5972 *electron-v32.2.5-linux-ppc64le.zip -146a192ac5e05bbd8172e3107cd4a1cae2b4882c98272ec735a2628889803104 *electron.d.ts -5d7a1064d30dc30c8574878b52702dc0b4c7af5e247642957bbc491e66938cb6 *ffmpeg-v32.2.5-linux-ppc64le.zip -0ecd17e582e90fa0dda7e9e76429bceb93628ac3231d8d558d723f03e3e9d55c *hunspell_dictionaries.zip -8a72820655810ea0f917e73eb05ea90115f914060a716d7920e67e6dbc488ee8 *libcxx-objects-v32.2.5-linux-ppc64le.zip -91aa5b5b835de4846f05ebe9a988323c919825ba8bae182d8b7732c4dbda3d80 *libcxx_headers.zip -9c4f3cc365da92936bd3df9d3175737bb42558b91d8b2bc40d39e7c1b06c5554 *libcxxabi_headers.zip -018a86eb6c764a2b9307999225d4fe1ed2eb1d0bb54edf1289fe5c126a814043 *mksnapshot-v32.2.5-linux-ppc64le.zip +176cbd410925566ed2290d006b4a70de9d7953997d2189e67495fec5ec7648aa *chromedriver-v32.2.7-linux-ppc64le.zip +64a683d339b87463cacef142730ac366fa39ee27e017390909a928b9afb81b12 *electron-v32.2.7-linux-ppc64le-debug.zip +361b11b83589f64756def0a4982b611fb5220df287cd6c6fc3c9d4c5240a7b87 *electron-v32.2.7-linux-ppc64le-symbols.zip +1cba399c82c5baccb0387971a5697920d771bc424bd65fe503289e4d8f72dfa2 *electron-v32.2.7-linux-ppc64le.zip +ce41b10c28bd43249cd3b409e081b1c83a2b691381bdd2e3bf208ec40ca176b8 *electron.d.ts +9b74c159cbc8e9f80d145117e828066b09a1703961adc4f31703271776132797 *ffmpeg-v32.2.7-linux-ppc64le.zip +d8b47b51bb9474e39f9a0024a34a2378e4bdb3ff1ed4366db1752b3c6452afd1 *hunspell_dictionaries.zip +0c125463ff1b1bc3e8f16e3fc09052f4061143743acddf478188d08049da4d55 *libcxx-objects-v32.2.7-linux-ppc64le.zip +b1fc26b925ba6b896dea50bd471128cfa290c5b19673a62e8775537f6f94514d *libcxx_headers.zip +6f00ab500f9418eb788578c67a84422ed5dc962ad9c3be0de1f2931f55066895 *libcxxabi_headers.zip +2def4b7386e49bd658dd4f2f147710525423bb5cd3811394af0cf2b5047045ea *mksnapshot-v32.2.7-linux-ppc64le.zip diff --git a/patches/brand.patch b/patches/brand.patch index 7516404..7c2d7ab 100644 --- a/patches/brand.patch +++ b/patches/brand.patch @@ -73,37 +73,37 @@ 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 1f6775a..8d4a49a 100644 +index d706b65..fb24421 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json -@@ -222,3 +222,3 @@ +@@ -223,3 +223,3 @@ "{Locked='](command:git.showOutput'}", - "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" -@@ -250,4 +250,4 @@ +@@ -251,4 +251,4 @@ "config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.", - "config.terminalAuthentication": "Controls whether to enable VS Code 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 VS Code 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.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.", -@@ -311,3 +311,3 @@ +@@ -312,3 +312,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" -@@ -319,3 +319,3 @@ +@@ -320,3 +320,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" -@@ -327,3 +327,3 @@ +@@ -328,3 +328,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" -@@ -333,6 +333,6 @@ +@@ -334,6 +334,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 1f6775a..8d4a49a 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" -@@ -341,6 +341,6 @@ +@@ -342,6 +342,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 1f6775a..8d4a49a 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" -@@ -349,6 +349,6 @@ +@@ -350,6 +350,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 1f6775a..8d4a49a 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" -@@ -357,6 +357,6 @@ +@@ -358,6 +358,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 1f6775a..8d4a49a 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" -@@ -365,6 +365,6 @@ +@@ -366,6 +366,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 1f6775a..8d4a49a 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" -@@ -383,3 +383,3 @@ +@@ -384,3 +384,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" -@@ -392,3 +392,3 @@ +@@ -393,3 +393,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" -@@ -400,3 +400,3 @@ +@@ -401,3 +401,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,3 +408,3 @@ +@@ -409,3 +409,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" -@@ -413,6 +413,6 @@ +@@ -414,6 +414,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 1f6775a..8d4a49a 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" -@@ -421,6 +421,6 @@ +@@ -422,6 +422,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 1f6775a..8d4a49a 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" -@@ -432,3 +432,3 @@ +@@ -433,3 +433,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" -@@ -436,3 +436,3 @@ +@@ -437,3 +437,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)." @@ -699,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 5754b8a..f4385bd 100644 +index 7b8a2f9..d489ddb 100644 --- a/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts -@@ -661,3 +661,3 @@ const registry = Registry.as(ConfigurationExtensions.Con +@@ -673,3 +673,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."), @@ -726,36 +726,36 @@ index 0a13063..c62db65 100644 + 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 575eebe..a0ba2a8 100644 +index 4a2b68d..9ad4aea 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts -@@ -375,3 +375,3 @@ CommandsRegistry.registerCommand({ +@@ -378,3 +378,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, -@@ -382,3 +382,3 @@ CommandsRegistry.registerCommand({ +@@ -385,3 +385,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 -@@ -387,3 +387,3 @@ CommandsRegistry.registerCommand({ +@@ -390,3 +390,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 -@@ -392,3 +392,3 @@ CommandsRegistry.registerCommand({ +@@ -395,3 +395,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 -@@ -896,3 +896,3 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi +@@ -899,3 +899,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 196334c..f4b82ea 100644 +index a932e4f..3e08d9a 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 { @@ -773,26 +773,26 @@ index 196334c..f4b82ea 100644 - 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) { -@@ -2540,3 +2540,3 @@ export class ExtensionStatusAction extends ExtensionAction { +@@ -2555,3 +2555,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 { -@@ -2879,3 +2879,3 @@ export class ReinstallAction extends Action { +@@ -2894,3 +2894,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 3325a34..ec9bac4 100644 +index 1a86249..2230763 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -456,3 +456,3 @@ export class Extension implements IExtension { +@@ -457,3 +457,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 -@@ -494,3 +494,3 @@ ${this.description} +@@ -495,3 +495,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.`); @@ -1051,15 +1051,20 @@ index 3f1c098..3b2a175 100644 + description: localize('walkthroughs.steps.completionEvents.onCommand', 'Check off step when a given command is executed anywhere in VSCodium.'), body: 'onCommand:${1:commandId}' diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts -index 9628466..2ab04b1 100644 +index 02350e7..03a5f85 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts -@@ -214,3 +214,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -240,3 +240,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ id: 'Setup', - title: localize('gettingStarted.setup.title', "Get Started with VS Code"), + title: localize('gettingStarted.setup.title', "Get Started with VSCodium"), description: localize('gettingStarted.setup.description', "Customize your editor, learn the basics, and start coding"), -@@ -237,6 +237,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -245,3 +245,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ + when: '!isWeb', +- walkthroughPageTitle: localize('gettingStarted.setup.walkthroughPageTitle', 'Setup VS Code'), ++ walkthroughPageTitle: localize('gettingStarted.setup.walkthroughPageTitle', 'Setup VSCodium'), + next: 'Beginner', +@@ -266,6 +266,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.extensions.title', "Code with extensions"), - description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VS Code's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), + description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VSCodium's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), @@ -1068,42 +1073,58 @@ index 9628466..2ab04b1 100644 - type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions-web.svg' + type: 'svg', altText: 'VSCodium extension marketplace with featured language extensions', path: 'extensions-web.svg' }, -@@ -255,5 +255,5 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -284,6 +284,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.settings.title', "Tune your settings"), - description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), + description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VSCodium and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), + when: '!config.chat.experimental.offerSetup', media: { - type: 'svg', altText: 'VS Code Settings', path: 'settings.svg' + type: 'svg', altText: 'VSCodium Settings', path: 'settings.svg' }, -@@ -273,3 +273,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -303,3 +303,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ + title: localize('gettingStarted.settings.title', "Tune your settings"), +- description: localize('gettingStarted.settingsAndSync.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. [Back up and sync](command:workbench.userDataSync.actions.turnOn) your essential customizations across all your devices.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), ++ description: localize('gettingStarted.settingsAndSync.description.interpolated', "Customize every aspect of VSCodium and your extensions to your liking. [Back up and sync](command:workbench.userDataSync.actions.turnOn) your essential customizations across all your devices.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), + when: 'config.chat.experimental.offerSetup && syncStatus != uninitialized', +@@ -307,3 +307,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ + media: { +- type: 'svg', altText: 'VS Code Settings', path: 'settings.svg' ++ type: 'svg', altText: 'VSCodium Settings', path: 'settings.svg' + }, +@@ -313,3 +313,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.commandPalette.title', "Unlock productivity with the Command Palette "), - description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), + description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VSCodium.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' }, -@@ -279,3 +279,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -319,3 +319,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), - description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')), + description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VSCodium.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')), - when: 'isMac && workspaceFolderCount == 0', -@@ -288,3 +288,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ + when: '!config.chat.experimental.offerSetup && isMac && workspaceFolderCount == 0', +@@ -328,3 +328,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), - description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')), + description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VSCodium.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')), - when: '!isMac && workspaceFolderCount == 0', -@@ -306,4 +306,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ + when: '!config.chat.experimental.offerSetup && !isMac && workspaceFolderCount == 0', +@@ -346,4 +346,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.videoTutorial.title', "Watch video tutorials"), - description: localize('gettingStarted.videoTutorial.description.interpolated', "Watch the first in a series of short & practical video tutorials for VS Code's key features.\n{0}", Button(localize('watch', "Watch Tutorial"), 'https://aka.ms/vscode-getting-started-video')), - media: { type: 'svg', altText: 'VS Code Settings', path: 'learn.svg' }, + description: localize('gettingStarted.videoTutorial.description.interpolated', "Watch the first in a series of short & practical video tutorials for VSCodium's key features.\n{0}", Button(localize('watch', "Watch Tutorial"), 'https://aka.ms/vscode-getting-started-video')), + media: { type: 'svg', altText: 'VSCodium Settings', path: 'learn.svg' }, } -@@ -315,3 +315,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -355,3 +355,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ id: 'SetupWeb', - title: localize('gettingStarted.setupWeb.title', "Get Started with VS Code for the Web"), + title: localize('gettingStarted.setupWeb.title', "Get Started with VSCodium for the Web"), description: localize('gettingStarted.setupWeb.description', "Customize your editor, learn the basics, and start coding"), -@@ -347,6 +347,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -361,3 +361,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ + next: 'Beginner', +- walkthroughPageTitle: localize('gettingStarted.setupWeb.walkthroughPageTitle', 'Setup VS Code Web'), ++ walkthroughPageTitle: localize('gettingStarted.setupWeb.walkthroughPageTitle', 'Setup VSCodium Web'), + content: { +@@ -387,6 +387,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.extensions.title', "Code with extensions"), - description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VS Code's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), + description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VSCodium's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), @@ -1112,22 +1133,32 @@ index 9628466..2ab04b1 100644 - type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions-web.svg' + type: 'svg', altText: 'VSCodium extension marketplace with featured language extensions', path: 'extensions-web.svg' }, -@@ -375,3 +375,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -415,3 +415,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.commandPalette.title', "Unlock productivity with the Command Palette "), - description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), + description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VSCodium.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' }, -@@ -381,3 +381,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -421,3 +421,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), - description: localize('gettingStarted.setup.OpenFolderWeb.description.interpolated', "You're all set to start coding. You can open a local project or a remote repository to get your files into VS Code.\n{0}\n{1}", Button(localize('openFolder', "Open Folder"), 'command:workbench.action.addRootFolder'), Button(localize('openRepository', "Open Repository"), 'command:remoteHub.openRepository')), + description: localize('gettingStarted.setup.OpenFolderWeb.description.interpolated', "You're all set to start coding. You can open a local project or a remote repository to get your files into VSCodium.\n{0}\n{1}", Button(localize('openFolder', "Open Folder"), 'command:workbench.action.addRootFolder'), Button(localize('openRepository', "Open Repository"), 'command:remoteHub.openRepository')), when: 'workspaceFolderCount == 0', -@@ -402,3 +402,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -442,3 +442,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.setupAccessibility.title', "Get Started with Accessibility Features"), - description: localize('gettingStarted.setupAccessibility.description', "Learn the tools and shortcuts that make VS Code accessible. Note that some actions are not actionable from within the context of the walkthrough."), + description: localize('gettingStarted.setupAccessibility.description', "Learn the tools and shortcuts that make VSCodium accessible. Note that some actions are not actionable from within the context of the walkthrough."), isFeatured: true, -@@ -511,6 +511,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -447,3 +447,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ + next: 'Setup', +- walkthroughPageTitle: localize('gettingStarted.setupAccessibility.walkthroughPageTitle', 'Setup VS Code Accessibility'), ++ walkthroughPageTitle: localize('gettingStarted.setupAccessibility.walkthroughPageTitle', 'Setup VSCodium Accessibility'), + content: { +@@ -478,3 +478,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ + title: localize('gettingStarted.commandPaletteAccessibility.title', "Unlock productivity with the Command Palette "), +- description: localize('gettingStarted.commandPaletteAccessibility.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), ++ description: localize('gettingStarted.commandPaletteAccessibility.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VSCodium.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), + media: { type: 'markdown', path: 'empty' }, +@@ -551,6 +551,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.extensions.title', "Code with extensions"), - description: localize('gettingStarted.extensions.description.interpolated', "Extensions are VS Code's power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}", Button(localize('browsePopular', "Browse Popular Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), + description: localize('gettingStarted.extensions.description.interpolated', "Extensions are VSCodium's power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}", Button(localize('browsePopular', "Browse Popular Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),