@theia/plugin-ext 1.18.0-next.de7b81be → 1.20.0

package/src/hosted/node/plugin-manifest-loader.ts

@@ -14,68 +14,16 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 import * as path from 'path';
 import * as fs from '@theia/core/shared/fs-extra';
 
-const NLS_REGEX = /^%([\w\d.-]+)%$/i;
-
-export async function loadManifest(pluginPath: string, locale?: string): Promise<any> {
-    const [manifest, translations] = await Promise.all([
-        fs.readJson(path.join(pluginPath, 'package.json')),
-        loadTranslations(pluginPath, locale)
-    ]);
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function loadManifest(pluginPath: string): Promise<any> {
+    const manifest = await fs.readJson(path.join(pluginPath, 'package.json'));
     // translate vscode builtins, as they are published with a prefix. See https://github.com/theia-ide/vscode-builtin-extensions/blob/master/src/republish.js#L50
     const built_prefix = '@theia/vscode-builtin-';
     if (manifest && manifest.name && manifest.name.startsWith(built_prefix)) {
         manifest.name = manifest.name.substr(built_prefix.length);
     }
-    return manifest && translations && Object.keys(translations).length ?
-        localize(manifest, translations) :
-        manifest;
-}
-
-async function loadTranslations(pluginPath: string, locale?: string): Promise<any> {
-    try {
-        const localizedPluginPath = path.join(pluginPath, `package.nls.${locale}.json`);
-        if (await fs.pathExists(localizedPluginPath)) {
-            return await fs.readJson(localizedPluginPath);
-        } else {
-            return await fs.readJson(path.join(pluginPath, 'package.nls.json'));
-        }
-    } catch (e) {
-        if (e.code !== 'ENOENT') {
-            throw e;
-        }
-        return {};
-    }
-}
-
-function localize(value: any, translations: {
-    [key: string]: string
-}): any {
-    if (typeof value === 'string') {
-        const match = NLS_REGEX.exec(value);
-        return match && translations[match[1]] || value;
-    }
-    if (Array.isArray(value)) {
-        const result = [];
-        for (const item of value) {
-            result.push(localize(item, translations));
-        }
-        return result;
-    }
-    if (value === null) {
-        return value;
-    }
-    if (typeof value === 'object') {
-        const result: { [key: string]: any } = {};
-        // eslint-disable-next-line guard-for-in
-        for (const propertyName in value) {
-            result[propertyName] = localize(value[propertyName], translations);
-        }
-        return result;
-    }
-    return value;
+    return manifest;
 }

package/src/hosted/node/plugin-service.ts

@@ -16,13 +16,11 @@
 import { injectable, inject, named, postConstruct } from '@theia/core/shared/inversify';
 import { HostedPluginServer, HostedPluginClient, PluginDeployer, GetDeployedPluginsParams, DeployedPlugin } from '../../common/plugin-protocol';
 import { HostedPluginSupport } from './hosted-plugin';
-import { ILogger, Disposable } from '@theia/core';
-import { ContributionProvider } from '@theia/core';
+import { ILogger, Disposable, ContributionProvider } from '@theia/core';
 import { ExtPluginApiProvider, ExtPluginApi } from '../../common/plugin-ext-api-contribution';
 import { HostedPluginDeployerHandler } from './hosted-plugin-deployer-handler';
 import { PluginDeployerImpl } from '../../main/node/plugin-deployer-impl';
-import { LocalizationProvider } from '@theia/core/lib/node/i18n/localization-provider';
-import { loadManifest } from './plugin-manifest-loader';
+import { HostedPluginLocalizationService } from './hosted-plugin-localization-service';
 
 @injectable()
 export class HostedPluginServerImpl implements HostedPluginServer {
@@ -35,8 +33,8 @@ export class HostedPluginServerImpl implements HostedPluginServer {
     @inject(PluginDeployer)
     protected readonly pluginDeployer: PluginDeployerImpl;
 
-    @inject(LocalizationProvider)
-    protected readonly localizationProvider: LocalizationProvider;
+    @inject(HostedPluginLocalizationService)
+    protected readonly localizationService: HostedPluginLocalizationService;
 
     @inject(ContributionProvider)
     @named(Symbol.for(ExtPluginApiProvider))
@@ -90,8 +88,7 @@ export class HostedPluginServerImpl implements HostedPluginServer {
         if (!pluginIds.length) {
             return [];
         }
-        const locale = this.localizationProvider.getCurrentLanguage();
-        const plugins = [];
+        const plugins: DeployedPlugin[] = [];
         let extraDeployedPlugins: Map<string, DeployedPlugin> | undefined;
         for (const pluginId of pluginIds) {
             let plugin = this.deployerHandler.getDeployedPlugin(pluginId);
@@ -105,10 +102,10 @@ export class HostedPluginServerImpl implements HostedPluginServer {
                 plugin = extraDeployedPlugins.get(pluginId);
             }
             if (plugin) {
-                plugins.push(await this.localizePlugin(plugin, locale));
+                plugins.push(plugin);
             }
         }
-        return plugins;
+        return Promise.all(plugins.map(plugin => this.localizationService.localizePlugin(plugin)));
     }
 
     onMessage(pluginHostId: string, message: string): Promise<void> {
@@ -119,34 +116,4 @@ export class HostedPluginServerImpl implements HostedPluginServer {
     getExtPluginAPI(): Promise<ExtPluginApi[]> {
         return Promise.resolve(this.extPluginAPIContributions.getContributions().map(p => p.provideApi()));
     }
-
-    protected async localizePlugin(plugin: DeployedPlugin, locale: string): Promise<DeployedPlugin> {
-        const packagePath = plugin.metadata.model.packagePath;
-        const translatedManifest = await loadManifest(packagePath, locale);
-        this.mergeContributes(plugin.contributes, translatedManifest.contributes);
-        return plugin;
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected mergeContributes(main: any, other: any): void {
-        if (main && other) {
-            if (Array.isArray(main) && Array.isArray(other)) {
-                for (let i = 0; i < main.length && i < other.length; i++) {
-                    if (typeof main[i] === 'object' && typeof other[i] === 'object') {
-                        this.mergeContributes(main[i], other[i]);
-                    }
-                }
-            } else {
-                for (const [key, value] of Object.entries(main)) {
-                    if (key in other) {
-                        if (typeof value === 'string') {
-                            main[key] = other[key];
-                        } else if (typeof value === 'object' && typeof other[key] === 'object') {
-                            this.mergeContributes(main[key], other[key]);
-                        }
-                    }
-                }
-            }
-        }
-    }
 }

package/src/hosted/node/scanners/scanner-theia.ts

@@ -73,7 +73,7 @@ import {
     ProblemPatternContribution,
     TaskDefinition
 } from '@theia/task/lib/common/task-protocol';
-import { ColorDefinition } from '@theia/core/lib/browser/color-registry';
+import { ColorDefinition } from '@theia/core/lib/common/color';
 import { ResourceLabelFormatter } from '@theia/core/lib/common/label-protocol';
 import { PluginUriFactory } from './plugin-uri-factory';
 
@@ -217,7 +217,7 @@ export class TheiaPluginScanner implements PluginScanner {
 
                 for (const location of Object.keys(viewsContainers)) {
                     const containers = this.readViewsContainers(viewsContainers[location], rawPlugin);
-                    const loc = location === 'activitybar' ? 'left' : location;
+                    const loc = location === 'activitybar' ? 'left' : location === 'panel' ? 'bottom' : location;
                     if (contributions.viewsContainers[loc]) {
                         contributions.viewsContainers[loc] = contributions.viewsContainers[loc].concat(containers);
                     } else {
@@ -381,6 +381,7 @@ export class TheiaPluginScanner implements PluginScanner {
             throw new Error(`Could not read json file '${packageTranslation.path}'.`);
         }
         translation.id = packageTranslation.id;
+        translation.path = packageTranslation.path;
         return translation;
     }
 

package/src/main/browser/callhierarchy/callhierarchy-type-converters.ts

@@ -151,7 +151,9 @@ export function toDefinition(definition: model.CallHierarchyDefinition | undefin
         selectionRange: toRange(definition.selectionRange),
         symbolName: definition.name,
         symbolKind: SymbolKindConverter.toSymbolKind(definition.kind),
-        containerName: undefined
+        containerName: undefined,
+        tags: definition.tags,
+        data: definition.data,
     };
 }
 
@@ -161,7 +163,9 @@ export function fromDefinition(definition: CallHierarchyDefinition): model.CallH
         range: fromRange(definition.location.range),
         selectionRange: fromRange(definition.selectionRange),
         name: definition.symbolName,
-        kind: SymbolKindConverter.fromSymbolKind(definition.symbolKind)
+        kind: SymbolKindConverter.fromSymbolKind(definition.symbolKind),
+        tags: definition.tags,
+        data: definition.data,
     };
 }
 

package/src/main/browser/custom-editors/custom-editor-opener.tsx

@@ -17,9 +17,8 @@
 import { inject } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { ApplicationShell, OpenerOptions, OpenHandler, Widget, WidgetManager } from '@theia/core/lib/browser';
-import { CustomEditorPriority, CustomEditorSelector } from '../../../common';
+import { CustomEditor, CustomEditorPriority, CustomEditorSelector } from '../../../common';
 import * as glob from './glob';
-import { CustomEditor } from '../../../common';
 import { CustomEditorWidget } from './custom-editor-widget';
 import { v4 } from 'uuid';
 import { Emitter } from '@theia/core';
@@ -56,7 +55,8 @@ export class CustomEditorOpener implements OpenHandler {
         switch (this.editor.priority) {
             case CustomEditorPriority.default: return 500;
             case CustomEditorPriority.builtin: return 400;
-            case CustomEditorPriority.option: return 300;
+            /** `option` should not open the custom-editor by default. */
+            case CustomEditorPriority.option: return 1;
             default: return 200;
         }
     }

package/src/main/browser/custom-editors/custom-editors-main.ts

@@ -20,7 +20,7 @@
 // some code copied and modified from https://github.com/microsoft/vscode/blob/53eac52308c4611000a171cc7bf1214293473c78/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
 
 import { interfaces } from '@theia/core/shared/inversify';
-import { MAIN_RPC_CONTEXT, CustomEditorsMain, CustomEditorsExt, CustomTextEditorCapabilities } from '../../../common/plugin-api-rpc';
+import { MAIN_RPC_CONTEXT, CustomEditorsMain, CustomEditorsExt, CustomTextEditorCapabilities, EditorPosition } from '../../../common/plugin-api-rpc';
 import { RPCProtocol } from '../../../common/rpc-protocol';
 import { HostedPluginSupport } from '../../../hosted/browser/hosted-plugin';
 import { PluginCustomEditorRegistry } from './plugin-custom-editor-registry';
@@ -43,7 +43,6 @@ import { ApplicationShell, DefaultUriLabelProviderContribution, Saveable, SaveOp
 import { WebviewOptions, WebviewPanelOptions, ViewColumn } from '@theia/plugin';
 import { WebviewWidgetIdentifier } from '../webview/webview';
 import { EditorPreferences } from '@theia/editor/lib/browser';
-import { EditorPosition } from '../../../common/plugin-api-rpc';
 
 const enum CustomEditorModelType {
     Custom,

package/src/main/browser/debug/debug-main.ts

@@ -38,7 +38,7 @@ import { DebugProtocol } from 'vscode-debugprotocol';
 import { DebugConfigurationManager } from '@theia/debug/lib/browser/debug-configuration-manager';
 import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
 import { MessageClient } from '@theia/core/lib/common/message-service-protocol';
-import { OutputChannelManager } from '@theia/output/lib/common/output-channel';
+import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
 import { DebugPreferences } from '@theia/debug/lib/browser/debug-preferences';
 import { PluginDebugAdapterContribution } from './plugin-debug-adapter-contribution';
 import { PluginDebugSessionContributionRegistrator, PluginDebugSessionContributionRegistry } from './plugin-debug-session-contribution-registry';

package/src/main/browser/debug/plugin-debug-adapter-contribution.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { DebugExt, } from '../../../common/plugin-api-rpc';
+import { DebugExt } from '../../../common/plugin-api-rpc';
 import { DebugConfiguration } from '@theia/debug/lib/common/debug-configuration';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { DebuggerDescription } from '@theia/debug/lib/common/debug-service';
@@ -37,8 +37,8 @@ export class PluginDebugAdapterContribution {
         return this.description.label;
     }
 
-    async provideDebugConfigurations(workspaceFolderUri: string | undefined): Promise<DebugConfiguration[]> {
-        return this.debugExt.$provideDebugConfigurations(this.type, workspaceFolderUri);
+    async provideDebugConfigurations(workspaceFolderUri: string | undefined, dynamic: boolean = false): Promise<DebugConfiguration[]> {
+        return this.debugExt.$provideDebugConfigurations(this.type, workspaceFolderUri, dynamic);
     }
 
     async resolveDebugConfiguration(config: DebugConfiguration, workspaceFolderUri: string | undefined): Promise<DebugConfiguration | undefined> {

package/src/main/browser/debug/plugin-debug-service.ts

@@ -25,6 +25,7 @@ import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { DebuggerContribution } from '../../../common/plugin-protocol';
 import { DebugRequestTypes } from '@theia/debug/lib/browser/debug-session-connection';
 import * as theia from '@theia/plugin';
+
 /**
  * Debug adapter contribution registrator.
  */
@@ -111,6 +112,28 @@ export class PluginDebugService implements DebugService, PluginDebugAdapterContr
         }
     }
 
+    async provideDynamicDebugConfigurations(): Promise<{ type: string, configurations: DebugConfiguration[] }[]> {
+        const result: Promise<{ type: string, configurations: theia.DebugConfiguration[] }>[] = [];
+
+        for (const [type, contributor] of this.contributors.entries()) {
+            const typeConfigurations = this.resolveDynamicConfigurationsForType(type, contributor);
+            result.push(typeConfigurations);
+        }
+
+        return Promise.all(result);
+    }
+
+    protected async resolveDynamicConfigurationsForType(
+        type: string,
+        contributor: PluginDebugAdapterContribution): Promise<{ type: string, configurations: DebugConfiguration[] }> {
+
+        const configurations = await contributor.provideDebugConfigurations(undefined, true);
+        for (const configuration of configurations) {
+            configuration.dynamic = true;
+        }
+        return { type, configurations };
+    }
+
     async resolveDebugConfiguration(config: DebugConfiguration, workspaceFolderUri: string | undefined): Promise<DebugConfiguration> {
         let resolved = config;
 

package/src/main/browser/debug/plugin-debug-session-factory.ts

@@ -14,13 +14,13 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { DefaultDebugSessionFactory, } from '@theia/debug/lib/browser/debug-session-contribution';
+import { DefaultDebugSessionFactory } from '@theia/debug/lib/browser/debug-session-contribution';
 import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
 import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
 import { BreakpointManager } from '@theia/debug/lib/browser/breakpoint/breakpoint-manager';
 import { LabelProvider } from '@theia/core/lib/browser/label-provider';
 import { MessageClient } from '@theia/core/lib/common/message-service-protocol';
-import { OutputChannelManager } from '@theia/output/lib/common/output-channel';
+import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
 import { DebugPreferences } from '@theia/debug/lib/browser/debug-preferences';
 import { DebugSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
 import { DebugSession } from '@theia/debug/lib/browser/debug-session';
@@ -30,7 +30,7 @@ import { TerminalWidgetOptions, TerminalWidget } from '@theia/terminal/lib/brows
 import { TerminalOptionsExt } from '../../../common/plugin-api-rpc';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { DebugContribution } from '@theia/debug/lib/browser/debug-contribution';
-import { ContributionProvider } from '@theia/core';
+import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
 
 export class PluginDebugSession extends DebugSession {
     constructor(

package/src/main/browser/dialogs/modal-notification.ts

@@ -18,7 +18,8 @@ import { Message } from '@theia/core/shared/@phosphor/messaging';
 import { codiconArray, Key } from '@theia/core/lib/browser';
 import { AbstractDialog } from '@theia/core/lib/browser/dialogs';
 import '../../../../src/main/browser/dialogs/style/modal-notification.css';
-import { MainMessageItem } from '../../../common/plugin-api-rpc';
+import { MainMessageItem, MainMessageOptions } from '../../../common/plugin-api-rpc';
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
 
 export enum MessageType {
     Error = 'error',
@@ -29,6 +30,7 @@ export enum MessageType {
 const NOTIFICATION = 'modal-Notification';
 const ICON = 'icon';
 const TEXT = 'text';
+const DETAIL = 'detail';
 
 @injectable()
 export class ModalNotification extends AbstractDialog<string | undefined> {
@@ -36,7 +38,7 @@ export class ModalNotification extends AbstractDialog<string | undefined> {
     protected actionTitle: string | undefined;
 
     constructor() {
-        super({ title: 'Theia' });
+        super({ title: FrontendApplicationConfigProvider.get().applicationName });
     }
 
     protected onCloseRequest(msg: Message): void {
@@ -48,12 +50,12 @@ export class ModalNotification extends AbstractDialog<string | undefined> {
         return this.actionTitle;
     }
 
-    showDialog(messageType: MessageType, text: string, actions: MainMessageItem[]): Promise<string | undefined> {
-        this.contentNode.appendChild(this.createMessageNode(messageType, text, actions));
+    showDialog(messageType: MessageType, text: string, options: MainMessageOptions, actions: MainMessageItem[]): Promise<string | undefined> {
+        this.contentNode.appendChild(this.createMessageNode(messageType, text, options, actions));
         return this.open();
     }
 
-    protected createMessageNode(messageType: MessageType, text: string, actions: MainMessageItem[]): HTMLElement {
+    protected createMessageNode(messageType: MessageType, text: string, options: MainMessageOptions, actions: MainMessageItem[]): HTMLElement {
         const messageNode = document.createElement('div');
         messageNode.classList.add(NOTIFICATION);
 
@@ -67,6 +69,13 @@ export class ModalNotification extends AbstractDialog<string | undefined> {
         const textElement = textContainer.appendChild(document.createElement('p'));
         textElement.textContent = text;
 
+        if (options.detail) {
+            const detailContainer = textContainer.appendChild(document.createElement('div'));
+            detailContainer.classList.add(DETAIL);
+            const detailElement = detailContainer.appendChild(document.createElement('p'));
+            detailElement.textContent = options.detail;
+        }
+
         actions.forEach((action: MainMessageItem) => {
             const button = this.createButton(action.title);
             button.classList.add('main');
@@ -79,8 +88,10 @@ export class ModalNotification extends AbstractDialog<string | undefined> {
                 },
                 'click');
         });
-        if (!actions.some(action => action.isCloseAffordance === true)) {
-            this.appendCloseButton('close');
+        if (actions.length <= 0) {
+            this.appendAcceptButton();
+        } else if (!actions.some(action => action.isCloseAffordance === true)) {
+            this.appendCloseButton('Close');
         }
 
         return messageNode;

package/src/main/browser/dialogs/style/modal-notification.css

@@ -42,10 +42,10 @@
     order: 1;
 }
 
-.modal-Notification .icon .fa {
+.modal-Notification .icon .codicon {
     line-height: inherit;
     vertical-align: middle;
-    font-size: 120%;
+    font-size: calc(var(--theia-ui-padding)*5);
     color: var(--theia-editorInfo-foreground);
 }
 
@@ -106,3 +106,18 @@
 .modal-Notification .buttons > button:hover {
     background-color: var(--theia-button-hoverBackground);
 }
+
+.modal-Notification .detail {
+    align-self: center;
+    order: 3;
+    flex: 1 100%;
+    color: var(--theia-descriptionForeground);
+}
+
+.modal-Notification .detail > p {
+    margin: calc(var(--theia-ui-padding) * 2) 0px 0px 0px;
+}
+
+.modal-Notification .text {
+    padding: calc(var(--theia-ui-padding)*1.5);
+}

package/src/main/browser/editors-and-documents-main.ts

@@ -29,8 +29,7 @@ import { EditorModelService } from './text-editor-model-service';
 import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
 import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
 import { TextEditorMain } from './text-editor-main';
-import { Emitter } from '@theia/core';
-import { DisposableCollection } from '@theia/core';
+import { DisposableCollection, Emitter } from '@theia/core';
 import { EditorManager, EditorWidget } from '@theia/editor/lib/browser';
 
 export class EditorsAndDocumentsMain implements Disposable {

package/src/main/browser/languages-main.ts

@@ -774,7 +774,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
             selector: language,
             getRootDefinition: (uri: DocumentUri, position: Position, cancellationToken: CancellationToken) =>
                 this.proxy.$provideRootDefinition(handle, toUriComponents(uri), fromPosition(position), cancellationToken)
-                    .then(def => toDefinition(def)),
+                    .then(def => Array.isArray(def) ? def.map(item => toDefinition(item)) : toDefinition(def)),
             getCallers: (definition: Definition, cancellationToken: CancellationToken) => this.proxy.$provideCallers(handle, fromDefinition(definition), cancellationToken)
                 .then(result => {
                     if (!result) {

package/src/main/browser/message-registry-main.ts

@@ -40,7 +40,7 @@ export class MessageRegistryMainImpl implements MessageRegistryMain {
                 type === MainMessageType.Warning ? MessageType.Warning :
                     MessageType.Info;
             const modalNotification = new ModalNotification();
-            return modalNotification.showDialog(messageType, message, actions);
+            return modalNotification.showDialog(messageType, message, options, actions);
         }
         switch (type) {
             case MainMessageType.Info:

package/src/main/browser/quick-open-main.ts

@@ -194,7 +194,7 @@ export class QuickOpenMainImpl implements QuickOpenMain, Disposable {
 
     private sessions = new Map<number, QuickInputSession>();
 
-    $createOrUpdate<T extends theia.QuickPickItem>(params: TransferQuickInput<T>): Promise<void> {
+    $createOrUpdate<T extends theia.QuickPickItem>(params: TransferQuickInput): Promise<void> {
         const sessionId = params.id;
         let session = this.sessions.get(sessionId);
         if (!session) {

package/src/main/browser/style/tree.css

@@ -40,3 +40,7 @@
     margin-bottom: 10px;
     margin-left: 17px;
 }
+
+.theia-tree-view .theia-TreeNode:not(:hover):not(.theia-mod-selected) .theia-tree-view-inline-action {
+    display: none;
+}

package/src/main/browser/tasks-main.ts

@@ -97,6 +97,13 @@ export class TasksMainImpl implements TasksMain, Disposable {
                 this.proxy.$onDidEndTaskProcess(event.code, event.taskId);
             }
         }));
+
+        // Inform proxy about running tasks form previous session
+        this.$taskExecutions().then(executions => {
+            if (executions.length > 0) {
+                this.proxy.$initLoadedTasks(executions);
+            }
+        });
     }
 
     dispose(): void {

package/src/main/browser/timeline-main.ts

@@ -14,12 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { interfaces } from '@theia/core/shared/inversify';
-import { TimelineMain } from '../../common/plugin-api-rpc';
+import { MAIN_RPC_CONTEXT, TimelineExt, TimelineMain } from '../../common/plugin-api-rpc';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { TimelineService } from '@theia/timeline/lib/browser/timeline-service';
 import { Emitter } from '@theia/core/lib/common';
 import { URI } from '@theia/core/shared/vscode-uri';
-import { MAIN_RPC_CONTEXT, TimelineExt } from '../../common/plugin-api-rpc';
 import {
     InternalTimelineOptions,
     Timeline,