|
@@ -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 6db2531..749c741 100644
|
|
|
+index 61168a7..2857b67 100644
|
|
|
--- a/extensions/git/package.nls.json
|
|
|
+++ b/extensions/git/package.nls.json
|
|
|
-@@ -223,3 +223,3 @@
|
|
|
+@@ -224,3 +224,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"
|
|
|
-@@ -251,4 +251,4 @@
|
|
|
+@@ -252,4 +252,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.",
|
|
|
-@@ -314,3 +314,3 @@
|
|
|
+@@ -316,3 +316,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"
|
|
|
-@@ -324,3 +324,3 @@
|
|
|
+@@ -326,3 +326,3 @@
|
|
|
"{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
|
|
|
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
|
|
|
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
|
|
|
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
|
|
-@@ -334,3 +334,3 @@
|
|
|
+@@ -336,3 +336,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"
|
|
|
-@@ -346,6 +346,6 @@
|
|
|
+@@ -348,6 +348,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,16 +112,16 @@ index 6db2531..749c741 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"
|
|
|
-@@ -354,6 +354,6 @@
|
|
|
+@@ -356,6 +356,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).",
|
|
|
+- "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).",
|
|
|
"comment": [
|
|
|
"{Locked='](command:vscode.openFolder'}",
|
|
|
- "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"
|
|
|
-@@ -362,6 +362,6 @@
|
|
|
+@@ -364,6 +364,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 6db2531..749c741 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"
|
|
|
-@@ -370,6 +370,6 @@
|
|
|
+@@ -372,6 +372,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 6db2531..749c741 100644
|
|
|
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
|
|
|
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
|
|
|
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
|
|
-@@ -378,6 +378,6 @@
|
|
|
+@@ -380,6 +380,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 6db2531..749c741 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"
|
|
|
-@@ -396,3 +396,3 @@
|
|
|
+@@ -398,3 +398,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"
|
|
|
-@@ -405,3 +405,3 @@
|
|
|
+@@ -407,3 +407,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"
|
|
|
-@@ -413,3 +413,3 @@
|
|
|
+@@ -415,3 +415,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"
|
|
|
-@@ -421,3 +421,3 @@
|
|
|
+@@ -423,3 +423,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"
|
|
|
-@@ -426,6 +426,6 @@
|
|
|
+@@ -428,6 +428,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 6db2531..749c741 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"
|
|
|
-@@ -434,6 +434,6 @@
|
|
|
+@@ -436,6 +436,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,34 +186,36 @@ index 6db2531..749c741 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"
|
|
|
-@@ -445,3 +445,3 @@
|
|
|
+@@ -447,3 +447,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"
|
|
|
-@@ -449,3 +449,3 @@
|
|
|
+@@ -451,3 +451,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)."
|
|
|
}
|
|
|
diff --git a/extensions/github/package.nls.json b/extensions/github/package.nls.json
|
|
|
-index 5ead790..f16eb9c 100644
|
|
|
+index bceb834..ee94815 100644
|
|
|
--- a/extensions/github/package.nls.json
|
|
|
+++ b/extensions/github/package.nls.json
|
|
|
-@@ -2,5 +2,5 @@
|
|
|
+@@ -2,3 +2,3 @@
|
|
|
"displayName": "GitHub",
|
|
|
- "description": "GitHub features for VS Code",
|
|
|
+ "description": "GitHub features for VSCodium",
|
|
|
+ "command.copyVscodeDevLink": "Copy vscode.dev Link",
|
|
|
+@@ -8,3 +8,3 @@
|
|
|
"config.branchProtection": "Controls whether to query repository rules for GitHub repositories",
|
|
|
- "config.gitAuthentication": "Controls whether to enable automatic GitHub authentication for git commands within VS Code.",
|
|
|
+ "config.gitAuthentication": "Controls whether to enable automatic GitHub authentication for git commands within VSCodium.",
|
|
|
"config.gitProtocol": "Controls which protocol is used to clone a GitHub repository",
|
|
|
-@@ -12,3 +12,3 @@
|
|
|
+@@ -16,3 +16,3 @@
|
|
|
"{Locked='](command:github.publish'}",
|
|
|
- "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"
|
|
|
-@@ -22,3 +22,3 @@
|
|
|
+@@ -26,3 +26,3 @@
|
|
|
"{Locked='](command:github.publish'}",
|
|
|
- "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",
|
|
@@ -459,7 +461,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 5f7681b..58bc70b 100644
|
|
|
+index d67a7cf..0b2b511 100644
|
|
|
--- a/extensions/vscode-api-tests/package.json
|
|
|
+++ b/extensions/vscode-api-tests/package.json
|
|
|
@@ -2,3 +2,3 @@
|
|
@@ -537,7 +539,7 @@ index a351aa7..32bfdb6 100644
|
|
|
+ throw Error(`Failed to download and unzip VSCodium ${quality} - ${commit}`);
|
|
|
}
|
|
|
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
|
|
|
-index 11ca66e..9fc3414 100644
|
|
|
+index 47481c0..61f5ec9 100644
|
|
|
--- a/src/vs/code/electron-main/app.ts
|
|
|
+++ b/src/vs/code/electron-main/app.ts
|
|
|
@@ -540,3 +540,3 @@ export class CodeApplication extends Disposable {
|
|
@@ -564,7 +566,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 762da10..ecc9bc5 100644
|
|
|
+index e954abf..29c0c23 100644
|
|
|
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
|
|
|
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
|
|
|
@@ -150,3 +150,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
|
|
@@ -572,12 +574,12 @@ index 762da10..ecc9bc5 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));
|
|
|
}
|
|
|
-@@ -1034,3 +1034,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
|
|
|
+@@ -1011,3 +1011,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));
|
|
|
}
|
|
|
-@@ -1045,3 +1045,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
|
|
|
+@@ -1022,3 +1022,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));
|
|
@@ -665,7 +667,7 @@ index f5a0648..5333241 100644
|
|
|
+ description: localize({ key: 'vscode.extension.contributes.views.containers.id', comment: ['Contribution refers to those that an extension contributes to VSCodium through an extension/contribution point. '] }, "Unique id used to identify the container in which views can be contributed using 'views' contribution point"),
|
|
|
type: 'string',
|
|
|
diff --git a/src/vs/workbench/api/common/extHostApiCommands.ts b/src/vs/workbench/api/common/extHostApiCommands.ts
|
|
|
-index 8167b0c..a43b277 100644
|
|
|
+index 1d08ef2..aeef203 100644
|
|
|
--- a/src/vs/workbench/api/common/extHostApiCommands.ts
|
|
|
+++ b/src/vs/workbench/api/common/extHostApiCommands.ts
|
|
|
@@ -443,3 +443,3 @@ const newCommands: ApiCommand[] = [
|
|
@@ -674,7 +676,7 @@ index 8167b0c..a43b277 100644
|
|
|
+ ApiCommandArgument.String.with('viewId', 'Custom editor view id. This should be the viewType string for custom editors or the notebookType string for notebooks. Use \'default\' to use VSCodium\'s default text editor'),
|
|
|
new ApiCommandArgument<vscode.ViewColumn | typeConverters.TextEditorOpenOptions | undefined, [vscode.ViewColumn?, ITextEditorOptions?] | undefined>('columnOrOptions', 'Either the column in which to open or editor options, see vscode.TextDocumentShowOptions',
|
|
|
diff --git a/src/vs/workbench/api/common/extHostCommands.ts b/src/vs/workbench/api/common/extHostCommands.ts
|
|
|
-index b1ff981..639ada5 100644
|
|
|
+index 0c170ec..7683cb4 100644
|
|
|
--- a/src/vs/workbench/api/common/extHostCommands.ts
|
|
|
+++ b/src/vs/workbench/api/common/extHostCommands.ts
|
|
|
@@ -460,4 +460,4 @@ export class ApiCommandArgument<V, O = V> {
|
|
@@ -765,7 +767,7 @@ index 052e140..54659f8 100644
|
|
|
+ this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to VSCodium. Configure these {0} to use this functionality.", link)) }, true);
|
|
|
} else {
|
|
|
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
|
|
|
-index 33692ad..1a8a183 100644
|
|
|
+index 56e0f16..ad02a8c 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 {
|
|
@@ -857,10 +859,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 8879209..79644c1 100644
|
|
|
+index 2b00a6a..f0c1f60 100644
|
|
|
--- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
|
|
|
+++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
|
|
|
-@@ -3197,3 +3197,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
|
|
|
+@@ -3200,3 +3200,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.'));
|
|
@@ -907,59 +909,59 @@ index 38e6d34..6b8cf60 100644
|
|
|
+ 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 6743ad2..ed1c709 100644
|
|
|
+index 6630112..fd11210 100644
|
|
|
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
|
|
|
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
|
|
|
-@@ -290,3 +290,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -312,3 +312,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',
|
|
|
-@@ -304,3 +304,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -326,3 +326,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."),
|
|
|
-@@ -392,3 +392,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -414,3 +414,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'),
|
|
|
-@@ -404,3 +404,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -426,3 +426,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',
|
|
|
-@@ -415,3 +415,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -437,3 +437,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',
|
|
|
-@@ -424,3 +424,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -446,3 +446,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',
|
|
|
-@@ -433,3 +433,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -455,3 +455,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',
|
|
|
-@@ -462,3 +462,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -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."),
|
|
|
type: 'boolean',
|
|
|
-@@ -568,3 +568,3 @@ const terminalConfiguration: IConfigurationNode = {
|
|
|
+@@ -591,3 +591,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 860bb28..05f4eba 100644
|
|
|
+index 6b2dd06..3797015 100644
|
|
|
--- a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
|
|
|
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
|
|
|
-@@ -72,3 +72,3 @@ export const terminalSuggestConfiguration: IStringDictionary<IConfigurationPrope
|
|
|
+@@ -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.'),
|
|
@@ -1018,7 +1020,7 @@ index 3f1c098..3b2a175 100644
|
|
|
+ description: localize('walkthroughs.steps.completionEvents.onCommand', 'Check off step when a given command is executed anywhere in VSCodium.'),
|
|
|
body: 'onCommand:${1:commandId}'
|
|
|
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
|
|
|
-index 53c8ae8..b511d98 100644
|
|
|
+index 5b01dd4..aacc6f2 100644
|
|
|
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
|
|
|
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
|
|
|
@@ -238,3 +238,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
|
@@ -1172,15 +1174,15 @@ 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 19a8cf1..9a8ea92 100644
|
|
|
+index 8681fcd..d3c1d19 100644
|
|
|
--- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
|
|
|
+++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
|
|
|
-@@ -404,3 +404,3 @@ import product from '../../platform/product/common/product.js';
|
|
|
+@@ -406,3 +406,3 @@ import { LinuxCustomTitlebarExperiment } from './parts/titlebar/titlebarPart.js'
|
|
|
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.")
|
|
|
},
|
|
|
-@@ -408,3 +408,3 @@ import product from '../../platform/product/common/product.js';
|
|
|
+@@ -410,3 +410,3 @@ import { LinuxCustomTitlebarExperiment } from './parts/titlebar/titlebarPart.js'
|
|
|
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.")
|
|
@@ -1195,15 +1197,15 @@ index 7bc1890..08fe9c3 100644
|
|
|
+ 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 ac3c7ed..542bb3c 100644
|
|
|
+index 04aa6fe..93195f2 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 = {
|
|
|
+@@ -87,3 +87,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.';
|
|
|
};
|
|
|
-@@ -98,3 +98,3 @@ type ExtensionUrlReloadHandlerClassification = {
|
|
|
+@@ -99,3 +99,3 @@ type ExtensionUrlReloadHandlerClassification = {
|
|
|
readonly isRemote: { classification: 'PublicNonPersonalData'; purpose: 'FeatureInsight'; comment: 'Whether the current window is a remote window' };
|
|
|
- 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.';
|
|
@@ -1267,10 +1269,10 @@ index e4c9ad4..d89b42a 100644
|
|
|
+ description: nls.localize('vscode.extension.scripts.uninstall', 'Uninstall hook for VSCodium extension. Script that gets executed when the extension is completely uninstalled from VSCodium which is when VSCodium is restarted (shutdown and start) after the extension is uninstalled. Only Node scripts are supported.'),
|
|
|
type: 'string'
|
|
|
diff --git a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
|
|
|
-index 33eabcc..63b5be0 100644
|
|
|
+index a552fa1..22395f9 100644
|
|
|
--- a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
|
|
|
+++ b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
|
|
|
-@@ -168,3 +168,3 @@ export class NativeExtensionService extends AbstractExtensionService implements
|
|
|
+@@ -167,3 +167,3 @@ export class NativeExtensionService extends AbstractExtensionService implements
|
|
|
[{
|
|
|
- label: nls.localize('relaunch', "Relaunch VS Code"),
|
|
|
+ label: nls.localize('relaunch', "Relaunch VSCodium"),
|