@codingame/monaco-vscode-update-service-override 28.4.0 → 29.0.0

package/vscode/src/vs/workbench/contrib/update/browser/releaseNotesEditor.d.ts

@@ -49,4 +49,25 @@ export declare class ReleaseNotesManager extends Disposable {
     private onDidChangeActiveWebviewEditor;
     private updateCheckboxWebview;
 }
-export declare function renderReleaseNotesMarkdown(text: string, extensionService: IExtensionService, languageService: ILanguageService, simpleSettingRenderer: SimpleSettingRenderer): Promise<TrustedHTML>;
+/**
+ * Processes conditional blocks in the release notes markdown.
+ *
+ * Conditional blocks use a single HTML comment with the format:
+ * ```
+ * <!-- %IF CONDITION %
+ * Content only visible when CONDITION is active.
+ * %ENDIF % -->
+ * ```
+ *
+ * Supported conditions:
+ * - `IN_PRODUCT` - Content shown in VS Code (both Stable and Insiders)
+ * - `WEB` - Content shown on the website only
+ * - `STABLE` - Content shown in VS Code Stable only
+ * - `INSIDERS` - Content shown in VS Code Insiders only
+ *
+ * On the website, the entire block is a single HTML comment, so the
+ * content is hidden by default. The website renderer would activate
+ * `WEB` blocks by stripping the comment markers.
+ */
+export declare function processConditionalBlocks(text: string, activeConditions: ReadonlySet<string>): string;
+export declare function renderReleaseNotesMarkdown(text: string, extensionService: IExtensionService, languageService: ILanguageService, simpleSettingRenderer: SimpleSettingRenderer, quality?: string): Promise<TrustedHTML>;

package/vscode/src/vs/workbench/contrib/update/browser/releaseNotesEditor.js

@@ -1,8 +1,7 @@
 
-import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import * as releasenoteseditor from './media/releasenoteseditor.css';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { escapeMarkdownSyntaxTokens } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { KeybindingParser } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keybindingParser';
@@ -39,7 +38,6 @@ import { StateType } from '@codingame/monaco-vscode-api/vscode/vs/platform/updat
 import { IUpdateService } from '@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 
-registerCss(releasenoteseditor);
 let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
     constructor(
         _environmentService,
@@ -114,7 +112,7 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
             base
         };
         const html = await this.renderBody(this._lastMeta);
-        const title = ( localize(14453, "Release Notes: {0}", version));
+        const title = ( localize(14719, "Release Notes: {0}", version));
         const activeEditorPane = this._editorService.activeEditorPane;
         if (this._currentReleaseNotes) {
             this._currentReleaseNotes.setWebviewTitle(title);
@@ -137,7 +135,7 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
                     allowScripts: true
                 },
                 extension: undefined
-            }, "releaseNotes", title, undefined, {
+            }, "releaseNotes", title, Codicon.vscode, {
                 group: ACTIVE_GROUP,
                 preserveFocus: false
             });
@@ -174,7 +172,7 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
         const versionLabel = match[1].replace(/\./g, "_");
         const baseUrl = "https://code.visualstudio.com/raw";
         const url = `${baseUrl}/v${versionLabel}.md`;
-        const unassigned = ( localize(14454, "unassigned"));
+        const unassigned = ( localize(14720, "unassigned"));
         const escapeMdHtml = text => {
             return escape(text).replace(/\\/g, "\\\\");
         };
@@ -221,7 +219,8 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
                     text = file ? file.substring(file.indexOf("#")) : undefined;
                 } else {
                     text = await asTextOrError(await this._requestService.request({
-                        url
+                        url,
+                        callSite: "releaseNotesEditor.fetchReleaseNotes"
                     }, CancellationToken.None));
                 }
             } catch {
@@ -271,7 +270,8 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
             fileContent.text,
             this._extensionService,
             this._languageService,
-            this._simpleSettingRenderer
+            this._simpleSettingRenderer,
+            this._productService.quality
         );
         const colorMap = TokenizationRegistry.getColorMap();
         const css = colorMap ? generateTokensCSSForColorMap(colorMap) : "";
@@ -630,7 +630,7 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
 
                     const label = document.createElement('label');
                     label.htmlFor = 'showReleaseNotes';
-                    label.textContent = '${( localize(14455, "Show release notes after an update"))}';
+                    label.textContent = '${( localize(14721, "Show release notes after an update"))}';
                     container.appendChild(label);
 
                     const beforeElement = document.querySelector("body > h1")?.nextElementSibling;
