|
|
@@ -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 d706b65..fb24421 100644
|
|
|
+index 6db2531..749c741 100644
|
|
|
--- a/extensions/git/package.nls.json
|
|
|
+++ b/extensions/git/package.nls.json
|
|
|
@@ -223,3 +223,3 @@
|
|
|
@@ -88,22 +88,22 @@ index d706b65..fb24421 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.",
|
|
|
-@@ -312,3 +312,3 @@
|
|
|
- "{Locked='](command:workbench.action.reloadWindow'}",
|
|
|
+@@ -314,3 +314,3 @@
|
|
|
+ "{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
|
|
|
- "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"
|
|
|
-@@ -320,3 +320,3 @@
|
|
|
- "{Locked='](command:workbench.action.reloadWindow'}",
|
|
|
+@@ -324,3 +324,3 @@
|
|
|
+ "{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
|
|
|
- "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,3 +328,3 @@
|
|
|
- "{Locked='](command:workbench.action.reloadWindow'}",
|
|
|
+@@ -334,3 +334,3 @@
|
|
|
+ "{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
|
|
|
- "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"
|
|
|
-@@ -334,6 +334,6 @@
|
|
|
+@@ -346,6 +346,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 d706b65..fb24421 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"
|
|
|
-@@ -342,6 +342,6 @@
|
|
|
+@@ -354,6 +354,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 d706b65..fb24421 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"
|
|
|
-@@ -350,6 +350,6 @@
|
|
|
+@@ -362,6 +362,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 d706b65..fb24421 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"
|
|
|
-@@ -358,6 +358,6 @@
|
|
|
+@@ -370,6 +370,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 d706b65..fb24421 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"
|
|
|
-@@ -366,6 +366,6 @@
|
|
|
+@@ -378,6 +378,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 d706b65..fb24421 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"
|
|
|
-@@ -384,3 +384,3 @@
|
|
|
+@@ -396,3 +396,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"
|
|
|
-@@ -393,3 +393,3 @@
|
|
|
+@@ -405,3 +405,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"
|
|
|
-@@ -401,3 +401,3 @@
|
|
|
+@@ -413,3 +413,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"
|
|
|
-@@ -409,3 +409,3 @@
|
|
|
+@@ -421,3 +421,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"
|
|
|
-@@ -414,6 +414,6 @@
|
|
|
+@@ -426,6 +426,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 d706b65..fb24421 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"
|
|
|
-@@ -422,6 +422,6 @@
|
|
|
+@@ -434,6 +434,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 d706b65..fb24421 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"
|
|
|
-@@ -433,3 +433,3 @@
|
|
|
+@@ -445,3 +445,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"
|
|
|
-@@ -437,3 +437,3 @@
|
|
|
+@@ -449,3 +449,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)."
|
|
|
@@ -282,15 +282,15 @@ index af6c9d8..7057b54 100644
|
|
|
+ "json.tracing.desc": "Traces the communication between VSCodium and the JSON language server.",
|
|
|
"json.colorDecorators.enable.desc": "Enables or disables color decorators",
|
|
|
diff --git a/extensions/markdown-language-features/package.nls.json b/extensions/markdown-language-features/package.nls.json
|
|
|
-index da567b4..37e3f7d 100644
|
|
|
+index 47f26b0..b15bac6 100644
|
|
|
--- a/extensions/markdown-language-features/package.nls.json
|
|
|
+++ b/extensions/markdown-language-features/package.nls.json
|
|
|
-@@ -21,3 +21,3 @@
|
|
|
+@@ -22,3 +22,3 @@
|
|
|
"markdown.trace.extension.desc": "Enable debug logging for the Markdown extension.",
|
|
|
- "markdown.trace.server.desc": "Traces the communication between VS Code and the Markdown language server.",
|
|
|
+ "markdown.trace.server.desc": "Traces the communication between VSCodium and the Markdown language server.",
|
|
|
"markdown.server.log.desc": "Controls the logging level of the Markdown language server.",
|
|
|
-@@ -75,3 +75,3 @@
|
|
|
+@@ -76,3 +76,3 @@
|
|
|
"comment": [
|
|
|
- "This setting is use the user drops or pastes image data into the editor. In this case, VS Code automatically creates a new image file in the workspace containing the dropped/pasted image.",
|
|
|
+ "This setting is use the user drops or pastes image data into the editor. In this case, VSCodium automatically creates a new image file in the workspace containing the dropped/pasted image.",
|
|
|
@@ -564,7 +564,7 @@ index c256dba..0ae2e47 100644
|
|
|
+export const ProductQualityContext = new RawContextKey<string>('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 92405ee..d85fcfb 100644
|
|
|
+index 762da10..ecc9bc5 100644
|
|
|
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
|
|
|
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
|
|
|
@@ -150,3 +150,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
|
|
|
@@ -572,12 +572,12 @@ index 92405ee..d85fcfb 100644
|
|
|
- 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));
|
|
|
}
|
|
|
-@@ -1025,3 +1025,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
|
|
|
+@@ -1034,3 +1034,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
|
|
|
} catch (e) {
|
|
|
- throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
|
|
|
+ throw new Error(nls.localize('restartCode', "Please restart VSCodium before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
|
|
|
}
|
|
|
-@@ -1036,3 +1036,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
|
|
|
+@@ -1045,3 +1045,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
|
|
|
} catch (e) {
|
|
|
- throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
|
|
|
+ throw new Error(nls.localize('restartCode', "Please restart VSCodium before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
|
|
|
@@ -647,10 +647,10 @@ index d3f27d3..6a7e37a 100644
|
|
|
+ comment: 'This is used to know how often VSCodium has successfully downloaded the update.';
|
|
|
};
|
|
|
diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts
|
|
|
-index 7f20588..b72a8ea 100644
|
|
|
+index 0535ddd..79f12dc 100644
|
|
|
--- a/src/vs/server/node/server.cli.ts
|
|
|
+++ b/src/vs/server/node/server.cli.ts
|
|
|
-@@ -468,3 +468,3 @@ function asExtensionIdOrVSIX(inputs: string[] | undefined) {
|
|
|
+@@ -469,3 +469,3 @@ function asExtensionIdOrVSIX(inputs: string[] | undefined) {
|
|
|
function fatal(message: string, err: any): void {
|
|
|
- console.error('Unable to connect to VS Code server: ' + message);
|
|
|
+ console.error('Unable to connect to VSCodium server: ' + message);
|
|
|
@@ -765,7 +765,7 @@ index 052e140..54659f8 100644
|
|
|
+ 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 {
|
|
|
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
|
|
|
-index 1a28f00..7798b16 100644
|
|
|
+index 33692ad..1a8a183 100644
|
|
|
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
|
|
|
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
|
|
|
@@ -457,3 +457,3 @@ export class Extension implements IExtension {
|
|
|
@@ -898,16 +898,16 @@ 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 b71064b..d558dae 100644
|
|
|
+index 38e6d34..6b8cf60 100644
|
|
|
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
|
|
|
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
|
|
|
-@@ -204,3 +204,3 @@ export class TerminalViewPane extends ViewPane {
|
|
|
+@@ -213,3 +213,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 beea866..2f46568 100644
|
|
|
+index 6743ad2..ed1c709 100644
|
|
|
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
|
|
|
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
|
|
|
@@ -290,3 +290,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
@@ -950,7 +950,7 @@ index beea866..2f46568 100644
|
|
|
- markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.20.240626001) shipped with VS Code, instead of the one bundled with Windows."),
|
|
|
+ markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.20.240626001) shipped with VSCodium, instead of the one bundled with Windows."),
|
|
|
type: 'boolean',
|
|
|
-@@ -563,3 +563,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -568,3 +568,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.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#`'),
|
|
|
@@ -1018,7 +1018,7 @@ 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 303905c..453428b 100644
|
|
|
+index 53c8ae8..b511d98 100644
|
|
|
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
|
|
|
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
|
|
|
@@ -238,3 +238,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
|
|
@@ -1040,20 +1040,19 @@ index 303905c..453428b 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'
|
|
|
},
|
|
|
-@@ -282,6 +282,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'
|
|
|
- },
|
|
|
+@@ -283,5 +283,5 @@ 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')),
|
|
|
+ // media: {
|
|
|
+- // type: 'svg', altText: 'VS Code Settings', path: 'settings.svg'
|
|
|
++ // type: 'svg', altText: 'VSCodium Settings', path: 'settings.svg'
|
|
|
+ // },
|
|
|
@@ -301,3 +301,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',
|
|
|
+ when: 'syncStatus != uninitialized',
|
|
|
@@ -305,3 +305,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
|
|
media: {
|
|
|
- type: 'svg', altText: 'VS Code Settings', path: 'settings.svg'
|
|
|
@@ -1064,34 +1063,34 @@ index 303905c..453428b 100644
|
|
|
- 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' },
|
|
|
-@@ -317,3 +317,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: '!config.chat.experimental.offerSetup && isMac && workspaceFolderCount == 0',
|
|
|
-@@ -326,3 +326,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: '!config.chat.experimental.offerSetup && !isMac && workspaceFolderCount == 0',
|
|
|
-@@ -344,4 +344,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
|
|
+@@ -318,3 +318,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',
|
|
|
+@@ -327,3 +327,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',
|
|
|
+@@ -345,4 +345,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' },
|
|
|
}
|
|
|
-@@ -353,3 +353,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
|
|
+@@ -354,3 +354,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"),
|
|
|
-@@ -359,3 +359,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
|
|
+@@ -360,3 +360,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: {
|
|
|
-@@ -385,6 +385,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
|
|
+@@ -386,6 +386,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')),
|
|
|
@@ -1100,32 +1099,32 @@ index 303905c..453428b 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'
|
|
|
},
|
|
|
-@@ -413,3 +413,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
|
|
+@@ -414,3 +414,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' },
|
|
|
-@@ -419,3 +419,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
|
|
+@@ -420,3 +420,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',
|
|
|
-@@ -440,3 +440,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
|
|
+@@ -441,3 +441,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,
|
|
|
-@@ -445,3 +445,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
|
|
+@@ -446,3 +446,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: {
|
|
|
-@@ -476,3 +476,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
|
|
+@@ -477,3 +477,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' },
|
|
|
-@@ -549,6 +549,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
|
|
+@@ -550,6 +550,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')),
|
|
|
@@ -1187,10 +1186,10 @@ index 19a8cf1..9a8ea92 100644
|
|
|
+ description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running VSCodium extension tests or when you're experiencing difficulties with the credential store.")
|
|
|
}
|
|
|
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
|
|
|
-index d823682..db41e24 100644
|
|
|
+index 7bc1890..08fe9c3 100644
|
|
|
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
|
|
|
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
|
|
|
-@@ -762,3 +762,3 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
|
|
|
+@@ -790,3 +790,3 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
|
|
|
|
|
|
- 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);
|
|
|
@@ -1268,7 +1267,7 @@ index e4c9ad4..d89b42a 100644
|
|
|
+ description: nls.localize('vscode.extension.scripts.uninstall', 'Uninstall hook for VSCodium extension. Script that gets executed when the extension is completely uninstalled from VSCodium which is when VSCodium is restarted (shutdown and start) after the extension is uninstalled. Only Node scripts are supported.'),
|
|
|
type: 'string'
|
|
|
diff --git a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
|
|
|
-index 8adc7c1..00af7c2 100644
|
|
|
+index 33eabcc..63b5be0 100644
|
|
|
--- a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
|
|
|
+++ b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
|
|
|
@@ -168,3 +168,3 @@ export class NativeExtensionService extends AbstractExtensionService implements
|
|
|
@@ -1277,7 +1276,7 @@ index 8adc7c1..00af7c2 100644
|
|
|
+ label: nls.localize('relaunch', "Relaunch VSCodium"),
|
|
|
run: () => {
|
|
|
diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
|
|
|
-index 88b4666..e9cea01 100644
|
|
|
+index e4b29d5..b2883cc 100644
|
|
|
--- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
|
|
|
+++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
|
|
|
@@ -216,3 +216,3 @@ export class UserDataProfileManagementService extends Disposable implements IUse
|
Baptiste Augrain