|
|
|
|
@ -62,7 +62,7 @@ index 1be4d0e..73a8f3e 100644
|
|
|
|
|
-export const redundantImplicitActivationEvent = l10n.t("This activation event can be removed as VS Code generates these automatically from your package.json contribution declarations.");
|
|
|
|
|
+export const redundantImplicitActivationEvent = l10n.t("This activation event can be removed as VSCodium generates these automatically from your package.json contribution declarations.");
|
|
|
|
|
diff --git a/extensions/extension-editing/src/extensionLinter.ts b/extensions/extension-editing/src/extensionLinter.ts
|
|
|
|
|
index b69dac0..293e866 100644
|
|
|
|
|
index be7eea1..389e89e 100644
|
|
|
|
|
--- a/extensions/extension-editing/src/extensionLinter.ts
|
|
|
|
|
+++ b/extensions/extension-editing/src/extensionLinter.ts
|
|
|
|
|
@@ -34,4 +34,4 @@ const relativeUrlRequiresHttpsRepository = l10n.t("Relative image URLs require a
|
|
|
|
|
@ -73,37 +73,37 @@ index b69dac0..293e866 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 bad361b..300261a 100644
|
|
|
|
|
index 78a6b0f..10712a2 100644
|
|
|
|
|
--- a/extensions/git/package.nls.json
|
|
|
|
|
+++ b/extensions/git/package.nls.json
|
|
|
|
|
@@ -221,3 +221,3 @@
|
|
|
|
|
@@ -222,3 +222,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"
|
|
|
|
|
@@ -249,4 +249,4 @@
|
|
|
|
|
@@ -250,4 +250,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.",
|
|
|
|
|
@@ -305,3 +305,3 @@
|
|
|
|
|
@@ -306,3 +306,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"
|
|
|
|
|
@@ -313,3 +313,3 @@
|
|
|
|
|
@@ -314,3 +314,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"
|
|
|
|
|
@@ -321,3 +321,3 @@
|
|
|
|
|
@@ -322,3 +322,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,6 +327,6 @@
|
|
|
|
|
@@ -328,6 +328,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 bad361b..300261a 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"
|
|
|
|
|
@@ -335,6 +335,6 @@
|
|
|
|
|
@@ -336,6 +336,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 bad361b..300261a 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"
|
|
|
|
|
@@ -343,6 +343,6 @@
|
|
|
|
|
@@ -344,6 +344,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 bad361b..300261a 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"
|
|
|
|
|
@@ -351,6 +351,6 @@
|
|
|
|
|
@@ -352,6 +352,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 bad361b..300261a 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"
|
|
|
|
|
@@ -359,6 +359,6 @@
|
|
|
|
|
@@ -360,6 +360,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 bad361b..300261a 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"
|
|
|
|
|
@@ -377,3 +377,3 @@
|
|
|
|
|
@@ -378,3 +378,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"
|
|
|
|
|
@@ -386,3 +386,3 @@
|
|
|
|
|
@@ -387,3 +387,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"
|
|
|
|
|
@@ -394,3 +394,3 @@
|
|
|
|
|
@@ -395,3 +395,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"
|
|
|
|
|
@@ -402,3 +402,3 @@
|
|
|
|
|
@@ -403,3 +403,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"
|
|
|
|
|
@@ -407,6 +407,6 @@
|
|
|
|
|
@@ -408,6 +408,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 bad361b..300261a 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"
|
|
|
|
|
@@ -415,6 +415,6 @@
|
|
|
|
|
@@ -416,6 +416,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 bad361b..300261a 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"
|
|
|
|
|
@@ -426,3 +426,3 @@
|
|
|
|
|
@@ -427,3 +427,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"
|
|
|
|
|
@@ -430,3 +430,3 @@
|
|
|
|
|
@@ -431,3 +431,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 d9c4ddb..4f0516c 100644
|
|
|
|
|
index 4a62db6..233fb1f 100644
|
|
|
|
|
--- a/extensions/typescript-language-features/package.nls.json
|
|
|
|
|
+++ b/extensions/typescript-language-features/package.nls.json
|
|
|
|
|
@@ -75,4 +75,4 @@
|
|
|
|
|
@ -374,15 +374,19 @@ index d9c4ddb..4f0516c 100644
|
|
|
|
|
- "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code.",
|
|
|
|
|
+ "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VSCodium.",
|
|
|
|
|
"typescript.updateImportsOnFileMove.enabled.prompt": "Prompt on each rename.",
|
|
|
|
|
@@ -166,5 +166,5 @@
|
|
|
|
|
@@ -166,8 +166,8 @@
|
|
|
|
|
"typescript.suggest.enabled": "Enabled/disable autocomplete suggestions.",
|
|
|
|
|
- "configuration.surveys.enabled": "Enabled/disable occasional surveys that help us improve VS Code's JavaScript and TypeScript support.",
|
|
|
|
|
+ "configuration.surveys.enabled": "Enabled/disable occasional surveys that help us improve VSCodium's JavaScript and TypeScript support.",
|
|
|
|
|
"configuration.suggest.completeJSDocs": "Enable/disable suggestion to complete JSDoc comments.",
|
|
|
|
|
- "configuration.tsserver.useVsCodeWatcher": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
|
|
|
|
|
+ "configuration.tsserver.useVsCodeWatcher": "Use VSCodium's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
|
|
|
|
|
"configuration.tsserver.useVsCodeWatcher.deprecation": "Please use the `#typescript.tsserver.watchOptions#` setting instead.",
|
|
|
|
|
"configuration.tsserver.watchOptions": "Configure which watching strategies should be used to keep track of files and directories.",
|
|
|
|
|
@@ -234,6 +234,6 @@
|
|
|
|
|
- "configuration.tsserver.watchOptions.vscode": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
|
|
|
|
|
+ "configuration.tsserver.watchOptions.vscode": "Use VSCodium's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
|
|
|
|
|
"configuration.tsserver.watchOptions.watchFile": "Strategy for how individual files are watched.",
|
|
|
|
|
@@ -236,6 +236,6 @@
|
|
|
|
|
"configuration.suggest.objectLiteralMethodSnippets.enabled": "Enable/disable snippet completions for methods in object literals.",
|
|
|
|
|
- "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VS Code is running in a trusted context.",
|
|
|
|
|
+ "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VSCodium is running in a trusted context.",
|
|
|
|
|
@ -390,8 +394,8 @@ index d9c4ddb..4f0516c 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": "Automatically update imports when pasting code. Requires TypeScript 5.6+.",
|
|
|
|
|
@@ -249,6 +249,6 @@
|
|
|
|
|
"configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.7+.",
|
|
|
|
|
@@ -251,6 +251,6 @@
|
|
|
|
|
"walkthroughs.nodejsWelcome.debugJsFile.title": "Run and Debug your JavaScript",
|
|
|
|
|
- "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VS Code's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)",
|
|
|
|
|
+ "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VSCodium's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)",
|
|
|
|
|
@ -525,7 +529,7 @@ index fa001b5..13abac2 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 2942951..86c5653 100644
|
|
|
|
|
index ebf401d..bed25b5 100644
|
|
|
|
|
--- a/src/vs/code/electron-main/app.ts
|
|
|
|
|
+++ b/src/vs/code/electron-main/app.ts
|
|
|
|
|
@@ -532,3 +532,3 @@ export class CodeApplication extends Disposable {
|
|
|
|
|
@ -775,7 +779,7 @@ index 3930f44..89051bd 100644
|
|
|
|
|
+ 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 e34a900..c976572 100644
|
|
|
|
|
index 1575be2..74384e1 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 {
|
|
|
|
|
@ -908,64 +912,59 @@ 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 13d0821..171a99d 100644
|
|
|
|
|
index dd683b4..07bce78 100644
|
|
|
|
|
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
|
|
|
|
|
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
|
|
|
|
|
@@ -202,3 +202,3 @@ export class TerminalViewPane extends ViewPane {
|
|
|
|
|
@@ -203,3 +203,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 4b36691..a87a683 100644
|
|
|
|
|
index 33ca655..353692a 100644
|
|
|
|
|
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
|
|
|
|
|
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
|
|
|
|
|
@@ -296,3 +296,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
|
|
@@ -287,3 +287,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',
|
|
|
|
|
@@ -310,3 +310,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
|
|
@@ -301,3 +301,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."),
|
|
|
|
|
@@ -398,3 +398,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
|
|
@@ -389,3 +389,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'),
|
|
|
|
|
@@ -410,3 +410,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
|
|
@@ -401,3 +401,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',
|
|
|
|
|
@@ -421,3 +421,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
|
|
@@ -412,3 +412,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',
|
|
|
|
|
@@ -430,3 +430,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
|
|
@@ -421,3 +421,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',
|
|
|
|
|
@@ -439,3 +439,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
|
|
@@ -430,3 +430,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',
|
|
|
|
|
@@ -468,3 +468,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
|
|
@@ -459,3 +459,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',
|
|
|
|
|
@@ -568,3 +568,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
|
|
[TerminalSettingId.AutoReplies]: {
|
|
|
|
|
- markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VS Code if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'),
|
|
|
|
|
+ markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VSCodium if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'),
|
|
|
|
|
type: 'object',
|
|
|
|
|
@@ -581,3 +581,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
|
|
@@ -560,3 +560,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#`'),
|
|
|
|
|
@ -1171,24 +1170,24 @@ index 0ab6828..6c8b5ef 100644
|
|
|
|
|
+ markdownDescription: localize('workspace.trust.emptyWindow.description', "Controls whether or not the empty window is trusted by default within VSCodium. When used with `#{0}#`, you can enable the full functionality of VSCodium without prompting in an empty window.", WORKSPACE_TRUST_UNTRUSTED_FILES),
|
|
|
|
|
tags: [WORKSPACE_TRUST_SETTING_TAG],
|
|
|
|
|
diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
|
|
|
|
|
index f6bae66..a4d5856 100644
|
|
|
|
|
index b638748..13af28d 100644
|
|
|
|
|
--- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
|
|
|
|
|
+++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
|
|
|
|
|
@@ -401,3 +401,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
|
|
|
|
|
@@ -402,3 +402,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
|
|
|
|
|
type: 'boolean',
|
|
|
|
|
- description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running VS Code as elevated on Linux and running under Applocker on Windows.")
|
|
|
|
|
+ description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running VSCodium as elevated on Linux and running under Applocker on Windows.")
|
|
|
|
|
},
|
|
|
|
|
@@ -405,3 +405,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
|
|
|
|
|
@@ -406,3 +406,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
|
|
|
|
|
type: 'boolean',
|
|
|
|
|
- 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 VS Code extension tests or when you're experiencing difficulties with the credential store.")
|
|
|
|
|
+ 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 45bd7f0..8705da3 100644
|
|
|
|
|
index 90ff933..8b40a84 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
|
|
|
|
|
@@ -765,3 +765,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);
|
|
|
|
|
@ -1208,7 +1207,7 @@ index ac3c7ed..542bb3c 100644
|
|
|
|
|
+ comment: 'This is used to understand the drop funnel of extension URI handling by the OS & VSCodium.';
|
|
|
|
|
};
|
|
|
|
|
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
|
|
|
|
|
index bb8220b..ca56b50 100644
|
|
|
|
|
index 03fbc7d..1903754 100644
|
|
|
|
|
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
|
|
|
|
|
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
|
|
|
|
|
@@ -178,3 +178,3 @@ export const schema: IJSONSchema = {
|
|
|
|
|
|
Baptiste Augrain
GitHub