From 7d98a96494766a1d821f196ebd906cfc1cbae6f6 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Mon, 14 Apr 2025 23:59:47 +0200 Subject: [PATCH] fix(1.100): update patches --- patches/brand.patch | 300 +++++++++++-------- patches/disable-signature-verification.patch | 12 +- upstream/insider.json | 2 +- 3 files changed, 178 insertions(+), 136 deletions(-) diff --git a/patches/brand.patch b/patches/brand.patch index 7637f44..dea6723 100644 --- a/patches/brand.patch +++ b/patches/brand.patch @@ -1,5 +1,5 @@ diff --git a/extensions/configuration-editing/src/configurationEditingMain.ts b/extensions/configuration-editing/src/configurationEditingMain.ts -index f791557..04f138d 100644 +index 2578270..99c8ca5 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 f791557..04f138d 100644 + { label: 'workspaceFolderBasename', detail: vscode.l10n.t("The name of the folder opened in !!APP_NAME!! 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 12b50f3..be792c2 100644 +index 12b50f3..7cb0d1b 100644 --- a/extensions/configuration-editing/src/settingsDocumentHelper.ts +++ b/extensions/configuration-editing/src/settingsDocumentHelper.ts @@ -123,3 +123,3 @@ export class SettingsDocument { @@ -19,7 +19,7 @@ index 12b50f3..be792c2 100644 + completions.push(this.newSimpleCompletionItem(getText('appName'), range, vscode.l10n.t("e.g. !!APP_NAME!!"))); 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 057ec21..45cd969 100644 +index 057ec21..53c32b4 100644 --- a/extensions/css-language-features/package.nls.json +++ b/extensions/css-language-features/package.nls.json @@ -4,4 +4,4 @@ @@ -45,7 +45,7 @@ index 057ec21..45cd969 100644 + "scss.completion.triggerPropertyValueCompletion.desc": "By default, !!APP_NAME!! triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.", "scss.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties.", diff --git a/extensions/emmet/package.nls.json b/extensions/emmet/package.nls.json -index 2a58c39..af508f3 100644 +index 2a58c39..8224615 100644 --- a/extensions/emmet/package.nls.json +++ b/extensions/emmet/package.nls.json @@ -1,3 +1,3 @@ @@ -54,7 +54,7 @@ index 2a58c39..af508f3 100644 + "description": "Emmet support for !!APP_NAME!!", "command.wrapWithAbbreviation": "Wrap with Abbreviation", diff --git a/extensions/extension-editing/src/constants.ts b/extensions/extension-editing/src/constants.ts -index 1be4d0e..73a8f3e 100644 +index 1be4d0e..647b147 100644 --- a/extensions/extension-editing/src/constants.ts +++ b/extensions/extension-editing/src/constants.ts @@ -8,2 +8,2 @@ import { l10n } from 'vscode'; @@ -62,7 +62,7 @@ index 1be4d0e..73a8f3e 100644 -export const redundantImplicitActivationEvent = l10n.t("This activation event can be removed as VS Code generates these automatically from your package.json contribution declarations."); +export const redundantImplicitActivationEvent = l10n.t("This activation event can be removed as !!APP_NAME!! generates these automatically from your package.json contribution declarations."); diff --git a/extensions/extension-editing/src/extensionLinter.ts b/extensions/extension-editing/src/extensionLinter.ts -index be7eea1..389e89e 100644 +index be7eea1..0737bab 100644 --- a/extensions/extension-editing/src/extensionLinter.ts +++ b/extensions/extension-editing/src/extensionLinter.ts @@ -34,4 +34,4 @@ const relativeUrlRequiresHttpsRepository = l10n.t("Relative image URLs require a @@ -73,7 +73,7 @@ index be7eea1..389e89e 100644 +const bumpEngineForImplicitActivationEvents = l10n.t("This activation event can be removed for extensions targeting engine version ^1.75 as !!APP_NAME!! 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 52ba381..8a42701 100644 +index dfc2ce9..7ef1788 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json @@ -227,3 +227,3 @@ @@ -197,7 +197,7 @@ index 52ba381..8a42701 100644 + "view.workbench.learnMore": "To learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm)." } diff --git a/extensions/github/package.nls.json b/extensions/github/package.nls.json -index 40271be..b52ff0f 100644 +index 40271be..00dae16 100644 --- a/extensions/github/package.nls.json +++ b/extensions/github/package.nls.json @@ -2,3 +2,3 @@ @@ -221,7 +221,7 @@ index 40271be..b52ff0f 100644 + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" diff --git a/extensions/grunt/package.nls.json b/extensions/grunt/package.nls.json -index 789a579..fcf39ff 100644 +index 789a579..12e230e 100644 --- a/extensions/grunt/package.nls.json +++ b/extensions/grunt/package.nls.json @@ -1,4 +1,4 @@ @@ -232,7 +232,7 @@ index 789a579..fcf39ff 100644 + "displayName": "Grunt support for !!APP_NAME!!", "config.grunt.autoDetect": "Controls enablement of Grunt task detection. Grunt task detection can cause files in any open workspace to be executed.", diff --git a/extensions/html-language-features/client/src/htmlClient.ts b/extensions/html-language-features/client/src/htmlClient.ts -index 7b69c79..6441167 100644 +index 6e66f8d..7c86a69 100644 --- a/extensions/html-language-features/client/src/htmlClient.ts +++ b/extensions/html-language-features/client/src/htmlClient.ts @@ -108,3 +108,3 @@ export async function startClient(context: ExtensionContext, newLanguageClient: @@ -241,7 +241,7 @@ index 7b69c79..6441167 100644 + const res = await window.showInformationMessage(l10n.t('!!APP_NAME!! now has built-in support for auto-renaming tags. Do you want to enable it?'), configure); if (res === configure) { diff --git a/extensions/html-language-features/package.nls.json b/extensions/html-language-features/package.nls.json -index f36ecf3..9545ba2 100644 +index f36ecf3..0d795cb 100644 --- a/extensions/html-language-features/package.nls.json +++ b/extensions/html-language-features/package.nls.json @@ -3,3 +3,3 @@ @@ -255,7 +255,7 @@ index f36ecf3..9545ba2 100644 + "html.trace.server.desc": "Traces the communication between !!APP_NAME!! and the HTML language server.", "html.validate.scripts": "Controls whether the built-in HTML language support validates embedded scripts.", diff --git a/extensions/html-language-features/schemas/package.schema.json b/extensions/html-language-features/schemas/package.schema.json -index 205143c..5a069c6 100644 +index 205143c..cc9f918 100644 --- a/extensions/html-language-features/schemas/package.schema.json +++ b/extensions/html-language-features/schemas/package.schema.json @@ -9,3 +9,3 @@ @@ -264,7 +264,7 @@ index 205143c..5a069c6 100644 + "markdownDescription": "A list of relative file paths pointing to JSON files following the [custom data format](https://github.com/microsoft/vscode-html-languageservice/blob/master/docs/customData.md).\n\n!!APP_NAME!! loads custom data on startup to enhance its HTML support for the custom HTML tags, attributes and attribute values you specify in the JSON files.\n\nThe file paths are relative to workspace and only workspace folder settings are considered.", "items": { diff --git a/extensions/jake/package.nls.json b/extensions/jake/package.nls.json -index e82030e..1a634bd 100644 +index e82030e..ac999f6 100644 --- a/extensions/jake/package.nls.json +++ b/extensions/jake/package.nls.json @@ -1,4 +1,4 @@ @@ -275,7 +275,7 @@ index e82030e..1a634bd 100644 + "displayName": "Jake support for !!APP_NAME!!", "jake.taskDefinition.type.description": "The Jake task to customize.", diff --git a/extensions/json-language-features/package.nls.json b/extensions/json-language-features/package.nls.json -index af6c9d8..7057b54 100644 +index af6c9d8..36e64cf 100644 --- a/extensions/json-language-features/package.nls.json +++ b/extensions/json-language-features/package.nls.json @@ -11,3 +11,3 @@ @@ -284,7 +284,7 @@ index af6c9d8..7057b54 100644 + "json.tracing.desc": "Traces the communication between !!APP_NAME!! and the JSON language server.", "json.colorDecorators.enable.desc": "Enables or disables color decorators", diff --git a/extensions/markdown-language-features/package.nls.json b/extensions/markdown-language-features/package.nls.json -index fe98103..05afb90 100644 +index fe98103..ca36e86 100644 --- a/extensions/markdown-language-features/package.nls.json +++ b/extensions/markdown-language-features/package.nls.json @@ -22,3 +22,3 @@ @@ -298,7 +298,7 @@ index fe98103..05afb90 100644 + "This setting is use the user drops or pastes image data into the editor. In this case, !!APP_NAME!! automatically creates a new image file in the workspace containing the dropped/pasted image.", "It's easier to explain this setting with an example. For example, let's say the setting value was:", diff --git a/extensions/media-preview/package.nls.json b/extensions/media-preview/package.nls.json -index c45e1e2..d8408d8 100644 +index 920ced7..755a166 100644 --- a/extensions/media-preview/package.nls.json +++ b/extensions/media-preview/package.nls.json @@ -2,3 +2,3 @@ @@ -307,7 +307,7 @@ index c45e1e2..d8408d8 100644 + "description": "Provides !!APP_NAME!!'s built-in previews for images, audio, and video", "customEditor.audioPreview.displayName": "Audio Preview", diff --git a/extensions/media-preview/src/audioPreview.ts b/extensions/media-preview/src/audioPreview.ts -index e21a418..dc0698b 100644 +index 5058f7e..ee1283a 100644 --- a/extensions/media-preview/src/audioPreview.ts +++ b/extensions/media-preview/src/audioPreview.ts @@ -82,3 +82,3 @@ class AudioPreview extends MediaPreview { @@ -316,16 +316,16 @@ index e21a418..dc0698b 100644 + ${vscode.l10n.t("Open file using !!APP_NAME!!'s standard text/binary editor?")} diff --git a/extensions/media-preview/src/imagePreview/index.ts b/extensions/media-preview/src/imagePreview/index.ts -index e0c605c..079b9e8 100644 +index b405cd6..8eafea3 100644 --- a/extensions/media-preview/src/imagePreview/index.ts +++ b/extensions/media-preview/src/imagePreview/index.ts -@@ -191,3 +191,3 @@ class ImagePreview extends MediaPreview { +@@ -209,3 +209,3 @@ class ImagePreview extends MediaPreview {

${vscode.l10n.t("An error occurred while loading the image.")}

- ${vscode.l10n.t("Open file using VS Code's standard text/binary editor?")} + ${vscode.l10n.t("Open file using !!APP_NAME!!'s standard text/binary editor?")} diff --git a/extensions/media-preview/src/videoPreview.ts b/extensions/media-preview/src/videoPreview.ts -index efc6be7..e2a186d 100644 +index 6701212..c9f9fb2 100644 --- a/extensions/media-preview/src/videoPreview.ts +++ b/extensions/media-preview/src/videoPreview.ts @@ -86,3 +86,3 @@ class VideoPreview extends MediaPreview { @@ -334,7 +334,7 @@ index efc6be7..e2a186d 100644 + ${vscode.l10n.t("Open file using !!APP_NAME!!'s standard text/binary editor?")} diff --git a/extensions/notebook-renderers/package.json b/extensions/notebook-renderers/package.json -index d6ece35..9e878df 100644 +index d6ece35..547202f 100644 --- a/extensions/notebook-renderers/package.json +++ b/extensions/notebook-renderers/package.json @@ -22,3 +22,3 @@ @@ -343,7 +343,7 @@ index d6ece35..9e878df 100644 + "displayName": "!!APP_NAME!! Builtin Notebook Output Renderer", "requiresMessaging": "never", diff --git a/extensions/npm/package.nls.json b/extensions/npm/package.nls.json -index 56a77ff..b1e3722 100644 +index 56a77ff..e9f32d1 100644 --- a/extensions/npm/package.nls.json +++ b/extensions/npm/package.nls.json @@ -2,3 +2,3 @@ @@ -352,7 +352,7 @@ index 56a77ff..b1e3722 100644 + "displayName": "NPM support for !!APP_NAME!!", "workspaceTrust": "This extension executes tasks, which require trust to run.", diff --git a/extensions/swift/syntaxes/swift.tmLanguage.json b/extensions/swift/syntaxes/swift.tmLanguage.json -index 7d6694c..0e1d484 100644 +index 7d6694c..83b2599 100644 --- a/extensions/swift/syntaxes/swift.tmLanguage.json +++ b/extensions/swift/syntaxes/swift.tmLanguage.json @@ -260,3 +260,3 @@ @@ -361,7 +361,7 @@ index 7d6694c..0e1d484 100644 + "comment": "The simpler (?<=\\bProcess\\.|\\bCommandLine\\.) breaks !!APP_NAME!! / 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 447359e..e40077c 100644 +index 447359e..c275bb0 100644 --- a/extensions/typescript-language-features/package.nls.json +++ b/extensions/typescript-language-features/package.nls.json @@ -75,4 +75,4 @@ @@ -411,7 +411,7 @@ index 447359e..e40077c 100644 + "walkthroughs.nodejsWelcome.learnMoreAboutJs.altText": "Learn more about JavaScript and Node.js in !!APP_NAME!!." } diff --git a/extensions/typescript-language-features/src/tsServer/versionManager.ts b/extensions/typescript-language-features/src/tsServer/versionManager.ts -index 43a2413..277a089 100644 +index 43a2413..ba7934f 100644 --- a/extensions/typescript-language-features/src/tsServer/versionManager.ts +++ b/extensions/typescript-language-features/src/tsServer/versionManager.ts @@ -100,3 +100,3 @@ export class TypeScriptVersionManager extends Disposable { @@ -420,7 +420,7 @@ index 43a2413..277a089 100644 + : '') + vscode.l10n.t("Use !!APP_NAME!!'s Version"), description: bundledVersion.displayName, diff --git a/extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts b/extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts -index 239519e..a308077 100644 +index 239519e..5e58d4d 100644 --- a/extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts +++ b/extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts @@ -70,3 +70,3 @@ export class DiskTypeScriptVersionProvider implements ITypeScriptVersionProvider @@ -429,7 +429,7 @@ index 239519e..a308077 100644 + vscode.window.showErrorMessage(vscode.l10n.t("!!APP_NAME!!\'s tsserver was deleted by another application such as a misbehaving virus detection tool. Please reinstall !!APP_NAME!!.")); throw new Error('Could not find bundled tsserver.js'); diff --git a/extensions/typescript-language-features/src/tsconfig.ts b/extensions/typescript-language-features/src/tsconfig.ts -index e85c715..9059335 100644 +index e85c715..4cc6ac3 100644 --- a/extensions/typescript-language-features/src/tsconfig.ts +++ b/extensions/typescript-language-features/src/tsconfig.ts @@ -155,3 +155,3 @@ export async function openProjectConfigForFile( @@ -438,7 +438,7 @@ index e85c715..9059335 100644 + vscode.l10n.t("Please open a folder in !!APP_NAME!! to use a TypeScript or JavaScript project")); return; diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts -index 4201d6d..ec88aa1 100644 +index 4201d6d..ded6803 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts @@ -653,3 +653,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType @@ -457,7 +457,7 @@ index 4201d6d..ec88aa1 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 !!APP_NAME!!.", pluginExtensionList)); } else { diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json -index 66a80b8..bd2d284 100644 +index 0d7f87a..6b72fec 100644 --- a/extensions/vscode-api-tests/package.json +++ b/extensions/vscode-api-tests/package.json @@ -2,3 +2,3 @@ @@ -466,7 +466,7 @@ index 66a80b8..bd2d284 100644 + "description": "API tests for !!APP_NAME!!", "version": "0.0.1", diff --git a/extensions/vscode-colorize-tests/package.json b/extensions/vscode-colorize-tests/package.json -index b416aee..9e6396d 100644 +index b416aee..3f60c26 100644 --- a/extensions/vscode-colorize-tests/package.json +++ b/extensions/vscode-colorize-tests/package.json @@ -2,3 +2,3 @@ @@ -475,7 +475,7 @@ index b416aee..9e6396d 100644 + "description": "Colorize tests for !!APP_NAME!!", "version": "0.0.1", diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/14119.less b/extensions/vscode-colorize-tests/test/colorize-fixtures/14119.less -index a0006d8..5ab2754 100644 +index a0006d8..132b67e 100644 --- a/extensions/vscode-colorize-tests/test/colorize-fixtures/14119.less +++ b/extensions/vscode-colorize-tests/test/colorize-fixtures/14119.less @@ -1,2 +1,2 @@ @@ -483,7 +483,7 @@ index a0006d8..5ab2754 100644 +#f(@hm: "broken highlighting in !!APP_NAME!!") { content: ""; diff --git a/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json b/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json -index 6680753..48f66bb 100644 +index 6680753..da1795a 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json @@ -114,3 +114,3 @@ @@ -492,7 +492,7 @@ index 6680753..48f66bb 100644 + "c": "broken highlighting in !!APP_NAME!!", "t": "source.css.less meta.selector.less meta.group.less meta.property-value.less string.quoted.double.less", diff --git a/extensions/vscode-test-resolver/package.json b/extensions/vscode-test-resolver/package.json -index 8ab2171..33fb9e0 100644 +index 8ab2171..0cd1cfb 100644 --- a/extensions/vscode-test-resolver/package.json +++ b/extensions/vscode-test-resolver/package.json @@ -2,3 +2,3 @@ @@ -501,7 +501,7 @@ index 8ab2171..33fb9e0 100644 + "description": "Test resolver for !!APP_NAME!!", "version": "0.0.1", diff --git a/extensions/vscode-test-resolver/src/download.ts b/extensions/vscode-test-resolver/src/download.ts -index a351aa7..32bfdb6 100644 +index a351aa7..c32e3ef 100644 --- a/extensions/vscode-test-resolver/src/download.ts +++ b/extensions/vscode-test-resolver/src/download.ts @@ -32,3 +32,3 @@ async function downloadVSCodeServerArchive(updateUrl: string, commit: string, qu @@ -535,7 +535,7 @@ index a351aa7..32bfdb6 100644 + throw Error(`Failed to download and unzip !!APP_NAME!! ${quality} - ${commit}`); } diff --git a/extensions/vscode-test-resolver/src/extension.ts b/extensions/vscode-test-resolver/src/extension.ts -index 2fab3ec..35d3325 100644 +index 2fab3ec..1195e3d 100644 --- a/extensions/vscode-test-resolver/src/extension.ts +++ b/extensions/vscode-test-resolver/src/extension.ts @@ -178,3 +178,3 @@ export function activate(context: vscode.ExtensionContext) { @@ -544,7 +544,7 @@ index 2fab3ec..35d3325 100644 + progress.report({ message: 'Installing !!APP_NAME!! Server' }); serverLocation = await downloadAndUnzipVSCodeServer(updateUrl, commit, quality, serverBin, m => outputChannel.appendLine(m)); diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts -index 3fb0f3a..f1e158e 100644 +index 3fb0f3a..0c22c94 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -522,3 +522,3 @@ export class CodeApplication extends Disposable { @@ -553,7 +553,7 @@ index 3fb0f3a..f1e158e 100644 + this.logService.debug('Starting !!APP_NAME!!'); this.logService.debug(`from: ${this.environmentMainService.appRoot}`); diff --git a/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts b/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts -index a200bf8..05826cf 100644 +index a200bf8..425936a 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 { @@ -562,7 +562,7 @@ index a200bf8..05826cf 100644 + title: nls.localize2({ key: 'toggle.tabMovesFocus', comment: ['Turn on/off use of tab key for moving focus around !!APP_NAME!!'] }, '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 c256dba..0ae2e47 100644 +index c256dba..10a79c8 100644 --- a/src/vs/platform/contextkey/common/contextkeys.ts +++ b/src/vs/platform/contextkey/common/contextkeys.ts @@ -19,3 +19,3 @@ export const IsMobileContext = new RawContextKey('isMobile', isMobile, @@ -571,7 +571,7 @@ index c256dba..0ae2e47 100644 +export const ProductQualityContext = new RawContextKey('productQualityType', '', localize('productQualityType', "Quality type of !!APP_NAME!!")); diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts -index 696ef6f..801aba0 100644 +index cfd01c9..4bf79d1 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -152,3 +152,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi @@ -579,18 +579,18 @@ index 696ef6f..801aba0 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 !!APP_NAME!! '{1}'.", extensionId, this.productService.version)); } -@@ -1028,3 +1028,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask `'${p}'`).join(', '), diff --git a/src/vs/platform/externalTerminal/node/externalTerminalService.ts b/src/vs/platform/externalTerminal/node/externalTerminalService.ts -index ca6c82b..346647c 100644 +index ca6c82b..56fab2c 100644 --- a/src/vs/platform/externalTerminal/node/externalTerminalService.ts +++ b/src/vs/platform/externalTerminal/node/externalTerminalService.ts @@ -17,3 +17,3 @@ import { ITerminalEnvironment } from '../../terminal/common/terminal.js'; @@ -611,7 +611,7 @@ index ca6c82b..346647c 100644 +const TERMINAL_TITLE = nls.localize('console.title', "!!APP_NAME!! Console"); diff --git a/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts b/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts -index 7d8d78b..390d3da 100644 +index 7d8d78b..d39dad4 100644 --- a/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts +++ b/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts @@ -338,3 +338,3 @@ const terminalPlatformConfiguration: IConfigurationNode = { @@ -620,7 +620,7 @@ index 7d8d78b..390d3da 100644 + description: localize('terminal.integrated.inheritEnv', "Whether new shells should inherit their environment from !!APP_NAME!!, which may source a login shell to ensure $PATH and other development variables are initialized. This has no effect on Windows."), type: 'boolean', diff --git a/src/vs/platform/update/common/update.config.contribution.ts b/src/vs/platform/update/common/update.config.contribution.ts -index d96926b..c4bbc4a 100644 +index d96926b..a787b34 100644 --- a/src/vs/platform/update/common/update.config.contribution.ts +++ b/src/vs/platform/update/common/update.config.contribution.ts @@ -47,3 +47,3 @@ configurationRegistry.registerConfiguration({ @@ -629,7 +629,7 @@ index d96926b..c4bbc4a 100644 + description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new !!APP_NAME!! versions in the background on Windows."), included: isWindows && !isWeb diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts -index a1ec3fe..c974cf7 100644 +index a1ec3fe..6476043 100644 --- a/src/vs/platform/update/electron-main/abstractUpdateService.ts +++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts @@ -23,3 +23,3 @@ export type UpdateErrorClassification = { @@ -638,7 +638,7 @@ index a1ec3fe..c974cf7 100644 + comment: 'This is used to know how often !!APP_NAME!! updates have failed.'; }; diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts -index 57398fb..9129f54 100644 +index 57398fb..f3b29fa 100644 --- a/src/vs/platform/update/electron-main/updateService.darwin.ts +++ b/src/vs/platform/update/electron-main/updateService.darwin.ts @@ -115,4 +115,4 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau @@ -649,7 +649,7 @@ index 57398fb..9129f54 100644 + comment: 'This is used to know how often !!APP_NAME!! has successfully downloaded the update.'; }; diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts -index 0535ddd..79f12dc 100644 +index 0535ddd..2478997 100644 --- a/src/vs/server/node/server.cli.ts +++ b/src/vs/server/node/server.cli.ts @@ -469,3 +469,3 @@ function asExtensionIdOrVSIX(inputs: string[] | undefined) { @@ -658,7 +658,7 @@ index 0535ddd..79f12dc 100644 + console.error('Unable to connect to !!APP_NAME!! server: ' + message); console.error(err); diff --git a/src/vs/workbench/api/browser/mainThreadAuthentication.ts b/src/vs/workbench/api/browser/mainThreadAuthentication.ts -index 6441394..1984fd1 100644 +index 6441394..69955cd 100644 --- a/src/vs/workbench/api/browser/mainThreadAuthentication.ts +++ b/src/vs/workbench/api/browser/mainThreadAuthentication.ts @@ -334,3 +334,3 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu @@ -667,7 +667,7 @@ index 6441394..1984fd1 100644 + comment: 'Used to see which extensions are using the !!APP_NAME!! client id override'; extensionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The extension id.' }; diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts -index fdf354d..502f06e 100644 +index fdf354d..b196297 100644 --- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts +++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts @@ -43,3 +43,3 @@ const viewsContainerSchema: IJSONSchema = { @@ -676,7 +676,7 @@ index fdf354d..502f06e 100644 + description: localize({ key: 'vscode.extension.contributes.views.containers.id', comment: ['Contribution refers to those that an extension contributes to !!APP_NAME!! 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 1d08ef2..aeef203 100644 +index 0dc4986..efbe644 100644 --- a/src/vs/workbench/api/common/extHostApiCommands.ts +++ b/src/vs/workbench/api/common/extHostApiCommands.ts @@ -443,3 +443,3 @@ const newCommands: ApiCommand[] = [ @@ -685,10 +685,10 @@ index 1d08ef2..aeef203 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 !!APP_NAME!!\'s default text editor'), new ApiCommandArgument('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 0c170ec..7683cb4 100644 +index 0bda2e8..5179ac6 100644 --- a/src/vs/workbench/api/common/extHostCommands.ts +++ b/src/vs/workbench/api/common/extHostCommands.ts -@@ -460,4 +460,4 @@ export class ApiCommandArgument { +@@ -462,4 +462,4 @@ export class ApiCommandArgument { static readonly TypeHierarchyItem = new ApiCommandArgument('item', 'A type hierarchy item', v => v instanceof extHostTypes.TypeHierarchyItem, extHostTypeConverter.TypeHierarchyItem.from); - static readonly TestItem = new ApiCommandArgument('testItem', 'A VS Code TestItem', v => v instanceof TestItemImpl, extHostTypeConverter.TestItem.from); - static readonly TestProfile = new ApiCommandArgument('testProfile', 'A VS Code test profile', v => v instanceof extHostTypes.TestRunProfileBase, extHostTypeConverter.TestRunProfile.from); @@ -696,7 +696,7 @@ index 0c170ec..7683cb4 100644 + static readonly TestProfile = new ApiCommandArgument('testProfile', 'A !!APP_NAME!! test profile', v => v instanceof extHostTypes.TestRunProfileBase, extHostTypeConverter.TestRunProfile.from); diff --git a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts -index 0d71384..45f7923 100644 +index 0d71384..ae8d169 100644 --- a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts +++ b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts @@ -364,3 +364,3 @@ suite('NotebookCell#Document', function () { @@ -705,7 +705,7 @@ index 0d71384..45f7923 100644 + test('Opening a notebook results in !!APP_NAME!! firing the event onDidChangeActiveNotebookEditor twice #118470', function () { let count = 0; diff --git a/src/vs/workbench/browser/web.factory.ts b/src/vs/workbench/browser/web.factory.ts -index 422fbba..9dc9699 100644 +index 422fbba..23246e5 100644 --- a/src/vs/workbench/browser/web.factory.ts +++ b/src/vs/workbench/browser/web.factory.ts @@ -35,3 +35,3 @@ export function create(domElement: HTMLElement, options: IWorkbenchConstructionO @@ -714,16 +714,16 @@ index 422fbba..9dc9699 100644 + throw new Error('Unable to create the !!APP_NAME!! workbench more than once.'); } else { diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts -index 5e785e8..a8aa1b7 100644 +index 028d91f..2183f94 100644 --- a/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts -@@ -678,3 +678,3 @@ const registry = Registry.as(ConfigurationExtensions.Con +@@ -689,3 +689,3 @@ const registry = Registry.as(ConfigurationExtensions.Con localize('profileName', "`${profileName}`: name of the profile in which the workspace is opened (e.g. Data Science (Profile)). Ignored if default profile is used."), - localize('appName', "`${appName}`: e.g. VS Code."), + localize('appName', "`${appName}`: e.g. !!APP_NAME!!."), localize('remoteName', "`${remoteName}`: e.g. SSH"), diff --git a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts -index 0a13063..c62db65 100644 +index 0a13063..5a342c0 100644 --- a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts +++ b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts @@ -177,3 +177,3 @@ export class AdapterManager extends Disposable implements IAdapterManager { @@ -732,30 +732,30 @@ index 0a13063..c62db65 100644 + description: nls.localize('debugServer', "For debug extension development only: if a port is specified !!APP_NAME!! tries to connect to a debug adapter running in server mode"), default: 4711 diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts -index 34a5326..663d6de 100644 +index 4c44d3b..f9cc0b3 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts -@@ -400,3 +400,3 @@ CommandsRegistry.registerCommand({ +@@ -336,3 +336,3 @@ CommandsRegistry.registerCommand({ description: '(optional) Options for installing the extension. Object with the following properties: ' + - '`installOnlyNewlyAddedFromExtensionPackVSIX`: When enabled, VS Code installs only newly added extensions from the extension pack VSIX. This option is considered only when installing VSIX. ', + '`installOnlyNewlyAddedFromExtensionPackVSIX`: When enabled, !!APP_NAME!! installs only newly added extensions from the extension pack VSIX. This option is considered only when installing VSIX. ', isOptional: true, -@@ -407,3 +407,3 @@ CommandsRegistry.registerCommand({ +@@ -343,3 +343,3 @@ CommandsRegistry.registerCommand({ 'type': 'boolean', - 'description': localize('workbench.extensions.installExtension.option.installOnlyNewlyAddedFromExtensionPackVSIX', "When enabled, VS Code installs only newly added extensions from the extension pack VSIX. This option is considered only while installing a VSIX."), + 'description': localize('workbench.extensions.installExtension.option.installOnlyNewlyAddedFromExtensionPackVSIX', "When enabled, !!APP_NAME!! installs only newly added extensions from the extension pack VSIX. This option is considered only while installing a VSIX."), default: false -@@ -412,3 +412,3 @@ CommandsRegistry.registerCommand({ +@@ -348,3 +348,3 @@ CommandsRegistry.registerCommand({ 'type': 'boolean', - 'description': localize('workbench.extensions.installExtension.option.installPreReleaseVersion', "When enabled, VS Code installs the pre-release version of the extension if available."), + 'description': localize('workbench.extensions.installExtension.option.installPreReleaseVersion', "When enabled, !!APP_NAME!! installs the pre-release version of the extension if available."), default: false -@@ -417,3 +417,3 @@ CommandsRegistry.registerCommand({ +@@ -353,3 +353,3 @@ CommandsRegistry.registerCommand({ 'type': 'boolean', - 'description': localize('workbench.extensions.installExtension.option.donotSync', "When enabled, VS Code do not sync this extension when Settings Sync is on."), + 'description': localize('workbench.extensions.installExtension.option.donotSync', "When enabled, !!APP_NAME!! do not sync this extension when Settings Sync is on."), default: false -@@ -938,4 +938,4 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi +@@ -874,4 +874,4 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi Severity.Info, - vsixs.length > 1 ? localize('InstallVSIXs.successReload', "Completed installing extensions. Please reload Visual Studio Code to enable them.") - : localize('InstallVSIXAction.successReload', "Completed installing extension. Please reload Visual Studio Code to enable it."), @@ -763,45 +763,45 @@ index 34a5326..663d6de 100644 + : localize('InstallVSIXAction.successReload', "Completed installing extension. Please reload VSCodium to enable it."), [{ diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts -index 572bb26..53f5740 100644 +index 0f0b2bd..5d119d1 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts -@@ -106,3 +106,3 @@ export class PromptExtensionInstallFailureAction extends Action { +@@ -108,3 +108,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('!!APP_NAME!! 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); -@@ -524,3 +524,3 @@ export class InstallAction extends ExtensionAction { +@@ -553,3 +553,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 !!APP_NAME!!."); -@@ -912,3 +912,3 @@ export class UninstallAction extends ExtensionAction { +@@ -941,3 +941,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 !!APP_NAME!! to complete the uninstallation of the extension {0}.", this.extension.displayName)); } catch (error) { -@@ -2565,3 +2565,3 @@ export class ExtensionStatusAction extends ExtensionAction { +@@ -2596,3 +2596,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 !!APP_NAME!!. 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 bcf99d6..d473bf9 100644 +index 5002379..56f351e 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -463,3 +463,3 @@ export class Extension implements IExtension { +@@ -467,3 +467,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 !!APP_NAME!!. It can be disabled but not uninstalled. ## Features -@@ -501,3 +501,3 @@ ${this.description} +@@ -505,3 +505,3 @@ ${this.description} if (this.type === ExtensionType.System) { - return Promise.resolve(`Please check the [VS Code Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`); + return Promise.resolve(`Please check the [!!APP_NAME!! Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`); } diff --git a/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.ts b/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.ts -index 818e662..2450efc 100644 +index 818e662..2d2ead7 100644 --- a/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.ts +++ b/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.ts @@ -29,3 +29,3 @@ export const ExtensionsConfigurationSchema: IJSONSchema = { @@ -815,7 +815,7 @@ index 818e662..2450efc 100644 + '\t// List of extensions recommended by !!APP_NAME!! that should not be recommended for users of this workspace.', '\t"unwantedRecommendations": [', diff --git a/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts b/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts -index f54ddfe..81ec478 100644 +index f54ddfe..946de6b 100644 --- a/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts +++ b/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts @@ -57,3 +57,3 @@ export const externalUriOpenersConfigurationNode: IConfigurationNode = { @@ -824,7 +824,7 @@ index f54ddfe..81ec478 100644 + enumDescriptions: [nls.localize('externalUriOpeners.defaultId', "Open using !!APP_NAME!!'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 b89d74b..4f47a63 100644 +index b89d74b..2a06ffb 100644 --- a/src/vs/workbench/contrib/localization/common/localization.contribution.ts +++ b/src/vs/workbench/contrib/localization/common/localization.contribution.ts @@ -58,5 +58,5 @@ export class BaseLocalizationWorkbenchContribution extends Disposable implements @@ -836,7 +836,7 @@ index b89d74b..4f47a63 100644 + patternErrorMessage: localize('vscode.extension.contributes.localizations.translations.id.pattern', "Id should be `vscode` or in format `publisherId.extensionName` for translating !!APP_NAME!! or an extension respectively.") }, diff --git a/src/vs/workbench/contrib/localization/common/localizationsActions.ts b/src/vs/workbench/contrib/localization/common/localizationsActions.ts -index 8619144..a6ab349 100644 +index 8619144..5815a70 100644 --- a/src/vs/workbench/contrib/localization/common/localizationsActions.ts +++ b/src/vs/workbench/contrib/localization/common/localizationsActions.ts @@ -26,3 +26,3 @@ export class ConfigureDisplayLanguageAction extends Action2 { @@ -845,7 +845,7 @@ index 8619144..a6ab349 100644 + description: localize2('configureLocaleDescription', "Changes the locale of !!APP_NAME!! based on installed language packs. Common languages include French, Chinese, Spanish, Japanese, German, Korean, and more.") } diff --git a/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts b/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts -index b533feb..7a11449 100644 +index b533feb..112d695 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 { @@ -856,16 +856,16 @@ index b533feb..7a11449 100644 + `// ${nls.localize('doc', 'Open !!APP_NAME!! 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 b716bcd..07b107b 100644 +index 5de0485..177e215 100644 --- a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts +++ b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts -@@ -560,3 +560,3 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo +@@ -561,3 +561,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 !!APP_NAME!! 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 2538528..acd9714 100644 +index 2538528..154de83 100644 --- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts +++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts @@ -3200,3 +3200,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer @@ -874,7 +874,7 @@ index 2538528..acd9714 100644 + this._notificationService.error(nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting !!APP_NAME!! might result in orphaned processes.')); } else { diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.ts b/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.ts -index 9db6b8a..b68a042 100644 +index 9db6b8a..cecac9f 100644 --- a/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.ts +++ b/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.ts @@ -193,3 +193,3 @@ const schema: IJSONSchema = { @@ -888,7 +888,7 @@ index 9db6b8a..b68a042 100644 + description: nls.localize('JsonSchema.promptOnClose', 'Whether the user is prompted when !!APP_NAME!! closes with a running background task.'), default: false diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts -index 42df6db..4eea384 100644 +index 42df6db..99e0383 100644 --- a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts +++ b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts @@ -411,3 +411,3 @@ const taskConfiguration: IJSONSchema = { @@ -897,7 +897,7 @@ index 42df6db..4eea384 100644 + description: nls.localize('JsonSchema.tasks.promptOnClose', 'Whether the user is prompted when !!APP_NAME!! 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 6a5728c..2c561bd 100644 +index 6a5728c..df166de 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 { @@ -906,7 +906,7 @@ index 6a5728c..2c561bd 100644 + message: nls.localize('TaskSystem.noProcess', 'The launched task doesn\'t exist anymore. If the task spawned background processes exiting !!APP_NAME!! 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 42ff0ac..7276ab8 100644 +index 42ff0ac..8f2f57c 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts @@ -213,3 +213,3 @@ export class TerminalViewPane extends ViewPane { @@ -915,7 +915,7 @@ index 42ff0ac..7276ab8 100644 + this._notificationService.prompt(Severity.Warning, nls.localize('terminal.monospaceOnly', "The terminal only supports monospace fonts. Be sure to restart !!APP_NAME!! 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 28aa98c..b0da694 100644 +index 28aa98c..a3331fc 100644 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts @@ -314,3 +314,3 @@ const terminalConfiguration: IConfigurationNode = { @@ -964,7 +964,7 @@ index 28aa98c..b0da694 100644 + 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 !!APP_NAME!! 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/autoReplies/common/terminalAutoRepliesConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts -index 4979520..49d0cbd 100644 +index 4979520..30ae11b 100644 --- a/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts +++ b/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts @@ -19,3 +19,3 @@ export const terminalAutoRepliesConfiguration: IStringDictionary