|
|
@@ -10,7 +10,7 @@ index f791557..04f138d 100644
|
|
|
+ { label: 'workspaceFolderBasename', detail: vscode.l10n.t("The name of the folder opened in VSCodium without any slashes (/)") },
|
|
|
{ label: 'fileWorkspaceFolderBasename', detail: vscode.l10n.t("The current opened file workspace folder name without any slashes (/)") },
|
|
|
diff --git a/extensions/configuration-editing/src/settingsDocumentHelper.ts b/extensions/configuration-editing/src/settingsDocumentHelper.ts
|
|
|
-index 6135df5..484721e 100644
|
|
|
+index 12b50f3..be792c2 100644
|
|
|
--- a/extensions/configuration-editing/src/settingsDocumentHelper.ts
|
|
|
+++ b/extensions/configuration-editing/src/settingsDocumentHelper.ts
|
|
|
@@ -123,3 +123,3 @@ export class SettingsDocument {
|
|
|
@@ -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 5cfb2b1..31bf81e 100644
|
|
|
+index 101618a..b748e7a 100644
|
|
|
--- a/extensions/git/package.nls.json
|
|
|
+++ b/extensions/git/package.nls.json
|
|
|
-@@ -226,3 +226,3 @@
|
|
|
+@@ -227,3 +227,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"
|
|
|
-@@ -254,4 +254,4 @@
|
|
|
+@@ -255,4 +255,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.",
|
|
|
-@@ -318,3 +318,3 @@
|
|
|
+@@ -322,3 +322,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 @@
|
|
|
+@@ -332,3 +332,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"
|
|
|
-@@ -338,3 +338,3 @@
|
|
|
+@@ -342,3 +342,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"
|
|
|
-@@ -350,6 +350,6 @@
|
|
|
+@@ -354,6 +354,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 5cfb2b1..31bf81e 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 @@
|
|
|
+@@ -362,6 +362,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.cloneRecursive)\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.cloneRecursive)\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 5cfb2b1..31bf81e 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 @@
|
|
|
+@@ -370,6 +370,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 5cfb2b1..31bf81e 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"
|
|
|
-@@ -374,6 +374,6 @@
|
|
|
+@@ -378,6 +378,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 5cfb2b1..31bf81e 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"
|
|
|
-@@ -382,6 +382,6 @@
|
|
|
+@@ -386,6 +386,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 5cfb2b1..31bf81e 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"
|
|
|
-@@ -400,3 +400,3 @@
|
|
|
+@@ -404,3 +404,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"
|
|
|
-@@ -409,3 +409,3 @@
|
|
|
+@@ -413,3 +413,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"
|
|
|
-@@ -417,3 +417,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"
|
|
|
-@@ -425,3 +425,3 @@
|
|
|
+@@ -429,3 +429,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"
|
|
|
-@@ -430,6 +430,6 @@
|
|
|
+@@ -434,6 +434,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 5cfb2b1..31bf81e 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"
|
|
|
-@@ -438,6 +438,6 @@
|
|
|
+@@ -442,6 +442,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 5cfb2b1..31bf81e 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"
|
|
|
-@@ -449,3 +449,3 @@
|
|
|
+@@ -453,3 +453,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"
|
|
|
-@@ -453,3 +453,3 @@
|
|
|
+@@ -457,3 +457,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)."
|
|
|
@@ -284,7 +284,7 @@ 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 be3f6db..f5ddee0 100644
|
|
|
+index fe98103..05afb90 100644
|
|
|
--- a/extensions/markdown-language-features/package.nls.json
|
|
|
+++ b/extensions/markdown-language-features/package.nls.json
|
|
|
@@ -22,3 +22,3 @@
|
|
|
@@ -343,7 +343,7 @@ index d6ece35..9e878df 100644
|
|
|
+ "displayName": "VSCodium Builtin Notebook Output Renderer",
|
|
|
"requiresMessaging": "never",
|
|
|
diff --git a/extensions/npm/package.nls.json b/extensions/npm/package.nls.json
|
|
|
-index ff8581b..6774e97 100644
|
|
|
+index 56a77ff..b1e3722 100644
|
|
|
--- a/extensions/npm/package.nls.json
|
|
|
+++ b/extensions/npm/package.nls.json
|
|
|
@@ -2,3 +2,3 @@
|
|
|
@@ -352,7 +352,7 @@ index ff8581b..6774e97 100644
|
|
|
+ "displayName": "NPM support for VSCodium",
|
|
|
"workspaceTrust": "This extension executes tasks, which require trust to run.",
|
|
|
diff --git a/extensions/swift/syntaxes/swift.tmLanguage.json b/extensions/swift/syntaxes/swift.tmLanguage.json
|
|
|
-index b18b340..ca2eb2d 100644
|
|
|
+index 7d6694c..0e1d484 100644
|
|
|
--- a/extensions/swift/syntaxes/swift.tmLanguage.json
|
|
|
+++ b/extensions/swift/syntaxes/swift.tmLanguage.json
|
|
|
@@ -260,3 +260,3 @@
|
|
|
@@ -361,7 +361,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 6a7dc26..8a1bc75 100644
|
|
|
+index f88b9c7..b7d38ad 100644
|
|
|
--- a/extensions/typescript-language-features/package.nls.json
|
|
|
+++ b/extensions/typescript-language-features/package.nls.json
|
|
|
@@ -75,4 +75,4 @@
|
|
|
@@ -388,7 +388,7 @@ index 6a7dc26..8a1bc75 100644
|
|
|
- "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.",
|
|
|
-@@ -222,6 +222,6 @@
|
|
|
+@@ -222,9 +222,9 @@
|
|
|
"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.",
|
|
|
@@ -396,13 +396,12 @@ index 6a7dc26..8a1bc75 100644
|
|
|
"configuration.tsserver.web.typeAcquisition.enabled": "Enable/disable package acquisition on the web. This enables IntelliSense for imported packages. Requires `#typescript.tsserver.web.projectWideIntellisense.enabled#`. Currently not supported for Safari.",
|
|
|
- "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.",
|
|
|
+ "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VSCodium to detect a Node installation.",
|
|
|
- "configuration.updateImportsOnPaste": "Enable updating imports when pasting code. Requires TypeScript 5.7+.\n\nBy default this shows a option to update imports after pasting. You can use the `#editor.pasteAs.preferences#` setting to update imports automatically when pasting: `\"editor.pasteAs.preferences\": [ \"text.updateImports.jsts\" ]`.",
|
|
|
-@@ -229,3 +229,3 @@
|
|
|
+ "configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.6+.",
|
|
|
"walkthroughs.nodejsWelcome.title": "Get started with JavaScript and Node.js",
|
|
|
- "walkthroughs.nodejsWelcome.description": "Make the most of Visual Studio Code's first-class JavaScript experience.",
|
|
|
+ "walkthroughs.nodejsWelcome.description": "Make the most of VSCodium's first-class JavaScript experience.",
|
|
|
"walkthroughs.nodejsWelcome.downloadNode.forMacOrWindows.title": "Install Node.js",
|
|
|
-@@ -237,7 +237,7 @@
|
|
|
+@@ -236,7 +236,7 @@
|
|
|
"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.altText": "Debug and run your JavaScript code in Node.js with Visual Studio Code.",
|
|
|
@@ -442,7 +441,7 @@ index e85c715..9059335 100644
|
|
|
+ vscode.l10n.t("Please open a folder in VSCodium to use a TypeScript or JavaScript project"));
|
|
|
return;
|
|
|
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
|
|
|
-index d9f47c1..684cffc 100644
|
|
|
+index 4201d6d..ec88aa1 100644
|
|
|
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
|
|
|
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
|
|
|
@@ -653,3 +653,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
|
|
|
@@ -461,7 +460,7 @@ index d9f47c1..684cffc 100644
|
|
|
+ vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList));
|
|
|
} else {
|
|
|
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
|
|
|
-index d67a7cf..0b2b511 100644
|
|
|
+index 66a80b8..bd2d284 100644
|
|
|
--- a/extensions/vscode-api-tests/package.json
|
|
|
+++ b/extensions/vscode-api-tests/package.json
|
|
|
@@ -2,3 +2,3 @@
|
|
|
@@ -538,11 +537,20 @@ index a351aa7..32bfdb6 100644
|
|
|
- throw Error(`Failed to download and unzip VS Code ${quality} - ${commit}`);
|
|
|
+ throw Error(`Failed to download and unzip VSCodium ${quality} - ${commit}`);
|
|
|
}
|
|
|
+diff --git a/extensions/vscode-test-resolver/src/extension.ts b/extensions/vscode-test-resolver/src/extension.ts
|
|
|
+index 2fab3ec..35d3325 100644
|
|
|
+--- a/extensions/vscode-test-resolver/src/extension.ts
|
|
|
++++ b/extensions/vscode-test-resolver/src/extension.ts
|
|
|
+@@ -178,3 +178,3 @@ export function activate(context: vscode.ExtensionContext) {
|
|
|
+ const serverBin = path.join(remoteDataDir, 'bin');
|
|
|
+- progress.report({ message: 'Installing VSCode Server' });
|
|
|
++ progress.report({ message: 'Installing VSCodium Server' });
|
|
|
+ serverLocation = await downloadAndUnzipVSCodeServer(updateUrl, commit, quality, serverBin, m => outputChannel.appendLine(m));
|
|
|
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
|
|
|
-index 47481c0..61f5ec9 100644
|
|
|
+index 21a297a..4efb60f 100644
|
|
|
--- a/src/vs/code/electron-main/app.ts
|
|
|
+++ b/src/vs/code/electron-main/app.ts
|
|
|
-@@ -540,3 +540,3 @@ export class CodeApplication extends Disposable {
|
|
|
+@@ -546,3 +546,3 @@ export class CodeApplication extends Disposable {
|
|
|
async startup(): Promise<void> {
|
|
|
- this.logService.debug('Starting VS Code');
|
|
|
+ this.logService.debug('Starting VSCodium');
|
|
|
@@ -566,7 +574,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 e954abf..29c0c23 100644
|
|
|
+index 04ed182..bdf41b1 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
|
|
|
@@ -574,12 +582,12 @@ index e954abf..29c0c23 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));
|
|
|
}
|
|
|
-@@ -1011,3 +1011,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
|
|
|
+@@ -1007,3 +1007,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));
|
|
|
}
|
|
|
-@@ -1022,3 +1022,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
|
|
|
+@@ -1018,3 +1018,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));
|
|
|
@@ -624,28 +632,23 @@ index d96926b..c4bbc4a 100644
|
|
|
+ description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new VSCodium versions in the background on Windows."),
|
|
|
included: isWindows && !isWeb
|
|
|
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
|
|
|
-index 48638aa..08ea574 100644
|
|
|
+index a1ec3fe..c974cf7 100644
|
|
|
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
|
|
|
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
|
|
|
-@@ -23,3 +23,3 @@ export type UpdateNotAvailableClassification = {
|
|
|
- explicit: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the user has manually checked for updates, or this was an automatic check.' };
|
|
|
-- comment: 'This is used to understand how often VS Code pings the update server for an update and there\'s none available.';
|
|
|
-+ comment: 'This is used to understand how often VSCodium pings the update server for an update and there\'s none available.';
|
|
|
- };
|
|
|
-@@ -29,3 +29,3 @@ export type UpdateErrorClassification = {
|
|
|
+@@ -23,3 +23,3 @@ export type UpdateErrorClassification = {
|
|
|
messageHash: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The hash of the error message.' };
|
|
|
- comment: 'This is used to know how often VS Code updates have failed.';
|
|
|
+ comment: 'This is used to know how often VSCodium updates have failed.';
|
|
|
};
|
|
|
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
|
|
|
-index d3f27d3..6a7e37a 100644
|
|
|
+index 57398fb..9129f54 100644
|
|
|
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts
|
|
|
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
|
|
|
@@ -115,4 +115,4 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
|
|
|
owner: 'joaomoreno';
|
|
|
-- version: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The version number of the new VS Code that has been downloaded.' };
|
|
|
+- newVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The version number of the new VS Code that has been downloaded.' };
|
|
|
- comment: 'This is used to know how often VS Code has successfully downloaded the update.';
|
|
|
-+ version: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The version number of the new VSCodium that has been downloaded.' };
|
|
|
++ newVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The version number of the new VSCodium that has been downloaded.' };
|
|
|
+ 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
|
|
|
@@ -657,8 +660,17 @@ index 0535ddd..79f12dc 100644
|
|
|
- console.error('Unable to connect to VS Code server: ' + message);
|
|
|
+ console.error('Unable to connect to VSCodium server: ' + message);
|
|
|
console.error(err);
|
|
|
+diff --git a/src/vs/workbench/api/browser/mainThreadAuthentication.ts b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
|
|
|
+index 6441394..1984fd1 100644
|
|
|
+--- a/src/vs/workbench/api/browser/mainThreadAuthentication.ts
|
|
|
++++ b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
|
|
|
+@@ -334,3 +334,3 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
|
|
|
+ owner: 'TylerLeonhardt';
|
|
|
+- comment: 'Used to see which extensions are using the VSCode client id override';
|
|
|
++ comment: 'Used to see which extensions are using the VSCodium client id override';
|
|
|
+ extensionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The extension id.' };
|
|
|
diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
|
|
|
-index f5a0648..5333241 100644
|
|
|
+index fdf354d..502f06e 100644
|
|
|
--- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts
|
|
|
+++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
|
|
|
@@ -43,3 +43,3 @@ const viewsContainerSchema: IJSONSchema = {
|
|
|
@@ -687,19 +699,28 @@ index 0c170ec..7683cb4 100644
|
|
|
+ static readonly TestProfile = new ApiCommandArgument('testProfile', 'A VSCodium test profile', v => v instanceof extHostTypes.TestRunProfileBase, extHostTypeConverter.TestRunProfile.from);
|
|
|
|
|
|
diff --git a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts
|
|
|
-index 54b14a3..c075afb 100644
|
|
|
+index 0d71384..45f7923 100644
|
|
|
--- a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts
|
|
|
+++ b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts
|
|
|
-@@ -363,3 +363,3 @@ suite('NotebookCell#Document', function () {
|
|
|
+@@ -364,3 +364,3 @@ suite('NotebookCell#Document', function () {
|
|
|
|
|
|
- test('Opening a notebook results in VS Code firing the event onDidChangeActiveNotebookEditor twice #118470', function () {
|
|
|
+ test('Opening a notebook results in VSCodium firing the event onDidChangeActiveNotebookEditor twice #118470', function () {
|
|
|
let count = 0;
|
|
|
+diff --git a/src/vs/workbench/browser/web.factory.ts b/src/vs/workbench/browser/web.factory.ts
|
|
|
+index 422fbba..9dc9699 100644
|
|
|
+--- a/src/vs/workbench/browser/web.factory.ts
|
|
|
++++ b/src/vs/workbench/browser/web.factory.ts
|
|
|
+@@ -35,3 +35,3 @@ export function create(domElement: HTMLElement, options: IWorkbenchConstructionO
|
|
|
+ if (created) {
|
|
|
+- throw new Error('Unable to create the VSCode workbench more than once.');
|
|
|
++ throw new Error('Unable to create the VSCodium workbench more than once.');
|
|
|
+ } else {
|
|
|
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
|
|
|
-index 7b8a2f9..d489ddb 100644
|
|
|
+index 5e785e8..a8aa1b7 100644
|
|
|
--- a/src/vs/workbench/browser/workbench.contribution.ts
|
|
|
+++ b/src/vs/workbench/browser/workbench.contribution.ts
|
|
|
-@@ -673,3 +673,3 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
|
|
|
+@@ -678,3 +678,3 @@ const registry = Registry.as<IConfigurationRegistry>(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."),
|
|
|
@@ -714,36 +735,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 4a55c93..b991b70 100644
|
|
|
+index e301639..e7b0ac4 100644
|
|
|
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
|
|
|
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
|
|
|
-@@ -378,3 +378,3 @@ CommandsRegistry.registerCommand({
|
|
|
+@@ -386,3 +386,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,
|
|
|
-@@ -385,3 +385,3 @@ CommandsRegistry.registerCommand({
|
|
|
+@@ -393,3 +393,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
|
|
|
-@@ -390,3 +390,3 @@ CommandsRegistry.registerCommand({
|
|
|
+@@ -398,3 +398,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
|
|
|
-@@ -395,3 +395,3 @@ CommandsRegistry.registerCommand({
|
|
|
+@@ -403,3 +403,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
|
|
|
-@@ -899,3 +899,3 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
|
|
|
+@@ -907,3 +907,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 052e140..54659f8 100644
|
|
|
+index 8b062d1..24887c4 100644
|
|
|
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
|
|
|
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
|
|
|
@@ -105,3 +105,3 @@ export class PromptExtensionInstallFailureAction extends Action {
|
|
|
@@ -761,21 +782,21 @@ index 052e140..54659f8 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) {
|
|
|
-@@ -2555,3 +2555,3 @@ export class ExtensionStatusAction extends ExtensionAction {
|
|
|
+@@ -2553,3 +2553,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 {
|
|
|
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
|
|
|
-index e68c51b..bcb5a5f 100644
|
|
|
+index 74f8e88..5b1023b 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 {
|
|
|
+@@ -456,3 +456,3 @@ export class Extension implements IExtension {
|
|
|
return Promise.resolve(`# ${this.displayName || this.name}
|
|
|
-**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
|
|
|
+**Notice:** This extension is bundled with VSCodium. It can be disabled but not uninstalled.
|
|
|
## Features
|
|
|
-@@ -495,3 +495,3 @@ ${this.description}
|
|
|
+@@ -494,3 +494,3 @@ ${this.description}
|
|
|
if (this.type === ExtensionType.System) {
|
|
|
- return Promise.resolve(`Please check the [VS Code Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`);
|
|
|
+ return Promise.resolve(`Please check the [VSCodium Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`);
|
|
|
@@ -794,20 +815,6 @@ index 818e662..2450efc 100644
|
|
|
- '\t// List of extensions recommended by VS Code that should not be recommended for users of this workspace.',
|
|
|
+ '\t// List of extensions recommended by VSCodium that should not be recommended for users of this workspace.',
|
|
|
'\t"unwantedRecommendations": [',
|
|
|
-diff --git a/src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts b/src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts
|
|
|
-index 21967d3..24e3324 100644
|
|
|
---- a/src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts
|
|
|
-+++ b/src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts
|
|
|
-@@ -107,3 +107,3 @@ export class ExternalTerminalContribution implements IWorkbenchContribution {
|
|
|
- enumDescriptions: [
|
|
|
-- nls.localize('terminal.explorerKind.integrated', "Use VS Code's integrated terminal."),
|
|
|
-+ nls.localize('terminal.explorerKind.integrated', "Use VSCodium's integrated terminal."),
|
|
|
- nls.localize('terminal.explorerKind.external', "Use the configured external terminal."),
|
|
|
-@@ -122,3 +122,3 @@ export class ExternalTerminalContribution implements IWorkbenchContribution {
|
|
|
- enumDescriptions: [
|
|
|
-- nls.localize('terminal.sourceControlRepositoriesKind.integrated', "Use VS Code's integrated terminal."),
|
|
|
-+ nls.localize('terminal.sourceControlRepositoriesKind.integrated', "Use VSCodium's integrated terminal."),
|
|
|
- nls.localize('terminal.sourceControlRepositoriesKind.external', "Use the configured external terminal."),
|
|
|
diff --git a/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts b/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts
|
|
|
index f54ddfe..81ec478 100644
|
|
|
--- a/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts
|
|
|
@@ -859,10 +866,10 @@ index b716bcd..07b107b 100644
|
|
|
+ "You can now access this machine anywhere via the secure tunnel [{0}](command:{4}). To connect via a different machine, use the generated [{1}]({2}) link or use the [{6}]({7}) extension in the desktop or web. You can [configure](command:{3}) or [turn off](command:{5}) this access via the VSCodium Accounts menu.",
|
|
|
connectionInfo.tunnelName, connectionInfo.domain, linkToOpenForMarkdown, RemoteTunnelCommandIds.manage, RemoteTunnelCommandIds.configure, RemoteTunnelCommandIds.turnOff, remoteExtension.friendlyName, 'https://code.visualstudio.com/docs/remote/tunnels'
|
|
|
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
|
|
|
-index 2b00a6a..f0c1f60 100644
|
|
|
+index d6a1234..0ed32be 100644
|
|
|
--- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
|
|
|
+++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
|
|
|
-@@ -3200,3 +3200,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
|
|
|
+@@ -3199,3 +3199,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
|
|
|
if (response.code && response.code === TerminateResponseCode.ProcessNotFound) {
|
|
|
- this._notificationService.error(nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting VS Code might result in orphaned processes.'));
|
|
|
+ this._notificationService.error(nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting VSCodium might result in orphaned processes.'));
|
|
|
@@ -900,72 +907,72 @@ 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 38e6d34..6b8cf60 100644
|
|
|
+index 7e22be4..472fa8f 100644
|
|
|
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
|
|
|
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
|
|
|
-@@ -213,3 +213,3 @@ export class TerminalViewPane extends ViewPane {
|
|
|
+@@ -212,3 +212,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 6630112..fd11210 100644
|
|
|
+index 2780278..3b91442 100644
|
|
|
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
|
|
|
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
|
|
|
-@@ -312,3 +312,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -313,3 +313,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',
|
|
|
-@@ -326,3 +326,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -327,3 +327,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."),
|
|
|
-@@ -414,3 +414,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -415,3 +415,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'),
|
|
|
-@@ -426,3 +426,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -427,3 +427,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',
|
|
|
-@@ -437,3 +437,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -438,3 +438,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',
|
|
|
-@@ -446,3 +446,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -447,3 +447,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',
|
|
|
-@@ -455,3 +455,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -456,3 +456,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',
|
|
|
-@@ -484,3 +484,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
- [TerminalSettingId.ExperimentalWindowsUseConptyDll]: {
|
|
|
-- 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."),
|
|
|
+@@ -485,3 +485,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+ [TerminalSettingId.WindowsUseConptyDll]: {
|
|
|
+- markdownDescription: localize('terminal.integrated.windowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.22.250204002) shipped with VS Code, instead of the one bundled with Windows."),
|
|
|
++ markdownDescription: localize('terminal.integrated.windowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.22.250204002) shipped with VSCodium, instead of the one bundled with Windows."),
|
|
|
type: 'boolean',
|
|
|
-@@ -591,3 +591,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -592,3 +592,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#`'),
|
|
|
type: 'boolean',
|
|
|
-diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
|
|
|
-index 6b2dd06..3797015 100644
|
|
|
---- a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
|
|
|
-+++ b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
|
|
|
-@@ -108,3 +108,3 @@ export const terminalSuggestConfiguration: IStringDictionary<IConfigurationPrope
|
|
|
- 'pwshCode': {
|
|
|
-- description: localize('suggest.builtinCompletions.pwshCode', 'Custom PowerShell argument completers will be registered for VS Code\'s `code` and `code-insiders` CLIs. This is currently very basic and always suggests flags and subcommands without checking context.'),
|
|
|
-+ description: localize('suggest.builtinCompletions.pwshCode', 'Custom PowerShell argument completers will be registered for VSCodium\'s `codium` and `codium-insiders` CLIs. This is currently very basic and always suggests flags and subcommands without checking context.'),
|
|
|
- type: 'boolean'
|
|
|
+diff --git a/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts
|
|
|
+index 4979520..49d0cbd 100644
|
|
|
+--- a/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts
|
|
|
++++ b/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts
|
|
|
+@@ -19,3 +19,3 @@ export const terminalAutoRepliesConfiguration: IStringDictionary<IConfigurationP
|
|
|
+ [TerminalAutoRepliesSettingId.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',
|
|
|
diff --git a/src/vs/workbench/contrib/update/browser/update.ts b/src/vs/workbench/contrib/update/browser/update.ts
|
|
|
index fd3452f..a2c0b45 100644
|
|
|
--- a/src/vs/workbench/contrib/update/browser/update.ts
|
|
|
@@ -1195,7 +1202,7 @@ index bdd30bf..5023e82 100644
|
|
|
+Well if you have got this far then you will have touched on some of the editing features in VSCodium. But don't stop now :) We have lots of additional [documentation](https://code.visualstudio.com/docs), [introductory videos](https://code.visualstudio.com/docs/getstarted/introvideos) and [tips and tricks](https://go.microsoft.com/fwlink/?linkid=852118) for the product that will help you learn how to use it. And while you are here, here are a few additional things you can try:
|
|
|
- Open the Integrated Terminal by pressing kb(workbench.action.terminal.toggleTerminal), then see what's possible by [reviewing the terminal documentation](https://code.visualstudio.com/docs/editor/integrated-terminal)
|
|
|
diff --git a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
|
|
|
-index 0ab6828..6c8b5ef 100644
|
|
|
+index c512b64..8034183 100644
|
|
|
--- a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
|
|
|
+++ b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
|
|
|
@@ -733,3 +733,3 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
|
|
|
@@ -1209,37 +1216,33 @@ 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 8681fcd..d3c1d19 100644
|
|
|
+index c420ccf..206e5d6 100644
|
|
|
--- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
|
|
|
+++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
|
|
|
-@@ -406,3 +406,3 @@ import { LinuxCustomTitlebarExperiment } from './parts/titlebar/titlebarPart.js'
|
|
|
+@@ -351,3 +351,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
|
|
|
+ allowTrailingCommas: true,
|
|
|
+- description: 'VSCode static command line definition file',
|
|
|
++ description: 'VSCodium static command line definition file',
|
|
|
+ type: 'object',
|
|
|
+@@ -396,3 +396,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.")
|
|
|
},
|
|
|
-@@ -410,3 +410,3 @@ import { LinuxCustomTitlebarExperiment } from './parts/titlebar/titlebarPart.js'
|
|
|
+@@ -400,3 +400,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 7bc1890..08fe9c3 100644
|
|
|
+index bcf58d2..e508bad 100644
|
|
|
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
|
|
|
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
|
|
|
-@@ -790,3 +790,3 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
|
|
|
+@@ -1044,3 +1044,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);
|
|
|
const virtualWorkspaceSupport = this.extensionManifestPropertiesService.getExtensionVirtualWorkspaceSupportType(manifest);
|
|
|
-diff --git a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts
|
|
|
-index b5f6787..b5883ec 100644
|
|
|
---- a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts
|
|
|
-+++ b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts
|
|
|
-@@ -86,3 +86,3 @@ type ExtensionUrlHandlerClassification = {
|
|
|
- readonly extensionId: { classification: 'PublicNonPersonalData'; purpose: 'FeatureInsight'; comment: 'The ID of the extension that should handle the URI' };
|
|
|
-- comment: 'This is used to understand the drop funnel of extension URI handling by the OS & VS Code.';
|
|
|
-+ 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 e4c9ad4..d89b42a 100644
|
|
|
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
|
Baptiste Augrain