@theia/core 1.21.0 → 1.22.0-next.12

package/src/browser/context-key-service.ts

@@ -15,7 +15,8 @@
  ********************************************************************************/
 
 import { injectable } from 'inversify';
-import { Emitter } from '../common/event';
+import { Disposable } from '../common';
+import { Emitter, Event } from '../common/event';
 
 export interface ContextKey<T> {
     set(value: T | undefined): void;
@@ -36,8 +37,44 @@ export interface ContextKeyChangeEvent {
     affects(keys: Set<string>): boolean;
 }
 
+export const ContextKeyService = Symbol('ContextKeyService');
+export interface ContextKeyService extends Disposable {
+    readonly onDidChange: Event<ContextKeyChangeEvent>;
+
+    createKey<T>(key: string, defaultValue: T | undefined): ContextKey<T>;
+
+    /**
+     * Whether the expression is satisfied. If `context` provided, the service will attempt to retrieve a context object associated with that element.
+     */
+    match(expression: string, context?: HTMLElement): boolean;
+
+    /**
+     * @returns a Set of the keys used by the given `expression` or `undefined` if none are used or the expression cannot be parsed.
+     */
+    parseKeys(expression: string): Set<string> | undefined;
+
+    /**
+     * Creates a temporary context that will use the `values` passed in when evaluating `callback`
+     * `callback` must be synchronous.
+     */
+    with<T>(values: Record<string, unknown>, callback: () => T): T;
+
+    /**
+     * Creates a child service with a separate context scoped to the HTML element passed in.
+     * Useful for e.g. setting the {view} context value for particular widgets.
+     */
+    createScoped(target?: HTMLElement): ScopedValueStore;
+
+    /**
+     * Set or modify a value in the service's context.
+     */
+    setContext(key: string, value: unknown): void;
+}
+
+export type ScopedValueStore = Omit<ContextKeyService, 'onDidChange' | 'match' | 'parseKeys' | 'with'>;
+
 @injectable()
-export class ContextKeyService {
+export class ContextKeyServiceDummyImpl implements ContextKeyService {
 
     protected readonly onDidChangeEmitter = new Emitter<ContextKeyChangeEvent>();
     readonly onDidChange = this.onDidChangeEmitter.event;
@@ -62,4 +99,25 @@ export class ContextKeyService {
         return new Set<string>();
     }
 
+    /**
+     * Details should be implemented by an extension, e.g. by the monaco extension.
+     * Callback must be synchronous.
+     */
+    with<T>(values: Record<string, unknown>, callback: () => T): T {
+        return callback();
+    }
+
+    /**
+     * Details should implemented by an extension, e.g. by the monaco extension.
+     */
+    createScoped(target?: HTMLElement): ContextKeyService {
+        return this;
+    }
+
+    /**
+     * Details should be implemented by an extension, e.g. by the monaco extension.
+     */
+    setContext(key: string, value: unknown): void { }
+
+    dispose(): void { }
 }

package/src/browser/frontend-application-module.ts

@@ -62,7 +62,7 @@ import { FrontendApplicationStateService } from './frontend-application-state';
 import { JsonSchemaStore, JsonSchemaContribution, DefaultJsonSchemaContribution } from './json-schema-store';
 import { TabBarToolbarRegistry, TabBarToolbarContribution, TabBarToolbarFactory, TabBarToolbar } from './shell/tab-bar-toolbar';
 import { bindCorePreferences } from './core-preferences';
-import { ContextKeyService } from './context-key-service';
+import { ContextKeyService, ContextKeyServiceDummyImpl } from './context-key-service';
 import { ResourceContextKey } from './resource-context-key';
 import { KeyboardLayoutService } from './keyboard/keyboard-layout-service';
 import { MimeService } from './mime-service';
@@ -221,7 +221,7 @@ export const frontendApplicationModule = new ContainerModule((bind, unbind, isBo
     bind(CommandService).toService(CommandRegistry);
     bindContributionProvider(bind, CommandContribution);
 
-    bind(ContextKeyService).toSelf().inSingletonScope();
+    bind(ContextKeyService).to(ContextKeyServiceDummyImpl).inSingletonScope();
 
     bind(MenuModelRegistry).toSelf().inSingletonScope();
     bindContributionProvider(bind, MenuContribution);

package/src/browser/index.ts

@@ -41,5 +41,4 @@ export * from './core-preferences';
 export * from './view-container';
 export * from './breadcrumbs';
 export * from './tooltip-service';
-export * from './markdown-renderer';
 export * from './decoration-style';

package/src/browser/keybinding.spec.ts

@@ -30,7 +30,7 @@ import { LabelParser } from './label-parser';
 import { MockLogger } from '../common/test/mock-logger';
 import { StatusBar, StatusBarImpl } from './status-bar/status-bar';
 import { FrontendApplicationStateService } from './frontend-application-state';
-import { ContextKeyService } from './context-key-service';
+import { ContextKeyService, ContextKeyServiceDummyImpl } from './context-key-service';
 import { CorePreferences } from './core-preferences';
 import * as os from '../common/os';
 import * as chai from 'chai';
@@ -87,7 +87,7 @@ before(async () => {
         bind(StatusBar).toService(StatusBarImpl);
         bind(CommandService).toService(CommandRegistry);
         bind(LabelParser).toSelf().inSingletonScope();
-        bind(ContextKeyService).toSelf().inSingletonScope();
+        bind(ContextKeyService).to(ContextKeyServiceDummyImpl).inSingletonScope();
         bind(FrontendApplicationStateService).toSelf().inSingletonScope();
         bind(CorePreferences).toConstantValue(<CorePreferences>{});
         bindPreferenceService(bind);

package/src/browser/shell/application-shell.ts

@@ -37,6 +37,7 @@ import { Emitter } from '../../common/event';
 import { waitForRevealed, waitForClosed } from '../widgets';
 import { CorePreferences } from '../core-preferences';
 import { BreadcrumbsRendererFactory } from '../breadcrumbs/breadcrumbs-renderer';
+import { Deferred } from '../../common/promise-util';
 
 /** The class name added to ApplicationShell instances. */
 const APPLICATION_SHELL_CLASS = 'theia-ApplicationShell';
@@ -1076,25 +1077,27 @@ export class ApplicationShell extends Widget {
         if (!current) {
             return undefined;
         }
-        await Promise.all([
+        return Promise.all([
             this.waitForActivation(current.id),
             waitForRevealed(current),
             this.pendingUpdates
-        ]);
-        return current;
+        ]).then(() => current, () => undefined);
     }
 
     waitForActivation(id: string): Promise<void> {
         if (this.activeWidget && this.activeWidget.id === id) {
             return Promise.resolve();
         }
-        return new Promise(resolve => {
-            const toDispose = this.onDidChangeActiveWidget(() => {
-                if (this.activeWidget && this.activeWidget.id === id) {
-                    toDispose.dispose();
-                    resolve();
-                }
-            });
+        const activation = new Deferred();
+        const success = this.onDidChangeActiveWidget(() => {
+            if (this.activeWidget && this.activeWidget.id === id) {
+                activation.resolve();
+            }
+        });
+        const failure = setTimeout(() => activation.reject(new Error(`Widget with id '${id}' failed to activate.`)), this.activationTimeout + 250);
+        return activation.promise.finally(() => {
+            success.dispose();
+            clearTimeout(failure);
         });
     }
 

package/src/electron-browser/menu/electron-menu-contribution.ts

@@ -68,7 +68,7 @@ export namespace ElectronCommands {
 
 export namespace ElectronMenus {
     export const VIEW_WINDOW = [...CommonMenus.VIEW, 'window'];
-    export const VIEW_ZOOM = [...CommonMenus.VIEW, 'zoom'];
+    export const VIEW_ZOOM = [...CommonMenus.VIEW_APPEARANCE_SUBMENU, '4_appearance_submenu_zoom'];
 }
 
 export namespace ElectronMenus {
@@ -364,5 +364,10 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
         registry.registerMenuAction(ElectronMenus.FILE_CLOSE, {
             commandId: ElectronCommands.CLOSE_WINDOW.id,
         });
+        registry.registerMenuAction(CommonMenus.VIEW_APPEARANCE_SUBMENU_SCREEN, {
+            commandId: ElectronCommands.TOGGLE_FULL_SCREEN.id,
+            label: nls.localizeByDefault('Full Screen'),
+            order: '0'
+        });
     }
 }

package/lib/browser/markdown-renderer.d.ts

@@ -1,33 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2021 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-import * as markdownit from 'markdown-it';
-export declare class MarkdownRenderer {
-    protected engine: markdownit;
-    protected callbacks: Map<string, ((element: Element) => Element | void)[]>;
-    constructor(engine?: markdownit);
-    /**
-     * Adds a modification callback that is applied to every element with the specified tag after rendering to HTML.
-     *
-     * @param tag The tag that this modification applies to.
-     * @param callback The modification to apply on every selected rendered element. Can either modify the element in place or return a new element.
-     */
-    modify<K extends keyof HTMLElementTagNameMap>(tag: K, callback: (element: HTMLElementTagNameMap[K]) => Element | void): MarkdownRenderer;
-    render(markdown: string): HTMLElement;
-    renderInline(markdown: string): HTMLElement;
-    protected renderInternal(renderedHtml: string): HTMLElement;
-    protected sanitizeHtml(html: string): HTMLElement;
-}
-//# sourceMappingURL=markdown-renderer.d.ts.map

package/lib/browser/markdown-renderer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"markdown-renderer.d.ts","sourceRoot":"","sources":["../../src/browser/markdown-renderer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAE1C,qBAAa,gBAAgB;IAEzB,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC;IAC7B,SAAS,CAAC,SAAS,yBAA8B,OAAO,KAAK,OAAO,GAAG,IAAI,KAAO;gBAEtE,MAAM,CAAC,EAAE,UAAU;IAI/B;;;;;OAKG;IACH,MAAM,CAAC,CAAC,SAAS,MAAM,qBAAqB,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC,KAAK,OAAO,GAAG,IAAI,GAAG,gBAAgB;IASxI,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW;IAIrC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW;IAI3C,SAAS,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW;IAmB3D,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW;CAKpD"}

package/lib/browser/markdown-renderer.js

@@ -1,72 +0,0 @@
-"use strict";
-/********************************************************************************
- * Copyright (C) 2021 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MarkdownRenderer = void 0;
-const DOMPurify = require("dompurify");
-const markdownit = require("markdown-it");
-class MarkdownRenderer {
-    constructor(engine) {
-        this.callbacks = new Map();
-        this.engine = engine !== null && engine !== void 0 ? engine : markdownit();
-    }
-    /**
-     * Adds a modification callback that is applied to every element with the specified tag after rendering to HTML.
-     *
-     * @param tag The tag that this modification applies to.
-     * @param callback The modification to apply on every selected rendered element. Can either modify the element in place or return a new element.
-     */
-    modify(tag, callback) {
-        if (this.callbacks.has(tag)) {
-            this.callbacks.get(tag).push(callback);
-        }
-        else {
-            this.callbacks.set(tag, [callback]);
-        }
-        return this;
-    }
-    render(markdown) {
-        return this.renderInternal(this.engine.render(markdown));
-    }
-    renderInline(markdown) {
-        return this.renderInternal(this.engine.renderInline(markdown));
-    }
-    renderInternal(renderedHtml) {
-        const div = this.sanitizeHtml(renderedHtml);
-        for (const [tag, calls] of this.callbacks) {
-            for (const callback of calls) {
-                const elements = Array.from(div.getElementsByTagName(tag));
-                for (const element of elements) {
-                    const result = callback(element);
-                    if (result) {
-                        const parent = element.parentElement;
-                        if (parent) {
-                            parent.replaceChild(result, element);
-                        }
-                    }
-                }
-            }
-        }
-        return div;
-    }
-    sanitizeHtml(html) {
-        const div = document.createElement('div');
-        div.innerHTML = DOMPurify.sanitize(html);
-        return div;
-    }
-}
-exports.MarkdownRenderer = MarkdownRenderer;
-//# sourceMappingURL=markdown-renderer.js.map

package/lib/browser/markdown-renderer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"markdown-renderer.js","sourceRoot":"","sources":["../../src/browser/markdown-renderer.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,uCAAuC;AACvC,0CAA0C;AAE1C,MAAa,gBAAgB;IAKzB,YAAY,MAAmB;QAFrB,cAAS,GAAG,IAAI,GAAG,EAAoD,CAAC;QAG9E,IAAI,CAAC,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,UAAU,EAAE,CAAC;IACzC,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAwC,GAAM,EAAE,QAA+D;QACjH,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACzB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC3C;aAAM;YACH,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;SACvC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,QAAgB;QACnB,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,YAAY,CAAC,QAAgB;QACzB,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnE,CAAC;IAES,cAAc,CAAC,YAAoB;QACzC,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QAC5C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE;YACvC,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE;gBAC1B,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC3D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;oBAC5B,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;oBACjC,IAAI,MAAM,EAAE;wBACR,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;wBACrC,IAAI,MAAM,EAAE;4BACR,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;yBACxC;qBACJ;iBACJ;aACJ;SACJ;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAES,YAAY,CAAC,IAAY;QAC/B,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1C,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACzC,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AAxDD,4CAwDC"}

package/lib/browser/markdown-renderer.spec.d.ts

@@ -1,17 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2021 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-export {};
-//# sourceMappingURL=markdown-renderer.spec.d.ts.map

package/lib/browser/markdown-renderer.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"markdown-renderer.spec.d.ts","sourceRoot":"","sources":["../../src/browser/markdown-renderer.spec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF"}

package/lib/browser/markdown-renderer.spec.js

@@ -1,71 +0,0 @@
-"use strict";
-/********************************************************************************
- * Copyright (C) 2021 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-const jsdom_1 = require("../browser/test/jsdom");
-let disableJSDOM = jsdom_1.enableJSDOM();
-const chai_1 = require("chai");
-const markdownit = require("markdown-it");
-const markdown_renderer_1 = require("./markdown-renderer");
-disableJSDOM();
-describe('MarkdownRenderer', () => {
-    before(() => disableJSDOM = jsdom_1.enableJSDOM());
-    after(() => disableJSDOM());
-    it('Should render markdown', () => {
-        const markdownRenderer = new markdown_renderer_1.MarkdownRenderer();
-        const result = markdownRenderer.renderInline('[title](link)').innerHTML;
-        chai_1.expect(result).to.be.equal('<a href="link">title</a>');
-    });
-    it('Should accept and use custom engine', () => {
-        const engine = markdownit();
-        const originalTextRenderer = engine.renderer.rules.text;
-        engine.renderer.rules.text = (tokens, idx, options, env, self) => `[${originalTextRenderer(tokens, idx, options, env, self)}]`;
-        const markdownRenderer = new markdown_renderer_1.MarkdownRenderer(engine);
-        const result = markdownRenderer.renderInline('text').innerHTML;
-        chai_1.expect(result).to.be.equal('[text]');
-    });
-    it('Should modify rendered markdown in place', () => {
-        const markdownRenderer = new markdown_renderer_1.MarkdownRenderer().modify('a', a => {
-            a.href = 'something-else';
-        });
-        const result = markdownRenderer.renderInline('[title](link)').innerHTML;
-        chai_1.expect(result).to.be.equal('<a href="something-else">title</a>');
-    });
-    it('Should modify descendants of children', () => {
-        const markdownRenderer = new markdown_renderer_1.MarkdownRenderer().modify('em', em => {
-            const strong = document.createElement('strong');
-            // eslint-disable-next-line no-unsanitized/property
-            strong.innerHTML = em.innerHTML;
-            return strong;
-        });
-        const result = markdownRenderer.render('**bold *bold and italic***').innerHTML;
-        chai_1.expect(result).to.be.equal('<p><strong>bold <strong>bold and italic</strong></strong></p>\n');
-    });
-    it('Should modify descendants of children after previous modification', () => {
-        const markdownRenderer = new markdown_renderer_1.MarkdownRenderer().modify('em', em => {
-            const strong = document.createElement('strong');
-            // eslint-disable-next-line no-unsanitized/property
-            strong.innerHTML = em.innerHTML;
-            return strong;
-        }).modify('strong', strong => {
-            const textNode = strong.childNodes.item(0);
-            textNode.textContent = `changed_${textNode.textContent}`;
-        });
-        const result = markdownRenderer.render('**bold *bold and italic***').innerHTML;
-        chai_1.expect(result).to.be.equal('<p><strong>changed_bold <strong>changed_bold and italic</strong></strong></p>\n');
-    });
-});
-//# sourceMappingURL=markdown-renderer.spec.js.map

package/lib/browser/markdown-renderer.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"markdown-renderer.spec.js","sourceRoot":"","sources":["../../src/browser/markdown-renderer.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;AAElF,iDAAoD;AACpD,IAAI,YAAY,GAAG,mBAAW,EAAE,CAAC;AAEjC,+BAA8B;AAC9B,0CAA0C;AAC1C,2DAAuD;AAEvD,YAAY,EAAE,CAAC;AAEf,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAE9B,MAAM,CAAC,GAAG,EAAE,CAAC,YAAY,GAAG,mBAAW,EAAE,CAAC,CAAC;IAC3C,KAAK,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC;IAE5B,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAC9B,MAAM,gBAAgB,GAAG,IAAI,oCAAgB,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,gBAAgB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC;QACxE,aAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC3C,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;QAC5B,MAAM,oBAAoB,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAK,CAAC;QACzD,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;QAC/H,MAAM,gBAAgB,GAAG,IAAI,oCAAgB,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,gBAAgB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC;QAC/D,aAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAChD,MAAM,gBAAgB,GAAG,IAAI,oCAAgB,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE;YAC5D,CAAC,CAAC,IAAI,GAAG,gBAAgB,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,gBAAgB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC;QACxE,aAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC7C,MAAM,gBAAgB,GAAG,IAAI,oCAAgB,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE;YAC9D,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,mDAAmD;YACnD,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC;YAChC,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC,SAAS,CAAC;QAC/E,aAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;IAClG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QACzE,MAAM,gBAAgB,GAAG,IAAI,oCAAgB,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE;YAC9D,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,mDAAmD;YACnD,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC;YAChC,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;YACzB,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC3C,QAAQ,CAAC,WAAW,GAAG,WAAW,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC7D,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC,SAAS,CAAC;QAC/E,aAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,iFAAiF,CAAC,CAAC;IAClH,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/src/browser/markdown-renderer.spec.ts

@@ -1,78 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2021 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-
-import { enableJSDOM } from '../browser/test/jsdom';
-let disableJSDOM = enableJSDOM();
-
-import { expect } from 'chai';
-import * as markdownit from 'markdown-it';
-import { MarkdownRenderer } from './markdown-renderer';
-
-disableJSDOM();
-
-describe('MarkdownRenderer', () => {
-
-    before(() => disableJSDOM = enableJSDOM());
-    after(() => disableJSDOM());
-
-    it('Should render markdown', () => {
-        const markdownRenderer = new MarkdownRenderer();
-        const result = markdownRenderer.renderInline('[title](link)').innerHTML;
-        expect(result).to.be.equal('<a href="link">title</a>');
-    });
-
-    it('Should accept and use custom engine', () => {
-        const engine = markdownit();
-        const originalTextRenderer = engine.renderer.rules.text!;
-        engine.renderer.rules.text = (tokens, idx, options, env, self) => `[${originalTextRenderer(tokens, idx, options, env, self)}]`;
-        const markdownRenderer = new MarkdownRenderer(engine);
-        const result = markdownRenderer.renderInline('text').innerHTML;
-        expect(result).to.be.equal('[text]');
-    });
-
-    it('Should modify rendered markdown in place', () => {
-        const markdownRenderer = new MarkdownRenderer().modify('a', a => {
-            a.href = 'something-else';
-        });
-        const result = markdownRenderer.renderInline('[title](link)').innerHTML;
-        expect(result).to.be.equal('<a href="something-else">title</a>');
-    });
-
-    it('Should modify descendants of children', () => {
-        const markdownRenderer = new MarkdownRenderer().modify('em', em => {
-            const strong = document.createElement('strong');
-            // eslint-disable-next-line no-unsanitized/property
-            strong.innerHTML = em.innerHTML;
-            return strong;
-        });
-        const result = markdownRenderer.render('**bold *bold and italic***').innerHTML;
-        expect(result).to.be.equal('<p><strong>bold <strong>bold and italic</strong></strong></p>\n');
-    });
-
-    it('Should modify descendants of children after previous modification', () => {
-        const markdownRenderer = new MarkdownRenderer().modify('em', em => {
-            const strong = document.createElement('strong');
-            // eslint-disable-next-line no-unsanitized/property
-            strong.innerHTML = em.innerHTML;
-            return strong;
-        }).modify('strong', strong => { // Will pick up both the original and modified strong element
-            const textNode = strong.childNodes.item(0);
-            textNode.textContent = `changed_${textNode.textContent}`;
-        });
-        const result = markdownRenderer.render('**bold *bold and italic***').innerHTML;
-        expect(result).to.be.equal('<p><strong>changed_bold <strong>changed_bold and italic</strong></strong></p>\n');
-    });
-});

package/src/browser/markdown-renderer.ts

@@ -1,76 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2021 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-
-import * as DOMPurify from 'dompurify';
-import * as markdownit from 'markdown-it';
-
-export class MarkdownRenderer {
-
-    protected engine: markdownit;
-    protected callbacks = new Map<string, ((element: Element) => Element | void)[]>();
-
-    constructor(engine?: markdownit) {
-        this.engine = engine ?? markdownit();
-    }
-
-    /**
-     * Adds a modification callback that is applied to every element with the specified tag after rendering to HTML.
-     *
-     * @param tag The tag that this modification applies to.
-     * @param callback The modification to apply on every selected rendered element. Can either modify the element in place or return a new element.
-     */
-    modify<K extends keyof HTMLElementTagNameMap>(tag: K, callback: (element: HTMLElementTagNameMap[K]) => Element | void): MarkdownRenderer {
-        if (this.callbacks.has(tag)) {
-            this.callbacks.get(tag)!.push(callback);
-        } else {
-            this.callbacks.set(tag, [callback]);
-        }
-        return this;
-    }
-
-    render(markdown: string): HTMLElement {
-        return this.renderInternal(this.engine.render(markdown));
-    }
-
-    renderInline(markdown: string): HTMLElement {
-        return this.renderInternal(this.engine.renderInline(markdown));
-    }
-
-    protected renderInternal(renderedHtml: string): HTMLElement {
-        const div = this.sanitizeHtml(renderedHtml);
-        for (const [tag, calls] of this.callbacks) {
-            for (const callback of calls) {
-                const elements = Array.from(div.getElementsByTagName(tag));
-                for (const element of elements) {
-                    const result = callback(element);
-                    if (result) {
-                        const parent = element.parentElement;
-                        if (parent) {
-                            parent.replaceChild(result, element);
-                        }
-                    }
-                }
-            }
-        }
-        return div;
-    }
-
-    protected sanitizeHtml(html: string): HTMLElement {
-        const div = document.createElement('div');
-        div.innerHTML = DOMPurify.sanitize(html);
-        return div;
-    }
-}