mirror of
https://github.com/VSCodium/vscodium
synced 2024-09-29 15:43:30 +00:00
feat(1.87): update patches
This commit is contained in:
Baptiste Augrain
parent
02883594db
commit
6a0df191ba
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"tag": "1.86.2",
|
||||
"commit": "903b1e9d8990623e3d7da1df3d33db3e42d80eda"
|
||||
"tag": "1.87.0",
|
||||
"commit": "c11a2dd4d52e38cb92b8c464f47a7b02bb7c8762"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/extensions/configuration-editing/src/configurationEditingMain.ts b/extensions/configuration-editing/src/configurationEditingMain.ts
|
||||
index 30e7fd4..76eae3c 100644
|
||||
index f791557..04f138d 100644
|
||||
--- a/extensions/configuration-editing/src/configurationEditingMain.ts
|
||||
+++ b/extensions/configuration-editing/src/configurationEditingMain.ts
|
||||
@@ -54,4 +54,4 @@ function registerVariableCompletions(pattern: string): vscode.Disposable {
|
||||
|
|
@ -10,7 +10,7 @@ index 30e7fd4..76eae3c 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 110494f..9f01ff2 100644
|
||||
index bbf77e6..28c4142 100644
|
||||
--- a/extensions/configuration-editing/src/settingsDocumentHelper.ts
|
||||
+++ b/extensions/configuration-editing/src/settingsDocumentHelper.ts
|
||||
@@ -118,3 +118,3 @@ export class SettingsDocument {
|
||||
|
|
@ -19,7 +19,7 @@ index 110494f..9f01ff2 100644
|
|||
+ completions.push(this.newSimpleCompletionItem(getText('appName'), range, vscode.l10n.t("e.g. VSCodium")));
|
||||
completions.push(this.newSimpleCompletionItem(getText('remoteName'), range, vscode.l10n.t("e.g. SSH")));
|
||||
diff --git a/extensions/css-language-features/package.nls.json b/extensions/css-language-features/package.nls.json
|
||||
index 5e9129c..d1c1b4f 100644
|
||||
index d6e25a5..7888614 100644
|
||||
--- a/extensions/css-language-features/package.nls.json
|
||||
+++ b/extensions/css-language-features/package.nls.json
|
||||
@@ -4,4 +4,4 @@
|
||||
|
|
@ -73,37 +73,37 @@ index 8bb2a46..7cee594 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 5cc838d..7a32e63 100644
|
||||
index 6eba0f4..dff745a 100644
|
||||
--- a/extensions/git/package.nls.json
|
||||
+++ b/extensions/git/package.nls.json
|
||||
@@ -212,3 +212,3 @@
|
||||
@@ -214,3 +214,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"
|
||||
@@ -240,4 +240,4 @@
|
||||
@@ -242,4 +242,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.",
|
||||
@@ -292,3 +292,3 @@
|
||||
@@ -298,3 +298,3 @@
|
||||
"{Locked='](command:workbench.action.reloadWindow'}",
|
||||
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
|
||||
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -300,3 +300,3 @@
|
||||
@@ -306,3 +306,3 @@
|
||||
"{Locked='](command:workbench.action.reloadWindow'}",
|
||||
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
|
||||
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -308,3 +308,3 @@
|
||||
@@ -314,3 +314,3 @@
|
||||
"{Locked='](command:workbench.action.reloadWindow'}",
|
||||
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
|
||||
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -314,6 +314,6 @@
|
||||
@@ -320,6 +320,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 5cc838d..7a32e63 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"
|
||||
@@ -322,6 +322,6 @@
|
||||
@@ -328,6 +328,6 @@
|
||||
"view.workbench.scm.empty": {
|
||||
- "message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
|
||||
+ "message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
|
||||
|
|
@ -121,7 +121,7 @@ index 5cc838d..7a32e63 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"
|
||||
@@ -330,6 +330,6 @@
|
||||
@@ -336,6 +336,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 5cc838d..7a32e63 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"
|
||||
@@ -338,6 +338,6 @@
|
||||
@@ -344,6 +344,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 5cc838d..7a32e63 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"
|
||||
@@ -346,6 +346,6 @@
|
||||
@@ -352,6 +352,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 5cc838d..7a32e63 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"
|
||||
@@ -364,3 +364,3 @@
|
||||
@@ -370,3 +370,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"
|
||||
@@ -373,3 +373,3 @@
|
||||
@@ -379,3 +379,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"
|
||||
@@ -381,3 +381,3 @@
|
||||
@@ -387,3 +387,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"
|
||||
@@ -389,3 +389,3 @@
|
||||
@@ -395,3 +395,3 @@
|
||||
"{Locked='](command:git.manageUnsafeRepositories'}",
|
||||
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
|
||||
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -394,6 +394,6 @@
|
||||
@@ -400,6 +400,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 5cc838d..7a32e63 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"
|
||||
@@ -402,6 +402,6 @@
|
||||
@@ -408,6 +408,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 5cc838d..7a32e63 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"
|
||||
@@ -413,3 +413,3 @@
|
||||
@@ -419,3 +419,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"
|
||||
@@ -417,3 +417,3 @@
|
||||
@@ -423,3 +423,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)."
|
||||
|
|
@ -354,27 +354,27 @@ index 6259b15..385797a 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 0bd09aa..965c131 100644
|
||||
index 796b524..ee7235f 100644
|
||||
--- a/extensions/typescript-language-features/package.nls.json
|
||||
+++ b/extensions/typescript-language-features/package.nls.json
|
||||
@@ -84,4 +84,4 @@
|
||||
@@ -74,4 +74,4 @@
|
||||
"configuration.tsserver.experimental.enableProjectDiagnostics": "(Experimental) Enables project wide error reporting.",
|
||||
- "typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use VS Code's locale.",
|
||||
- "typescript.locale.auto": "Use VS Code's configured display language",
|
||||
+ "typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use VSCodium's locale.",
|
||||
+ "typescript.locale.auto": "Use VSCodium's configured display language",
|
||||
"configuration.implicitProjectConfig.module": "Sets the module system for the program. See more: https://www.typescriptlang.org/tsconfig#module.",
|
||||
@@ -168,3 +168,3 @@
|
||||
@@ -158,3 +158,3 @@
|
||||
"typescript.workspaceSymbols.excludeLibrarySymbols": "Exclude symbols that come from library files in Go to Symbol in Workspace results. Requires using TypeScript 5.3+ in the workspace.",
|
||||
- "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code.",
|
||||
+ "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VSCodium.",
|
||||
"typescript.updateImportsOnFileMove.enabled.prompt": "Prompt on each rename.",
|
||||
@@ -174,3 +174,3 @@
|
||||
@@ -164,3 +164,3 @@
|
||||
"typescript.suggest.enabled": "Enabled/disable autocomplete suggestions.",
|
||||
- "configuration.surveys.enabled": "Enabled/disable occasional surveys that help us improve VS Code's JavaScript and TypeScript support.",
|
||||
+ "configuration.surveys.enabled": "Enabled/disable occasional surveys that help us improve VSCodium's JavaScript and TypeScript support.",
|
||||
"configuration.suggest.completeJSDocs": "Enable/disable suggestion to complete JSDoc comments.",
|
||||
@@ -226,5 +226,5 @@
|
||||
@@ -216,5 +216,5 @@
|
||||
"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.",
|
||||
|
|
@ -382,7 +382,7 @@ index 0bd09aa..965c131 100644
|
|||
- "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.experimental.tsserver.web.typeAcquisition.enabled": "Enable/disable package acquisition on the web.",
|
||||
@@ -239,6 +239,6 @@
|
||||
@@ -229,6 +229,6 @@
|
||||
"walkthroughs.nodejsWelcome.debugJsFile.title": "Run and Debug your JavaScript",
|
||||
- "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VS Code's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)",
|
||||
+ "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VSCodium's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)",
|
||||
|
|
@ -438,7 +438,7 @@ index 0796bef..f8061fa 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 fc973ba..59f0076 100644
|
||||
index e9323fc..b1435c8 100644
|
||||
--- a/extensions/vscode-api-tests/package.json
|
||||
+++ b/extensions/vscode-api-tests/package.json
|
||||
@@ -2,3 +2,3 @@
|
||||
|
|
@ -516,7 +516,7 @@ index fa001b5..13abac2 100644
|
|||
+ throw Error(`Failed to download and unzip VSCodium ${quality} - ${commit}`);
|
||||
}
|
||||
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
|
||||
index 6f02aa6..6dbb371 100644
|
||||
index 7a03905..6995020 100644
|
||||
--- a/src/vs/code/electron-main/app.ts
|
||||
+++ b/src/vs/code/electron-main/app.ts
|
||||
@@ -568,3 +568,3 @@ export class CodeApplication extends Disposable {
|
||||
|
|
@ -525,22 +525,22 @@ index 6f02aa6..6dbb371 100644
|
|||
+ this.logService.debug('Starting VSCodium');
|
||||
this.logService.debug(`from: ${this.environmentMainService.appRoot}`);
|
||||
diff --git a/src/vs/code/electron-sandbox/issue/issueReporterService.ts b/src/vs/code/electron-sandbox/issue/issueReporterService.ts
|
||||
index 1924ff8..6e3ea1d 100644
|
||||
index 067f09f..6684119 100644
|
||||
--- a/src/vs/code/electron-sandbox/issue/issueReporterService.ts
|
||||
+++ b/src/vs/code/electron-sandbox/issue/issueReporterService.ts
|
||||
@@ -798,3 +798,3 @@ export class IssueReporter extends Disposable {
|
||||
@@ -817,3 +817,3 @@ export class IssueReporter extends Disposable {
|
||||
hide(descriptionTextArea);
|
||||
- reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VS Code"));
|
||||
+ reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VSCodium"));
|
||||
reset(descriptionSubtitle, localize('elsewhereDescription', "The '{0}' extension prefers to use an external issue reporter. To be taken to that issue reporting experience, click the button below.", selectedExtension.displayName));
|
||||
diff --git a/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts b/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts
|
||||
index 2dfd230..5ef5694 100644
|
||||
index 64f4b30..26dccf9 100644
|
||||
--- a/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts
|
||||
+++ b/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts
|
||||
@@ -19,3 +19,3 @@ export class ToggleTabFocusModeAction extends Action2 {
|
||||
id: ToggleTabFocusModeAction.ID,
|
||||
- title: { value: nls.localize({ key: 'toggle.tabMovesFocus', comment: ['Turn on/off use of tab key for moving focus around VS Code'] }, 'Toggle Tab Key Moves Focus'), original: 'Toggle Tab Key Moves Focus' },
|
||||
+ title: { value: nls.localize({ key: 'toggle.tabMovesFocus', comment: ['Turn on/off use of tab key for moving focus around VSCodium'] }, 'Toggle Tab Key Moves Focus'), original: 'Toggle Tab Key Moves Focus' },
|
||||
- title: nls.localize2({ key: 'toggle.tabMovesFocus', comment: ['Turn on/off use of tab key for moving focus around VS Code'] }, 'Toggle Tab Key Moves Focus'),
|
||||
+ title: nls.localize2({ key: 'toggle.tabMovesFocus', comment: ['Turn on/off use of tab key for moving focus around VSCodium'] }, 'Toggle Tab Key Moves Focus'),
|
||||
precondition: undefined,
|
||||
diff --git a/src/vs/platform/contextkey/common/contextkeys.ts b/src/vs/platform/contextkey/common/contextkeys.ts
|
||||
index 296245b..cf03674 100644
|
||||
|
|
@ -552,7 +552,7 @@ index 296245b..cf03674 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 c713791..fad2850 100644
|
||||
index 217d772..09022c8 100644
|
||||
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
|
||||
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
|
||||
@@ -151,3 +151,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
|
||||
|
|
@ -565,18 +565,18 @@ index c713791..fad2850 100644
|
|||
- throw new Error(nls.localize('removeError', "Error while removing the extension: {0}. Please Quit and Start VS Code before trying again.", toErrorMessage(e)));
|
||||
+ throw new Error(nls.localize('removeError', "Error while removing the extension: {0}. Please Quit and Start VSCodium before trying again.", toErrorMessage(e)));
|
||||
}
|
||||
@@ -981,3 +981,3 @@ class InstallVSIXTask extends InstallExtensionTask {
|
||||
@@ -987,3 +987,3 @@ class InstallVSIXTask extends InstallExtensionTask {
|
||||
} 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));
|
||||
}
|
||||
@@ -994,3 +994,3 @@ class InstallVSIXTask extends InstallExtensionTask {
|
||||
@@ -1000,3 +1000,3 @@ class InstallVSIXTask extends InstallExtensionTask {
|
||||
} 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));
|
||||
}
|
||||
diff --git a/src/vs/platform/externalTerminal/node/externalTerminalService.ts b/src/vs/platform/externalTerminal/node/externalTerminalService.ts
|
||||
index 71dbac8..d45899b 100644
|
||||
index a8df823..8318b2f 100644
|
||||
--- a/src/vs/platform/externalTerminal/node/externalTerminalService.ts
|
||||
+++ b/src/vs/platform/externalTerminal/node/externalTerminalService.ts
|
||||
@@ -17,3 +17,3 @@ import { ITerminalEnvironment } from 'vs/platform/terminal/common/terminal';
|
||||
|
|
@ -632,10 +632,10 @@ index 6695c4b..e46be6e 100644
|
|||
+ console.error('Unable to connect to VSCodium server: ' + message);
|
||||
console.error(err);
|
||||
diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
|
||||
index c51db51..4ddc16c 100644
|
||||
index fe77f83..0458226 100644
|
||||
--- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts
|
||||
+++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
|
||||
@@ -49,3 +49,3 @@ const viewsContainerSchema: IJSONSchema = {
|
||||
@@ -50,3 +50,3 @@ const viewsContainerSchema: IJSONSchema = {
|
||||
id: {
|
||||
- description: localize({ key: 'vscode.extension.contributes.views.containers.id', comment: ['Contribution refers to those that an extension contributes to VS Code through an extension/contribution point. '] }, "Unique id used to identify the container in which views can be contributed using 'views' contribution point"),
|
||||
+ 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"),
|
||||
|
|
@ -668,7 +668,7 @@ index 806a6b6..3ea5aa5 100644
|
|||
+ test('Opening a notebook results in VSCodium firing the event onDidChangeActiveNotebookEditor twice #118470', function () {
|
||||
let count = 0;
|
||||
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
|
||||
index c3ec65e..170b994 100644
|
||||
index b715436..ea90812 100644
|
||||
--- a/src/vs/workbench/browser/workbench.contribution.ts
|
||||
+++ b/src/vs/workbench/browser/workbench.contribution.ts
|
||||
@@ -610,3 +610,3 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
|
||||
|
|
@ -685,17 +685,8 @@ index 4233162..9bd6599 100644
|
|||
- description: nls.localize('debugServer', "For debug extension development only: if a port is specified VS Code tries to connect to a debug adapter running in server mode"),
|
||||
+ 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/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
|
||||
index 8b49ea2..308dc4a 100644
|
||||
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
|
||||
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
|
||||
@@ -579,3 +579,3 @@ export class ExtensionEditor extends EditorPane {
|
||||
if (manifest && manifest.contributes) {
|
||||
- template.navbar.push(ExtensionEditorTab.Contributions, localize('contributions', "Feature Contributions"), localize('contributionstooltip', "Lists contributions to VS Code by this extension"));
|
||||
+ template.navbar.push(ExtensionEditorTab.Contributions, localize('contributions', "Feature Contributions"), localize('contributionstooltip', "Lists contributions to VSCodium by this extension"));
|
||||
}
|
||||
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
|
||||
index 2254a20..5a8f04e 100644
|
||||
index c2747ac..4270375 100644
|
||||
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
|
||||
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
|
||||
@@ -300,3 +300,3 @@ CommandsRegistry.registerCommand({
|
||||
|
|
@ -724,94 +715,94 @@ index 2254a20..5a8f04e 100644
|
|||
+ const message = requireReload ? localize('InstallVSIXAction.successReload', "Completed installing {0} extension from VSIX. Please reload VSCodium to enable it.", extension.displayName || extension.name)
|
||||
: localize('InstallVSIXAction.success', "Completed installing {0} extension from VSIX.", extension.displayName || extension.name);
|
||||
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
|
||||
index eed284e..232eb7a 100644
|
||||
index 1fc58a9..8fff128 100644
|
||||
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
|
||||
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
|
||||
@@ -103,3 +103,3 @@ export class PromptExtensionInstallFailureAction extends Action {
|
||||
@@ -105,3 +105,3 @@ export class PromptExtensionInstallFailureAction extends Action {
|
||||
if (this.error.name === ExtensionManagementErrorCode.Unsupported) {
|
||||
- const productName = isWeb ? localize('VS Code for Web', "{0} for the Web", this.productService.nameLong) : this.productService.nameLong;
|
||||
+ const productName = isWeb ? localize('VSCodium for Web', "{0} for the Web", this.productService.nameLong) : this.productService.nameLong;
|
||||
const message = localize('cannot be installed', "The '{0}' extension is not available in {1}. Click 'More Information' to learn more.", this.extension.displayName || this.extension.identifier.id, productName);
|
||||
@@ -383,3 +383,3 @@ export class InstallAction extends ExtensionAction {
|
||||
@@ -385,3 +385,3 @@ export class InstallAction extends ExtensionAction {
|
||||
} else if (this.extension.deprecationInfo.settings) {
|
||||
- detail = localize('deprecated with alternate settings message', "This extension is deprecated as this functionality is now built-in to VS Code.");
|
||||
+ detail = localize('deprecated with alternate settings message', "This extension is deprecated as this functionality is now built-in to VSCodium.");
|
||||
|
||||
@@ -768,3 +768,3 @@ export class UninstallAction extends ExtensionAction {
|
||||
@@ -770,3 +770,3 @@ export class UninstallAction extends ExtensionAction {
|
||||
await this.extensionsWorkbenchService.uninstall(this.extension);
|
||||
- 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));
|
||||
- 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) {
|
||||
@@ -2316,3 +2316,3 @@ export class ExtensionStatusAction extends ExtensionAction {
|
||||
@@ -2320,3 +2320,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 {
|
||||
@@ -2340,3 +2340,3 @@ export class ExtensionStatusAction extends ExtensionAction {
|
||||
@@ -2344,3 +2344,3 @@ export class ExtensionStatusAction extends ExtensionAction {
|
||||
if (this.extensionManagementServerService.webExtensionManagementServer) {
|
||||
- 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 message = new MarkdownString(`${localize('not web tooltip', "The '{0}' extension is not available in {1}.", this.extension.displayName || this.extension.identifier.id, productName)} [${localize('learn why', "Learn Why")}](https://aka.ms/vscode-web-extensions-guide)`);
|
||||
@@ -2602,3 +2602,3 @@ export class ReinstallAction extends Action {
|
||||
@@ -2621,3 +2621,3 @@ export class ReinstallAction extends Action {
|
||||
const requireReload = !(extension.local && this.extensionService.canAddExtension(toExtensionDescription(extension.local)));
|
||||
- const message = requireReload ? localize('ReinstallAction.successReload', "Please reload Visual Studio Code to complete reinstalling the extension {0}.", extension.identifier.id)
|
||||
+ const message = requireReload ? localize('ReinstallAction.successReload', "Please reload VSCodium to complete reinstalling the extension {0}.", extension.identifier.id)
|
||||
: localize('ReinstallAction.success', "Reinstalling the extension {0} is completed.", extension.identifier.id);
|
||||
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
|
||||
index bb3f66c..5d01908 100644
|
||||
index fa11076..588cba5 100644
|
||||
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
|
||||
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
|
||||
@@ -360,3 +360,3 @@ export class Extension implements IExtension {
|
||||
@@ -359,3 +359,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
|
||||
@@ -393,3 +393,3 @@ ${this.description}
|
||||
@@ -392,3 +392,3 @@ ${this.description}
|
||||
if (this.type === ExtensionType.System) {
|
||||
- return Promise.resolve('Please check the [VS Code Release Notes](command:update.showCurrentReleaseNotes) for changes to the built-in extensions.');
|
||||
+ return Promise.resolve('Please check the [VSCodium Release Notes](command:update.showCurrentReleaseNotes) for changes to the built-in extensions.');
|
||||
}
|
||||
@@ -1113,3 +1113,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
@@ -1109,3 +1109,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
if (!canRemoveRunningExtension && isSameExtensionRunning && !runningExtension.isUnderDevelopment) {
|
||||
- return nls.localize('postUninstallTooltip', "Please reload Visual Studio Code to complete the uninstallation of this extension.");
|
||||
+ return nls.localize('postUninstallTooltip', "Please reload VSCodium to complete the uninstallation of this extension.");
|
||||
}
|
||||
@@ -1133,3 +1133,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
@@ -1129,3 +1129,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
if (!runningExtension.isUnderDevelopment && (extension.version !== runningExtension.version || extension.local.targetPlatform !== runningExtension.targetPlatform)) {
|
||||
- return nls.localize('postUpdateTooltip', "Please reload Visual Studio Code to enable the updated extension.");
|
||||
+ return nls.localize('postUpdateTooltip', "Please reload VSCodium to enable the updated extension.");
|
||||
}
|
||||
@@ -1141,3 +1141,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
if (runningExtensionServer === this.extensionManagementServerService.remoteExtensionManagementServer && this.extensionManifestPropertiesService.prefersExecuteOnUI(extension.local!.manifest) && extensionInOtherServer.server === this.extensionManagementServerService.localExtensionManagementServer) {
|
||||
@@ -1137,3 +1137,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
if (runningExtensionServer === this.extensionManagementServerService.remoteExtensionManagementServer && this.extensionManifestPropertiesService.prefersExecuteOnUI(extension.local.manifest) && extensionInOtherServer.server === this.extensionManagementServerService.localExtensionManagementServer) {
|
||||
- return nls.localize('enable locally', "Please reload Visual Studio Code to enable this extension locally.");
|
||||
+ return nls.localize('enable locally', "Please reload VSCodium to enable this extension locally.");
|
||||
}
|
||||
@@ -1146,3 +1146,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
if (runningExtensionServer === this.extensionManagementServerService.localExtensionManagementServer && this.extensionManifestPropertiesService.prefersExecuteOnWorkspace(extension.local!.manifest) && extensionInOtherServer.server === this.extensionManagementServerService.remoteExtensionManagementServer) {
|
||||
@@ -1142,3 +1142,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
if (runningExtensionServer === this.extensionManagementServerService.localExtensionManagementServer && this.extensionManifestPropertiesService.prefersExecuteOnWorkspace(extension.local.manifest) && extensionInOtherServer.server === this.extensionManagementServerService.remoteExtensionManagementServer) {
|
||||
- return nls.localize('enable remote', "Please reload Visual Studio Code to enable this extension in {0}.", this.extensionManagementServerService.remoteExtensionManagementServer?.label);
|
||||
+ return nls.localize('enable remote', "Please reload VSCodium to enable this extension in {0}.", this.extensionManagementServerService.remoteExtensionManagementServer?.label);
|
||||
}
|
||||
@@ -1156,3 +1156,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
if (this.extensionManifestPropertiesService.prefersExecuteOnUI(extension.local!.manifest)) {
|
||||
@@ -1152,3 +1152,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
if (this.extensionManifestPropertiesService.prefersExecuteOnUI(extension.local.manifest)) {
|
||||
- return nls.localize('postEnableTooltip', "Please reload Visual Studio Code to enable this extension.");
|
||||
+ return nls.localize('postEnableTooltip', "Please reload VSCodium to enable this extension.");
|
||||
}
|
||||
@@ -1162,3 +1162,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
if (this.extensionManifestPropertiesService.prefersExecuteOnWorkspace(extension.local!.manifest)) {
|
||||
@@ -1158,3 +1158,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
if (this.extensionManifestPropertiesService.prefersExecuteOnWorkspace(extension.local.manifest)) {
|
||||
- return nls.localize('postEnableTooltip', "Please reload Visual Studio Code to enable this extension.");
|
||||
+ return nls.localize('postEnableTooltip', "Please reload VSCodium to enable this extension.");
|
||||
}
|
||||
@@ -1169,3 +1169,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
@@ -1165,3 +1165,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
if (isSameExtensionRunning) {
|
||||
- return nls.localize('postDisableTooltip', "Please reload Visual Studio Code to disable this extension.");
|
||||
+ return nls.localize('postDisableTooltip', "Please reload VSCodium to disable this extension.");
|
||||
}
|
||||
@@ -1178,3 +1178,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
@@ -1174,3 +1174,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
if (isEnabled && !this.extensionService.canAddExtension(toExtensionDescription(extension.local))) {
|
||||
- return nls.localize('postEnableTooltip', "Please reload Visual Studio Code to enable this extension.");
|
||||
+ return nls.localize('postEnableTooltip', "Please reload VSCodium to enable this extension.");
|
||||
}
|
||||
@@ -1186,3 +1186,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
@@ -1182,3 +1182,3 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
|
||||
if (extensionInOtherServer && extensionInOtherServer.local && this.extensionEnablementService.isEnabled(extensionInOtherServer.local)) {
|
||||
- return nls.localize('postEnableTooltip', "Please reload Visual Studio Code to enable this extension.");
|
||||
+ return nls.localize('postEnableTooltip', "Please reload VSCodium to enable this extension.");
|
||||
|
|
@ -831,7 +822,7 @@ index 3e8cd71..6142f61 100644
|
|||
+ '\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 7b36ebb..d4c9602 100644
|
||||
index e58341f..0146ef9 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 {
|
||||
|
|
@ -854,10 +845,10 @@ index 94ea24e..e8afce1 100644
|
|||
+ enumDescriptions: [nls.localize('externalUriOpeners.defaultId', "Open using VSCodium's standard opener.")],
|
||||
},
|
||||
diff --git a/src/vs/workbench/contrib/localization/common/localization.contribution.ts b/src/vs/workbench/contrib/localization/common/localization.contribution.ts
|
||||
index 568c39f..7660d3f 100644
|
||||
index 4b8d4c2..cfdbb92 100644
|
||||
--- a/src/vs/workbench/contrib/localization/common/localization.contribution.ts
|
||||
+++ b/src/vs/workbench/contrib/localization/common/localization.contribution.ts
|
||||
@@ -54,5 +54,5 @@ export class BaseLocalizationWorkbenchContribution extends Disposable implements
|
||||
@@ -58,5 +58,5 @@ export class BaseLocalizationWorkbenchContribution extends Disposable implements
|
||||
type: 'string',
|
||||
- description: localize('vscode.extension.contributes.localizations.translations.id', "Id of VS Code or Extension for which this translation is contributed to. Id of VS Code is always `vscode` and of extension should be in format `publisherId.extensionName`."),
|
||||
+ description: localize('vscode.extension.contributes.localizations.translations.id', "Id of VSCodium or Extension for which this translation is contributed to. Id of VSCodium is always `vscode` and of extension should be in format `publisherId.extensionName`."),
|
||||
|
|
@ -866,7 +857,7 @@ index 568c39f..7660d3f 100644
|
|||
+ patternErrorMessage: localize('vscode.extension.contributes.localizations.translations.id.pattern', "Id should be `vscode` or in format `publisherId.extensionName` for translating VSCodium or an extension respectively.")
|
||||
},
|
||||
diff --git a/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts b/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts
|
||||
index fdbef87..0f6a6fa 100644
|
||||
index 50ed5aa..a28e184 100644
|
||||
--- a/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts
|
||||
+++ b/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts
|
||||
@@ -95,4 +95,4 @@ interface IUnknownLayout {
|
||||
|
|
@ -877,10 +868,10 @@ index fdbef87..0f6a6fa 100644
|
|||
+ `// ${nls.localize('doc', 'Open VSCodium and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.')}`,
|
||||
``,
|
||||
diff --git a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
|
||||
index a1123af..e040bb7 100644
|
||||
index 305f9ba..f4f2ee2 100644
|
||||
--- a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
|
||||
+++ b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
|
||||
@@ -563,3 +563,3 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
|
||||
@@ -559,3 +559,3 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
|
||||
},
|
||||
- "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 VS Code Accounts menu.",
|
||||
+ "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.",
|
||||
|
|
@ -895,10 +886,10 @@ index b24d91f..a098a62 100644
|
|||
+ const message = await this.tasExperimentService?.getTreatment<string>('CESSurveyMessage') ?? nls.localize('cesSurveyQuestion', 'Got a moment to help the VSCodium team? Please tell us about your experience with VSCodium so far.');
|
||||
const button = await this.tasExperimentService?.getTreatment<string>('CESSurveyButton') ?? nls.localize('giveFeedback', "Give Feedback");
|
||||
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
|
||||
index d96c5ab..2078244 100644
|
||||
index 4324666..e7a7de6 100644
|
||||
--- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
|
||||
+++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
|
||||
@@ -3161,3 +3161,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
|
||||
@@ -3164,3 +3164,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.'));
|
||||
|
|
@ -927,7 +918,7 @@ index 4d90798..38bd65b 100644
|
|||
+ description: nls.localize('JsonSchema.tasks.promptOnClose', 'Whether the user is prompted when VSCodium closes with a running task.'),
|
||||
default: false
|
||||
diff --git a/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts b/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts
|
||||
index 5eeee32..dd6376e 100644
|
||||
index 9efbc2a..18c7aec 100644
|
||||
--- a/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts
|
||||
+++ b/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts
|
||||
@@ -213,3 +213,3 @@ export class TaskService extends AbstractTaskService {
|
||||
|
|
@ -936,7 +927,7 @@ index 5eeee32..dd6376e 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 c5d7591..88197aa 100644
|
||||
index 31ed968..cb9501a 100644
|
||||
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
|
||||
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
|
||||
@@ -199,3 +199,3 @@ export class TerminalViewPane extends ViewPane {
|
||||
|
|
@ -945,50 +936,50 @@ index c5d7591..88197aa 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 bb9975e..c024e9d 100644
|
||||
index 0df9dc1..2b7e952 100644
|
||||
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
|
||||
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
|
||||
@@ -283,3 +283,3 @@ const terminalConfiguration: IConfigurationNode = {
|
||||
@@ -286,3 +286,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',
|
||||
@@ -297,3 +297,3 @@ const terminalConfiguration: IConfigurationNode = {
|
||||
@@ -300,3 +300,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."),
|
||||
@@ -371,3 +371,3 @@ const terminalConfiguration: IConfigurationNode = {
|
||||
@@ -379,3 +379,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'),
|
||||
@@ -383,3 +383,3 @@ const terminalConfiguration: IConfigurationNode = {
|
||||
@@ -391,3 +391,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',
|
||||
@@ -394,3 +394,3 @@ const terminalConfiguration: IConfigurationNode = {
|
||||
@@ -402,3 +402,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',
|
||||
@@ -403,3 +403,3 @@ const terminalConfiguration: IConfigurationNode = {
|
||||
@@ -411,3 +411,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',
|
||||
@@ -412,3 +412,3 @@ const terminalConfiguration: IConfigurationNode = {
|
||||
@@ -420,3 +420,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',
|
||||
@@ -555,3 +555,3 @@ const terminalConfiguration: IConfigurationNode = {
|
||||
@@ -563,3 +563,3 @@ const terminalConfiguration: IConfigurationNode = {
|
||||
[TerminalSettingId.AutoReplies]: {
|
||||
- markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VS Code if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'),
|
||||
+ markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VSCodium if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'),
|
||||
type: 'object',
|
||||
@@ -568,3 +568,3 @@ const terminalConfiguration: IConfigurationNode = {
|
||||
@@ -576,3 +576,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\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegrations.decorationsEnabled#`', '`#editor.accessibilitySupport#`'),
|
||||
+ markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VSCodium insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegrations.decorationsEnabled#`', '`#editor.accessibilitySupport#`'),
|
||||
|
|
@ -1008,7 +999,7 @@ index 2117ec5..6ad1388 100644
|
|||
+ localize({ key: 'newThemeNotification', comment: ['{0} is the name of the new default theme'] }, "VSCodium now ships with a new default theme '{0}'. Do you want to give it a try?", theme.label),
|
||||
choices,
|
||||
diff --git a/src/vs/workbench/contrib/update/browser/update.ts b/src/vs/workbench/contrib/update/browser/update.ts
|
||||
index b0ada2a..b922fc7 100644
|
||||
index 969c563..772e061 100644
|
||||
--- a/src/vs/workbench/contrib/update/browser/update.ts
|
||||
+++ b/src/vs/workbench/contrib/update/browser/update.ts
|
||||
@@ -555,4 +555,4 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
|
||||
|
|
@ -1024,7 +1015,7 @@ index b0ada2a..b922fc7 100644
|
|||
+ detail: nls.localize('selectSyncService.detail', "The Insiders version of VSCodium will synchronize your settings, keybindings, extensions, snippets and UI State using separate insiders settings sync service by default."),
|
||||
buttons: [
|
||||
diff --git a/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.ts b/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.ts
|
||||
index c13d93e..206e46a 100644
|
||||
index c5c2258..fb5045b 100644
|
||||
--- a/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.ts
|
||||
+++ b/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.ts
|
||||
@@ -55,3 +55,3 @@ function computeTrustedDomainContent(defaultTrustedDomains: string[], trustedDom
|
||||
|
|
@ -1038,10 +1029,10 @@ index c13d93e..206e46a 100644
|
|||
+ content += `// By default, VSCodium trusts "localhost".\n`;
|
||||
}
|
||||
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
||||
index 3d0ae3e..6b3dd83 100644
|
||||
index fc6c589..bc6c802 100644
|
||||
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
||||
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
||||
@@ -310,3 +310,3 @@ configurationRegistry.registerConfiguration({
|
||||
@@ -321,3 +321,3 @@ configurationRegistry.registerConfiguration({
|
||||
localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.none' }, "Start without an editor."),
|
||||
- localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePage' }, "Open the Welcome page, with content to aid in getting started with VS Code and extensions."),
|
||||
+ localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePage' }, "Open the Welcome page, with content to aid in getting started with VSCodium and extensions."),
|
||||
|
|
@ -1161,15 +1152,15 @@ index e3fe20c..b879dca 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 dbb1822..10a7f41 100644
|
||||
index 37fb5d3..669a6b5 100644
|
||||
--- a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
|
||||
+++ b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
|
||||
@@ -731,3 +731,3 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
|
||||
@@ -738,3 +738,3 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
|
||||
default: true,
|
||||
- description: localize('workspace.trust.description', "Controls whether or not Workspace Trust is enabled within VS Code."),
|
||||
+ description: localize('workspace.trust.description', "Controls whether or not Workspace Trust is enabled within VSCodium."),
|
||||
tags: [WORKSPACE_TRUST_SETTING_TAG],
|
||||
@@ -777,3 +777,3 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
|
||||
@@ -784,3 +784,3 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
|
||||
default: true,
|
||||
- markdownDescription: localize('workspace.trust.emptyWindow.description', "Controls whether or not the empty window is trusted by default within VS Code. When used with `#{0}#`, you can enable the full functionality of VS Code without prompting in an empty window.", WORKSPACE_TRUST_UNTRUSTED_FILES),
|
||||
+ 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),
|
||||
|
|
@ -1198,10 +1189,10 @@ index 5dcc2ff..8b02544 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 ecc45f8..30df37d 100644
|
||||
index d019d14..2000419 100644
|
||||
--- a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts
|
||||
+++ b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts
|
||||
@@ -90,3 +90,3 @@ type ExtensionUrlHandlerClassification = {
|
||||
@@ -88,3 +88,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.';
|
||||
|
|
@ -1265,7 +1256,7 @@ index ed8bae3..863e6dd 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 123f189..1c73250 100644
|
||||
index cdd507e..c390af5 100644
|
||||
--- a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
|
||||
+++ b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
|
||||
@@ -174,3 +174,3 @@ export class NativeExtensionService extends AbstractExtensionService implements
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
|
||||
index df18cf0..6f59211 100644
|
||||
index 595d0ce..99bfe30 100644
|
||||
--- a/build/gulpfile.reh.js
|
||||
+++ b/build/gulpfile.reh.js
|
||||
@@ -289,4 +289,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
|
||||
@@ -290,4 +290,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
|
||||
const name = product.nameShort;
|
||||
+ const release = packageJson.release;
|
||||
const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
|
||||
- .pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined }));
|
||||
+ .pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined }));
|
||||
|
||||
@@ -295,3 +296,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
|
||||
@@ -296,3 +297,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
|
||||
const productJsonStream = gulp.src(['product.json'], { base: '.' })
|
||||
- .pipe(json({ commit, date, version }));
|
||||
+ .pipe(json({ commit, date, version, release }));
|
||||
|
||||
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
|
||||
index bfd5c89..bc84f18 100644
|
||||
index e1507e0..9a12a12 100644
|
||||
--- a/build/gulpfile.vscode.js
|
||||
+++ b/build/gulpfile.vscode.js
|
||||
@@ -233,3 +233,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
|
||||
|
|
@ -71,7 +71,7 @@ index 5adfdfb..d6ddead 100644
|
|||
+ RawVersion: `${pkg.version.replace(/-\w+$/, '')}.${pkg.release}`,
|
||||
NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
|
||||
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
|
||||
index cbd573f..c7bbc90 100644
|
||||
index 3a57612..d26a55b 100644
|
||||
--- a/src/vs/base/common/product.ts
|
||||
+++ b/src/vs/base/common/product.ts
|
||||
@@ -58,2 +58,3 @@ export interface IProductConfiguration {
|
||||
|
|
@ -140,18 +140,18 @@ index 0000000..2a8ea57
|
|||
+ return LABELS[language] ?? DEFAULT_LABEL;
|
||||
+}
|
||||
diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
|
||||
index 3940ab6..609e5ed 100644
|
||||
index f2cc82a..700d81a 100644
|
||||
--- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
|
||||
+++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
|
||||
@@ -14,2 +14,3 @@ import { IProductService } from 'vs/platform/product/common/productService';
|
||||
import { process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
|
||||
+import { getReleaseString } from 'vs/workbench/common/release';
|
||||
|
||||
@@ -77,2 +78,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
|
||||
import { getActiveWindow } from 'vs/base/browser/dom';
|
||||
@@ -80,2 +81,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
|
||||
const osProps = await this.nativeHostService.getOSProperties();
|
||||
+ const releaseString = getReleaseString();
|
||||
|
||||
@@ -90,3 +92,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
|
||||
@@ -93,3 +95,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
|
||||
`${osProps.type} ${osProps.arch} ${osProps.release}${isLinuxSnap ? ' snap' : ''}`
|
||||
- );
|
||||
+ ).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
||||
index 8c2aa42..18b0975 100644
|
||||
index fc6c589..ed0df30 100644
|
||||
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
||||
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
||||
@@ -300,2 +300,8 @@ configurationRegistry.registerConfiguration({
|
||||
@@ -315,2 +315,8 @@ configurationRegistry.registerConfiguration({
|
||||
},
|
||||
+ 'workbench.welcomePage.extraAnnouncements': {
|
||||
+ scope: ConfigurationScope.MACHINE,
|
||||
|
|
@ -12,10 +12,10 @@ index 8c2aa42..18b0975 100644
|
|||
+ },
|
||||
'workbench.startupEditor': {
|
||||
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
|
||||
index 9dd5330..9e2b6a2 100644
|
||||
index 99d6a26..b42713d 100644
|
||||
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
|
||||
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
|
||||
@@ -117,4 +117,8 @@ type GettingStartedActionEvent = {
|
||||
@@ -114,4 +114,8 @@ type GettingStartedActionEvent = {
|
||||
type RecentEntry = (IRecentFolder | IRecentWorkspace) & { id: string };
|
||||
+type AnnouncementEntry = { id: string, title: string, url: string };
|
||||
|
||||
|
|
@ -24,26 +24,26 @@ index 9dd5330..9e2b6a2 100644
|
|||
+const BUILTIN_ANNOUNCEMENTS: AnnouncementEntry[] = [/* BUILTIN_ANNOUNCEMENTS */];
|
||||
+
|
||||
export class GettingStartedPage extends EditorPane {
|
||||
@@ -153,2 +157,4 @@ export class GettingStartedPage extends EditorPane {
|
||||
@@ -150,2 +154,4 @@ export class GettingStartedPage extends EditorPane {
|
||||
private gettingStartedList?: GettingStartedIndexList<IResolvedWalkthrough>;
|
||||
+ private announcementList?: GettingStartedIndexList<AnnouncementEntry>;
|
||||
+ private announcementData?: AnnouncementEntry[];
|
||||
private featuredExtensionsList?: GettingStartedIndexList<IFeaturedExtension>;
|
||||
@@ -774,2 +780,3 @@ export class GettingStartedPage extends EditorPane {
|
||||
|
||||
@@ -809,2 +815,3 @@ export class GettingStartedPage extends EditorPane {
|
||||
const gettingStartedList = this.buildGettingStartedWalkthroughsList();
|
||||
+ const announcementList = await this.buildAnnouncementList();
|
||||
|
||||
@@ -784,3 +791,3 @@ export class GettingStartedPage extends EditorPane {
|
||||
@@ -819,3 +826,3 @@ export class GettingStartedPage extends EditorPane {
|
||||
this.container.classList.remove('noWalkthroughs');
|
||||
- reset(rightColumn, featuredExtensionList.getDomElement(), gettingStartedList.getDomElement());
|
||||
+ reset(rightColumn, featuredExtensionList.getDomElement(), gettingStartedList.getDomElement(), announcementList.getDomElement());
|
||||
- reset(rightColumn, gettingStartedList.getDomElement());
|
||||
+ reset(rightColumn, gettingStartedList.getDomElement(), announcementList.getDomElement());
|
||||
}
|
||||
@@ -788,3 +795,3 @@ export class GettingStartedPage extends EditorPane {
|
||||
@@ -823,3 +830,3 @@ export class GettingStartedPage extends EditorPane {
|
||||
this.container.classList.add('noWalkthroughs');
|
||||
- reset(rightColumn, featuredExtensionList.getDomElement());
|
||||
+ reset(rightColumn, featuredExtensionList.getDomElement(), announcementList.getDomElement());
|
||||
}
|
||||
@@ -946,2 +953,55 @@ export class GettingStartedPage extends EditorPane {
|
||||
- reset(rightColumn);
|
||||
+ reset(rightColumn, announcementList.getDomElement());
|
||||
|
||||
@@ -976,2 +983,55 @@ export class GettingStartedPage extends EditorPane {
|
||||
|
||||
+ private async buildAnnouncementList(): Promise<GettingStartedIndexList<AnnouncementEntry>> {
|
||||
+ const renderAnnouncement = (announcement: AnnouncementEntry) => {
|
||||
|
|
|
|||
20
product.json
20
product.json
|
|
@ -180,8 +180,10 @@
|
|||
"speech"
|
||||
],
|
||||
"GitHub.vscode-pull-request-github": [
|
||||
"activeComment",
|
||||
"contribCommentThreadAdditionalMenu",
|
||||
"tokenInformation",
|
||||
"codeActionRanges",
|
||||
"commentReactor",
|
||||
"contribShareMenu",
|
||||
"fileComments",
|
||||
|
|
@ -212,15 +214,18 @@
|
|||
"terminalSelection",
|
||||
"terminalQuickFixProvider",
|
||||
"chatProvider",
|
||||
"chatAgents2",
|
||||
"chatAgents2Additions",
|
||||
"defaultChatAgent",
|
||||
"chatParticipant",
|
||||
"chatParticipantAdditions",
|
||||
"defaultChatParticipant",
|
||||
"chatVariableResolver",
|
||||
"mappedEditsProvider",
|
||||
"aiRelatedInformation",
|
||||
"codeActionAI",
|
||||
"findTextInFiles",
|
||||
"textSearchProvider",
|
||||
"contribSourceControlInputBoxMenu"
|
||||
"contribSourceControlInputBoxMenu",
|
||||
"newSymbolNamesProvider",
|
||||
"findFiles2"
|
||||
],
|
||||
"GitHub.remotehub": [
|
||||
"contribRemoteHelp",
|
||||
|
|
@ -237,6 +242,9 @@
|
|||
"textSearchProvider",
|
||||
"timeline"
|
||||
],
|
||||
"GitHub.copilot-nes": [
|
||||
"inlineEdit"
|
||||
],
|
||||
"ms-python.gather": [
|
||||
"notebookCellExecutionState"
|
||||
],
|
||||
|
|
@ -300,8 +308,8 @@
|
|||
"textSearchProvider"
|
||||
],
|
||||
"apidev.azure-api-center": [
|
||||
"chatAgents2",
|
||||
"chatRequestAccess"
|
||||
"chatParticipant",
|
||||
"languageModels"
|
||||
],
|
||||
"jeanp413.open-remote-ssh": [
|
||||
"resolvers",
|
||||
|
|
|
|||
Loading…
Reference in a new issue