@@ -726,17 +726,17 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
         switch (state.type) {
         case StateType.AvailableForDownload:
             return {
-                label: ( localize(14456, "Download Update")),
+                label: ( localize(14722, "Download Update")),
                 commandId: "update.downloadNow"
             };
         case StateType.Downloaded:
             return {
-                label: ( localize(14457, "Install Update")),
+                label: ( localize(14723, "Install Update")),
                 commandId: "update.install"
             };
         case StateType.Ready:
             return {
-                label: ( localize(14458, "Restart to Update")),
+                label: ( localize(14724, "Restart to Update")),
                 commandId: "update.restart"
             };
         default:
@@ -773,8 +773,26 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
     }
 };
 ReleaseNotesManager = ( __decorate([( __param(0, IEnvironmentService)), ( __param(1, IKeybindingService)), ( __param(2, ILanguageService)), ( __param(3, IOpenerService)), ( __param(4, IRequestService)), ( __param(5, IConfigurationService)), ( __param(6, IEditorService)), ( __param(7, IEditorGroupsService)), ( __param(8, ICodeEditorService)), ( __param(9, IWebviewWorkbenchService)), ( __param(10, IExtensionService)), ( __param(11, IProductService)), ( __param(12, IInstantiationService)), ( __param(13, IUpdateService)), ( __param(14, ICommandService))], ReleaseNotesManager));
