@theia/messages 1.48.1 → 1.48.2

package/src/browser/notification-component.tsx

@@ -1,128 +1,128 @@
-// *****************************************************************************
-// Copyright (C) 2019 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as React from '@theia/core/shared/react';
-import * as DOMPurify from '@theia/core/shared/dompurify';
-import { NotificationManager, Notification } from './notifications-manager';
-import { codicon } from '@theia/core/lib/browser';
-import { nls } from '@theia/core/lib/common/nls';
-
-export interface NotificationComponentProps {
-    readonly manager: NotificationManager;
-    readonly notification: Notification;
-}
-
-export class NotificationComponent extends React.Component<NotificationComponentProps> {
-
-    constructor(props: NotificationComponentProps) {
-        super(props);
-        this.state = {};
-    }
-
-    protected onClear = (event: React.MouseEvent) => {
-        if (event.target instanceof HTMLElement) {
-            const messageId = event.target.dataset.messageId;
-            if (messageId) {
-                this.props.manager.clear(messageId);
-            }
-        }
-    };
-
-    protected onToggleExpansion = (event: React.MouseEvent) => {
-        if (event.target instanceof HTMLElement) {
-            const messageId = event.target.dataset.messageId;
-            if (messageId) {
-                this.props.manager.toggleExpansion(messageId);
-            }
-        }
-    };
-
-    protected onAction = (event: React.MouseEvent) => {
-        if (event.target instanceof HTMLElement) {
-            const messageId = event.target.dataset.messageId;
-            const action = event.target.dataset.action;
-            if (messageId && action) {
-                this.props.manager.accept(messageId, action);
-            }
-        }
-    };
-
-    protected onMessageClick = (event: React.MouseEvent) => {
-        if (event.target instanceof HTMLAnchorElement) {
-            event.stopPropagation();
-            event.preventDefault();
-            const link = event.target.href;
-            this.props.manager.openLink(link);
-        }
-    };
-
-    override render(): React.ReactNode {
-        const { messageId, message, type, progress, collapsed, expandable, source, actions } = this.props.notification;
-        const isProgress = type === 'progress' || typeof progress === 'number';
-        const icon = type === 'progress' ? 'info' : type;
-        return (<div key={messageId} className='theia-notification-list-item-container'>
-            <div className='theia-notification-list-item' tabIndex={0}>
-                <div className={`theia-notification-list-item-content ${collapsed ? 'collapsed' : ''}`}>
-                    <div className='theia-notification-list-item-content-main'>
-                        <div className={`theia-notification-icon ${codicon(icon)} ${icon}`} />
-                        <div className='theia-notification-message'>
-                            <span
-                                // eslint-disable-next-line react/no-danger
-                                dangerouslySetInnerHTML={{
-                                    __html: DOMPurify.sanitize(message, {
-                                        ALLOW_UNKNOWN_PROTOCOLS: true // DOMPurify usually strips non http(s) links from hrefs
-                                    })
-                                }}
-                                onClick={this.onMessageClick}
-                            />
-                        </div>
-                        <ul className='theia-notification-actions'>
-                            {expandable && (
-                                <li className={codicon('chevron-down', true) + (collapsed ? ' expand' : ' collapse')} title={collapsed ? 'Expand' : 'Collapse'}
-                                    data-message-id={messageId} onClick={this.onToggleExpansion} />
-                            )}
-                            {!isProgress && (<li className={codicon('close', true)} title={nls.localizeByDefault('Clear')} data-message-id={messageId}
-                                onClick={this.onClear} />)}
-                        </ul>
-                    </div>
-                    {(source || !!actions.length) && (
-                        <div className='theia-notification-list-item-content-bottom'>
-                            <div className='theia-notification-source'>
-                                {source && (<span>{source}</span>)}
-                            </div>
-                            <div className='theia-notification-buttons'>
-                                {actions && actions.map((action, index) => (
-                                    <button key={messageId + `-action-${index}`} className='theia-button'
-                                        data-message-id={messageId} data-action={action}
-                                        onClick={this.onAction}>
-                                        {action}
-                                    </button>
-                                ))}
-                            </div>
-                        </div>
-                    )}
-                </div>
-                {isProgress && (
-                    <div className='theia-notification-item-progress'>
-                        <div className={`theia-notification-item-progressbar ${progress ? 'determinate' : 'indeterminate'}`}
-                            style={{ width: `${progress ?? '100'}%` }} />
-                    </div>
-                )}
-            </div>
-        </div>);
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2019 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as React from '@theia/core/shared/react';
+import * as DOMPurify from '@theia/core/shared/dompurify';
+import { NotificationManager, Notification } from './notifications-manager';
+import { codicon } from '@theia/core/lib/browser';
+import { nls } from '@theia/core/lib/common/nls';
+
+export interface NotificationComponentProps {
+    readonly manager: NotificationManager;
+    readonly notification: Notification;
+}
+
+export class NotificationComponent extends React.Component<NotificationComponentProps> {
+
+    constructor(props: NotificationComponentProps) {
+        super(props);
+        this.state = {};
+    }
+
+    protected onClear = (event: React.MouseEvent) => {
+        if (event.target instanceof HTMLElement) {
+            const messageId = event.target.dataset.messageId;
+            if (messageId) {
+                this.props.manager.clear(messageId);
+            }
+        }
+    };
+
+    protected onToggleExpansion = (event: React.MouseEvent) => {
+        if (event.target instanceof HTMLElement) {
+            const messageId = event.target.dataset.messageId;
+            if (messageId) {
+                this.props.manager.toggleExpansion(messageId);
+            }
+        }
+    };
+
+    protected onAction = (event: React.MouseEvent) => {
+        if (event.target instanceof HTMLElement) {
+            const messageId = event.target.dataset.messageId;
+            const action = event.target.dataset.action;
+            if (messageId && action) {
+                this.props.manager.accept(messageId, action);
+            }
+        }
+    };
+
+    protected onMessageClick = (event: React.MouseEvent) => {
+        if (event.target instanceof HTMLAnchorElement) {
+            event.stopPropagation();
+            event.preventDefault();
+            const link = event.target.href;
+            this.props.manager.openLink(link);
+        }
+    };
+
+    override render(): React.ReactNode {
+        const { messageId, message, type, progress, collapsed, expandable, source, actions } = this.props.notification;
+        const isProgress = type === 'progress' || typeof progress === 'number';
+        const icon = type === 'progress' ? 'info' : type;
+        return (<div key={messageId} className='theia-notification-list-item-container'>
+            <div className='theia-notification-list-item' tabIndex={0}>
+                <div className={`theia-notification-list-item-content ${collapsed ? 'collapsed' : ''}`}>
+                    <div className='theia-notification-list-item-content-main'>
+                        <div className={`theia-notification-icon ${codicon(icon)} ${icon}`} />
+                        <div className='theia-notification-message'>
+                            <span
+                                // eslint-disable-next-line react/no-danger
+                                dangerouslySetInnerHTML={{
+                                    __html: DOMPurify.sanitize(message, {
+                                        ALLOW_UNKNOWN_PROTOCOLS: true // DOMPurify usually strips non http(s) links from hrefs
+                                    })
+                                }}
+                                onClick={this.onMessageClick}
+                            />
+                        </div>
+                        <ul className='theia-notification-actions'>
+                            {expandable && (
+                                <li className={codicon('chevron-down', true) + (collapsed ? ' expand' : ' collapse')} title={collapsed ? 'Expand' : 'Collapse'}
+                                    data-message-id={messageId} onClick={this.onToggleExpansion} />
+                            )}
+                            {!isProgress && (<li className={codicon('close', true)} title={nls.localizeByDefault('Clear')} data-message-id={messageId}
+                                onClick={this.onClear} />)}
+                        </ul>
+                    </div>
+                    {(source || !!actions.length) && (
+                        <div className='theia-notification-list-item-content-bottom'>
+                            <div className='theia-notification-source'>
+                                {source && (<span>{source}</span>)}
+                            </div>
+                            <div className='theia-notification-buttons'>
+                                {actions && actions.map((action, index) => (
+                                    <button key={messageId + `-action-${index}`} className='theia-button'
+                                        data-message-id={messageId} data-action={action}
+                                        onClick={this.onAction}>
+                                        {action}
+                                    </button>
+                                ))}
+                            </div>
+                        </div>
+                    )}
+                </div>
+                {isProgress && (
+                    <div className='theia-notification-item-progress'>
+                        <div className={`theia-notification-item-progressbar ${progress ? 'determinate' : 'indeterminate'}`}
+                            style={{ width: `${progress ?? '100'}%` }} />
+                    </div>
+                )}
+            </div>
+        </div>);
+    }
+
+}

package/src/browser/notification-content-renderer.spec.ts

@@ -1,73 +1,73 @@
-// *****************************************************************************
-// Copyright (C) 2020 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { expect } from 'chai';
-import { NotificationContentRenderer } from './notification-content-renderer';
-
-describe('notification-content-renderer', () => {
-
-    const contentRenderer = new NotificationContentRenderer();
-
-    it('should remove new lines', () => {
-        expectRenderedContent('foo\nbar', 'foo bar');
-        expectRenderedContent('foo\n\n\nbar', 'foo bar');
-    });
-
-    it('should render links', () => {
-        expectRenderedContent(
-            'Link to [theia](https://github.com/eclipse-theia/theia)!',
-            'Link to <a href="https://github.com/eclipse-theia/theia">theia</a>!'
-        );
-        expectRenderedContent(
-            'Link to [theia](https://github.com/eclipse-theia/theia "title on hover")!',
-            'Link to <a href="https://github.com/eclipse-theia/theia" title="title on hover">theia</a>!'
-        );
-        expectRenderedContent(
-            'Click [here](command:my-command-id) to open stuff!',
-            'Click <a href="command:my-command-id">here</a> to open stuff!'
-        );
-        expectRenderedContent(
-            'Click [here](javascript:window.alert();) to open stuff!',
-            'Click [here](javascript:window.alert();) to open stuff!'
-        );
-    });
-
-    it('should render markdown', () => {
-        expectRenderedContent(
-            '*italic*',
-            '<em>italic</em>'
-        );
-        expectRenderedContent(
-            '**bold**',
-            '<strong>bold</strong>'
-        );
-    });
-
-    it('should not render html', () => {
-        expectRenderedContent(
-            '<script>document.getElementById("demo").innerHTML = "Hello JavaScript!";</script>',
-            '&lt;script&gt;document.getElementById(&quot;demo&quot;).innerHTML = &quot;Hello JavaScript!&quot;;&lt;/script&gt;'
-        );
-        expectRenderedContent(
-            '<a href="javascript:window.alert();">foobar</a>',
-            '&lt;a href=&quot;javascript:window.alert();&quot;&gt;foobar&lt;/a&gt;'
-        );
-    });
-
-    const expectRenderedContent = (input: string, output: string) =>
-        expect(contentRenderer.renderMessage(input)).to.be.equal(output);
-
-});
+// *****************************************************************************
+// Copyright (C) 2020 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { expect } from 'chai';
+import { NotificationContentRenderer } from './notification-content-renderer';
+
+describe('notification-content-renderer', () => {
+
+    const contentRenderer = new NotificationContentRenderer();
+
+    it('should remove new lines', () => {
+        expectRenderedContent('foo\nbar', 'foo bar');
+        expectRenderedContent('foo\n\n\nbar', 'foo bar');
+    });
+
+    it('should render links', () => {
+        expectRenderedContent(
+            'Link to [theia](https://github.com/eclipse-theia/theia)!',
+            'Link to <a href="https://github.com/eclipse-theia/theia">theia</a>!'
+        );
+        expectRenderedContent(
+            'Link to [theia](https://github.com/eclipse-theia/theia "title on hover")!',
+            'Link to <a href="https://github.com/eclipse-theia/theia" title="title on hover">theia</a>!'
+        );
+        expectRenderedContent(
+            'Click [here](command:my-command-id) to open stuff!',
+            'Click <a href="command:my-command-id">here</a> to open stuff!'
+        );
+        expectRenderedContent(
+            'Click [here](javascript:window.alert();) to open stuff!',
+            'Click [here](javascript:window.alert();) to open stuff!'
+        );
+    });
+
+    it('should render markdown', () => {
+        expectRenderedContent(
+            '*italic*',
+            '<em>italic</em>'
+        );
+        expectRenderedContent(
+            '**bold**',
+            '<strong>bold</strong>'
+        );
+    });
+
+    it('should not render html', () => {
+        expectRenderedContent(
+            '<script>document.getElementById("demo").innerHTML = "Hello JavaScript!";</script>',
+            '&lt;script&gt;document.getElementById(&quot;demo&quot;).innerHTML = &quot;Hello JavaScript!&quot;;&lt;/script&gt;'
+        );
+        expectRenderedContent(
+            '<a href="javascript:window.alert();">foobar</a>',
+            '&lt;a href=&quot;javascript:window.alert();&quot;&gt;foobar&lt;/a&gt;'
+        );
+    });
+
+    const expectRenderedContent = (input: string, output: string) =>
+        expect(contentRenderer.renderMessage(input)).to.be.equal(output);
+
+});

package/src/browser/notification-content-renderer.ts

@@ -1,31 +1,31 @@
-// *****************************************************************************
-// Copyright (C) 2020 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as markdownit from '@theia/core/shared/markdown-it';
-import { injectable } from '@theia/core/shared/inversify';
-
-@injectable()
-export class NotificationContentRenderer {
-
-    protected readonly mdEngine = markdownit({ html: false });
-
-    renderMessage(content: string): string {
-        // in alignment with vscode, new lines aren't supported
-        const contentWithoutNewlines = content.replace(/((\r)?\n)+/gm, ' ');
-
-        return this.mdEngine.renderInline(contentWithoutNewlines);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as markdownit from '@theia/core/shared/markdown-it';
+import { injectable } from '@theia/core/shared/inversify';
+
+@injectable()
+export class NotificationContentRenderer {
+
+    protected readonly mdEngine = markdownit({ html: false });
+
+    renderMessage(content: string): string {
+        // in alignment with vscode, new lines aren't supported
+        const contentWithoutNewlines = content.replace(/((\r)?\n)+/gm, ' ');
+
+        return this.mdEngine.renderInline(contentWithoutNewlines);
+    }
+}

package/src/browser/notification-preferences.ts

@@ -1,58 +1,58 @@
-// *****************************************************************************
-// Copyright (C) 2018 Ericsson 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { interfaces } from '@theia/core/shared/inversify';
-import {
-    createPreferenceProxy,
-    PreferenceProxy,
-    PreferenceService,
-    PreferenceContribution,
-    PreferenceSchema
-} from '@theia/core/lib/browser/preferences';
-import { nls } from '@theia/core/lib/common/nls';
-
-export const NotificationConfigSchema: PreferenceSchema = {
-    'type': 'object',
-    'properties': {
-        'notification.timeout': {
-            'type': 'number',
-            'description': nls.localize('theia/messages/notificationTimeout', 'Informative notifications will be hidden after this timeout.'),
-            'default': 30 * 1000 // `0` and negative values are treated as no timeout.
-        }
-    }
-};
-
-export interface NotificationConfiguration {
-    'notification.timeout': number
-}
-
-export const NotificationPreferenceContribution = Symbol('NotificationPreferenceContribution');
-export const NotificationPreferences = Symbol('NotificationPreferences');
-export type NotificationPreferences = PreferenceProxy<NotificationConfiguration>;
-
-export function createNotificationPreferences(preferences: PreferenceService, schema: PreferenceSchema = NotificationConfigSchema): NotificationPreferences {
-    return createPreferenceProxy(preferences, schema);
-}
-
-export function bindNotificationPreferences(bind: interfaces.Bind): void {
-    bind(NotificationPreferences).toDynamicValue(ctx => {
-        const preferences = ctx.container.get<PreferenceService>(PreferenceService);
-        const contribution = ctx.container.get<PreferenceContribution>(NotificationPreferenceContribution);
-        return createNotificationPreferences(preferences, contribution.schema);
-    }).inSingletonScope();
-    bind(NotificationPreferenceContribution).toConstantValue({ schema: NotificationConfigSchema });
-    bind(PreferenceContribution).toService(NotificationPreferenceContribution);
-}
+// *****************************************************************************
+// Copyright (C) 2018 Ericsson 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { interfaces } from '@theia/core/shared/inversify';
+import {
+    createPreferenceProxy,
+    PreferenceProxy,
+    PreferenceService,
+    PreferenceContribution,
+    PreferenceSchema
+} from '@theia/core/lib/browser/preferences';
+import { nls } from '@theia/core/lib/common/nls';
+
+export const NotificationConfigSchema: PreferenceSchema = {
+    'type': 'object',
+    'properties': {
+        'notification.timeout': {
+            'type': 'number',
+            'description': nls.localize('theia/messages/notificationTimeout', 'Informative notifications will be hidden after this timeout.'),
+            'default': 30 * 1000 // `0` and negative values are treated as no timeout.
+        }
+    }
+};
+
+export interface NotificationConfiguration {
+    'notification.timeout': number
+}
+
+export const NotificationPreferenceContribution = Symbol('NotificationPreferenceContribution');
+export const NotificationPreferences = Symbol('NotificationPreferences');
+export type NotificationPreferences = PreferenceProxy<NotificationConfiguration>;
+
+export function createNotificationPreferences(preferences: PreferenceService, schema: PreferenceSchema = NotificationConfigSchema): NotificationPreferences {
+    return createPreferenceProxy(preferences, schema);
+}
+
+export function bindNotificationPreferences(bind: interfaces.Bind): void {
+    bind(NotificationPreferences).toDynamicValue(ctx => {
+        const preferences = ctx.container.get<PreferenceService>(PreferenceService);
+        const contribution = ctx.container.get<PreferenceContribution>(NotificationPreferenceContribution);
+        return createNotificationPreferences(preferences, contribution.schema);
+    }).inSingletonScope();
+    bind(NotificationPreferenceContribution).toConstantValue({ schema: NotificationConfigSchema });
+    bind(PreferenceContribution).toService(NotificationPreferenceContribution);
+}