-async function renderReleaseNotesMarkdown(text, extensionService, languageService, simpleSettingRenderer) {
+function processConditionalBlocks(text, activeConditions) {
+    return text.replace(
+        /<!--\s*%IF\s+(\w+)\s*%([\s\S]*?)%ENDIF\s*%\s*-->/gi,
+        (_match, condition, content) => {
+            if (( activeConditions.has(condition.toUpperCase()))) {
+                return content;
+            }
+            return "";
+        }
+    );
+}
+async function renderReleaseNotesMarkdown(text, extensionService, languageService, simpleSettingRenderer, quality) {
     text = ( text.toString()).replace(/<!--\s*TOC\s*/gi, "").replace(/\s*Navigation End\s*-->/gi, "");
+    const activeConditions = ( new Set(["IN_PRODUCT"]));
+    if (quality === "stable") {
+        activeConditions.add("STABLE");
+    } else if (quality === "insider") {
+        activeConditions.add("INSIDERS");
+    }
+    text = processConditionalBlocks(text, activeConditions);
     return renderMarkdownDocument(text, extensionService, languageService, {
         sanitizerConfig: {
             allowRelativeMediaPaths: true,
@@ -797,4 +815,4 @@ async function renderReleaseNotesMarkdown(text, extensionService, languageServic
     });
 }
 
-export { ReleaseNotesManager, renderReleaseNotesMarkdown };
+export { ReleaseNotesManager, processConditionalBlocks, renderReleaseNotesMarkdown };

package/vscode/src/vs/workbench/contrib/update/browser/update.contribution.js

@@ -6,7 +6,8 @@ import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/com
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
 import { Action2, MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ProductContribution, UpdateContribution, SwitchProductQualityContribution, DefaultAccountUpdateContribution, showReleaseNotesInEditor, CONTEXT_UPDATE_STATE } from './update.js';
-import { UpdateStatusBarEntryContribution } from './updateStatusBarEntry.js';
+import { UpdateStatusBarContribution } from './updateStatusBarEntry.js';
+import { UpdateTitleBarContribution } from './updateTitleBarEntry.js';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
 import { StateType } from '@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update';
@@ -26,7 +27,8 @@ workbench.registerWorkbenchContribution(ProductContribution, LifecyclePhase.Rest
 workbench.registerWorkbenchContribution(UpdateContribution, LifecyclePhase.Restored);
 workbench.registerWorkbenchContribution(SwitchProductQualityContribution, LifecyclePhase.Restored);
 workbench.registerWorkbenchContribution(DefaultAccountUpdateContribution, LifecyclePhase.Eventually);
-workbench.registerWorkbenchContribution(UpdateStatusBarEntryContribution, LifecyclePhase.Restored);
+workbench.registerWorkbenchContribution(UpdateStatusBarContribution, LifecyclePhase.Restored);
+workbench.registerWorkbenchContribution(UpdateTitleBarContribution, LifecyclePhase.Restored);
 class ShowReleaseNotesAction extends Action2 {
     static {
         this.AVAILABLE = !!product.releaseNotesUrl;
@@ -35,8 +37,8 @@ class ShowReleaseNotesAction extends Action2 {
         super({
             id: ShowCurrentReleaseNotesActionId,
             title: {
-                ...( localize2(14459, "Show Release Notes")),
-                mnemonicTitle: ( localize(14460, "Show &&Release Notes"))
+                ...( localize2(14725, "Show Release Notes")),
+                mnemonicTitle: ( localize(14726, "Show &&Release Notes"))
             },
             category: {
                 value: product.nameShort,
@@ -62,7 +64,7 @@ class ShowReleaseNotesAction extends Action2 {
                 await openerService.open(( URI.parse(productService.releaseNotesUrl)));
             } else {
                 throw ( new Error(( localize(
-                    14461,
+                    14727,
                     "This version of {0} does not have release notes online",
                     productService.nameLong
                 ))));
@@ -75,10 +77,10 @@ class ShowCurrentReleaseNotesFromCurrentFileAction extends Action2 {
         super({
             id: ShowCurrentReleaseNotesFromCurrentFileActionId,
             title: {
-                ...( localize2(14462, "Open Current File as Release Notes")),
-                mnemonicTitle: ( localize(14460, "Show &&Release Notes"))
+                ...( localize2(14728, "Open Current File as Release Notes")),
+                mnemonicTitle: ( localize(14726, "Show &&Release Notes"))
             },
-            category: ( localize2(14463, "Developer")),
+            category: ( localize2(14729, "Developer")),
             f1: true
         });
     }
@@ -88,7 +90,7 @@ class ShowCurrentReleaseNotesFromCurrentFileAction extends Action2 {
         try {
             await showReleaseNotesInEditor(instantiationService, productService.version, true);
         } catch (err) {
-            throw ( new Error(( localize(14464, "Cannot open the current file as Release Notes"))));
+            throw ( new Error(( localize(14730, "Cannot open the current file as Release Notes"))));
         }
     }
 }
@@ -100,7 +102,7 @@ class CheckForUpdateAction extends Action2 {
     constructor() {
         super({
             id: "update.checkForUpdate",
-            title: ( localize2(14465, "Check for Updates...")),
+            title: ( localize2(14731, "Check for Updates...")),
             category: {
                 value: product.nameShort,
                 original: product.nameShort
@@ -118,7 +120,7 @@ class DownloadUpdateAction extends Action2 {
     constructor() {
         super({
             id: "update.downloadUpdate",
-            title: ( localize2(14466, "Download Update")),
+            title: ( localize2(14732, "Download Update")),
             category: {
                 value: product.nameShort,
                 original: product.nameShort
@@ -135,7 +137,7 @@ class InstallUpdateAction extends Action2 {
     constructor() {
         super({
             id: "update.installUpdate",
-            title: ( localize2(14467, "Install Update")),
+            title: ( localize2(14733, "Install Update")),
             category: {
                 value: product.nameShort,
                 original: product.nameShort
@@ -152,7 +154,7 @@ class RestartToUpdateAction extends Action2 {
     constructor() {
         super({
             id: "update.restartToUpdate",
-            title: ( localize2(14468, "Restart to Update")),
+            title: ( localize2(14734, "Restart to Update")),
             category: {
                 value: product.nameShort,
                 original: product.nameShort
@@ -175,7 +177,7 @@ class DownloadAction extends Action2 {
     constructor() {
         super({
             id: DownloadAction.ID,
-            title: ( localize2(14469, "Download {0}", product.nameLong)),
+            title: ( localize2(14735, "Download {0}", product.nameLong)),
             precondition: IsWebContext,
             f1: true,
             menu: [{
@@ -204,7 +206,7 @@ if (isWindows) {
         constructor() {
             super({
                 id: "_update.applyupdate",
-                title: ( localize2(14470, "Apply Update...")),
+                title: ( localize2(14736, "Apply Update...")),
                 category: Categories.Developer,
                 f1: true,
                 precondition: ( CONTEXT_UPDATE_STATE.isEqualTo(StateType.Idle))
@@ -214,13 +216,13 @@ if (isWindows) {
             const updateService = accessor.get(IUpdateService);
             const fileDialogService = accessor.get(IFileDialogService);
             const updatePath = await fileDialogService.showOpenDialog({
-                title: ( localize(14471, "Apply Update")),
+                title: ( localize(14737, "Apply Update")),
                 filters: [{
                     name: "Setup",
                     extensions: ["exe"]
                 }],
                 canSelectFiles: true,
-                openLabel: mnemonicButtonLabel(( localize(14472, "&&Update")))
+                openLabel: mnemonicButtonLabel(( localize(14738, "&&Update")))
             });
             if (!updatePath || !updatePath[0]) {
                 return;

package/vscode/src/vs/workbench/contrib/update/browser/update.d.ts

@@ -15,6 +15,7 @@ import { MenuId } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/
 import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IDefaultAccountService } from "@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount.service";
+import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 export declare const CONTEXT_UPDATE_STATE: RawContextKey<string>;
 export declare const MAJOR_MINOR_UPDATE_AVAILABLE: RawContextKey<boolean>;
 export declare function showReleaseNotesInEditor(instantiationService: IInstantiationService, version: string, useCurrentFile: boolean): Promise<boolean>;
@@ -41,12 +42,15 @@ export declare class UpdateContribution extends Disposable implements IWorkbench
     private readonly openerService;
     private readonly configurationService;
     private readonly hostService;
+    private readonly layoutService;
     private state;
     private readonly badgeDisposable;
     private overwriteNotificationHandle;
     private updateStateContextKey;
     private majorMinorUpdateAvailableContextKey;
-    constructor(storageService: IStorageService, instantiationService: IInstantiationService, notificationService: INotificationService, dialogService: IDialogService, updateService: IUpdateService, activityService: IActivityService, contextKeyService: IContextKeyService, productService: IProductService, openerService: IOpenerService, configurationService: IConfigurationService, hostService: IHostService);
+    private titleBarEnabled;
+    constructor(storageService: IStorageService, instantiationService: IInstantiationService, notificationService: INotificationService, dialogService: IDialogService, updateService: IUpdateService, activityService: IActivityService, contextKeyService: IContextKeyService, productService: IProductService, openerService: IOpenerService, configurationService: IConfigurationService, hostService: IHostService, layoutService: IWorkbenchLayoutService);
+    private isTitleBarEnabled;
     private onUpdateStateChange;
     private onError;
     private onUpdateNotAvailable;