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

package/src/browser/hosted-plugin-manager-client.ts

@@ -22,46 +22,50 @@ import { LabelProvider, isNative, AbstractDialog } from '@theia/core/lib/browser
 import { WindowService } from '@theia/core/lib/browser/window/window-service';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { FileDialogService } from '@theia/filesystem/lib/browser';
-import { HostedPluginServer } from '../common/plugin-dev-protocol';
+import { PluginDevServer } from '../common/plugin-dev-protocol';
 import { DebugPluginConfiguration, LaunchVSCodeArgument, LaunchVSCodeRequest, LaunchVSCodeResult } from '@theia/debug/lib/browser/debug-contribution';
 import { DebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
 import { HostedPluginPreferences } from './hosted-plugin-preferences';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { DebugSessionConnection } from '@theia/debug/lib/browser/debug-session-connection';
+import { nls } from '@theia/core/lib/common/nls';
 
 /**
  * Commands to control Hosted plugin instances.
  */
 export namespace HostedPluginCommands {
+    const HOSTED_PLUGIN_CATEGORY_KEY = 'theia/plugin-dev/hostedPlugin';
     const HOSTED_PLUGIN_CATEGORY = 'Hosted Plugin';
-    export const START: Command = {
+    export const START = Command.toLocalizedCommand({
         id: 'hosted-plugin:start',
         category: HOSTED_PLUGIN_CATEGORY,
         label: 'Start Instance'
-    };
+    }, 'theia/plugin-dev/startInstance', HOSTED_PLUGIN_CATEGORY_KEY);
 
-    export const DEBUG: Command = {
+    export const DEBUG = Command.toLocalizedCommand({
         id: 'hosted-plugin:debug',
         category: HOSTED_PLUGIN_CATEGORY,
         label: 'Debug Instance'
-    };
+    }, 'theia/plugin-dev/debugInstance', HOSTED_PLUGIN_CATEGORY_KEY);
 
-    export const STOP: Command = {
+    export const STOP = Command.toLocalizedCommand({
         id: 'hosted-plugin:stop',
         category: HOSTED_PLUGIN_CATEGORY,
         label: 'Stop Instance'
-    };
-    export const RESTART: Command = {
+    }, 'theia/plugin-dev/stopInstance', HOSTED_PLUGIN_CATEGORY_KEY);
+
+    export const RESTART = Command.toLocalizedCommand({
         id: 'hosted-plugin:restart',
         category: HOSTED_PLUGIN_CATEGORY,
         label: 'Restart Instance'
-    };
-    export const SELECT_PATH: Command = {
+    }, 'theia/plugin-dev/restartInstance', HOSTED_PLUGIN_CATEGORY_KEY);
+
+    export const SELECT_PATH = Command.toLocalizedCommand({
         id: 'hosted-plugin:select-path',
         category: HOSTED_PLUGIN_CATEGORY,
         label: 'Select Path'
-    };
+    }, 'theia/plugin-dev/selectPath', HOSTED_PLUGIN_CATEGORY_KEY);
 }
 
 /**
@@ -103,8 +107,8 @@ export class HostedPluginManagerClient {
         return this.stateChanged.event;
     }
 
-    @inject(HostedPluginServer)
-    protected readonly hostedPluginServer: HostedPluginServer;
+    @inject(PluginDevServer)
+    protected readonly hostedPluginServer: PluginDevServer;
     @inject(MessageService)
     protected readonly messageService: MessageService;
     @inject(LabelProvider)
@@ -143,7 +147,7 @@ export class HostedPluginManagerClient {
 
     async start(debugConfig?: DebugPluginConfiguration): Promise<void> {
         if (await this.hostedPluginServer.isHostedPluginInstanceRunning()) {
-            this.messageService.warn('Hosted instance is already running.');
+            this.messageService.warn(nls.localize('theia/plugin-dev/alreadyRunning', 'Hosted instance is already running.'));
             return;
         }
 
@@ -157,7 +161,7 @@ export class HostedPluginManagerClient {
 
         try {
             this.stateChanged.fire({ state: HostedInstanceState.STARTING, pluginLocation: this.pluginLocation });
-            this.messageService.info('Starting hosted instance server ...');
+            this.messageService.info(nls.localize('theia/plugin-dev/starting', 'Starting hosted instance server ...'));
 
             if (debugConfig) {
                 this.isDebug = true;
@@ -168,10 +172,10 @@ export class HostedPluginManagerClient {
             }
             await this.openPluginWindow();
 
-            this.messageService.info('Hosted instance is running at: ' + this.pluginInstanceURL);
+            this.messageService.info(`${nls.localize('theia/plugin-dev/running', 'Hosted instance is running at:')} ${this.pluginInstanceURL}`);
             this.stateChanged.fire({ state: HostedInstanceState.RUNNING, pluginLocation: this.pluginLocation });
         } catch (error) {
-            this.messageService.error('Failed to run hosted plugin instance: ' + this.getErrorMessage(error));
+            this.messageService.error(nls.localize('theia/plugin-dev/failed', 'Failed to run hosted plugin instance: {0}', this.getErrorMessage(error)));
             this.stateChanged.fire({ state: HostedInstanceState.FAILED, pluginLocation: this.pluginLocation });
             this.stop();
         }
@@ -199,7 +203,7 @@ export class HostedPluginManagerClient {
                 type: 'node',
                 request: 'attach',
                 timeout: 30000,
-                name: 'Hosted Plugin',
+                name: nls.localize('theia/plugin-dev/hostedPlugin', 'Hosted Plugin'),
                 smartStep: true,
                 sourceMaps: !!outFiles,
                 outFiles
@@ -209,13 +213,15 @@ export class HostedPluginManagerClient {
 
     async stop(checkRunning: boolean = true): Promise<void> {
         if (checkRunning && !await this.hostedPluginServer.isHostedPluginInstanceRunning()) {
-            this.messageService.warn('Hosted instance is not running.');
+            this.messageService.warn(nls.localize('theia/plugin-dev/notRunning', 'Hosted instance is not running.'));
             return;
         }
         try {
             this.stateChanged.fire({ state: HostedInstanceState.STOPPING, pluginLocation: this.pluginLocation! });
             await this.hostedPluginServer.terminateHostedPluginInstance();
-            this.messageService.info((this.pluginInstanceURL ? this.pluginInstanceURL : 'The instance') + ' has been terminated.');
+            this.messageService.info((this.pluginInstanceURL
+                ? nls.localize('theia/plugin-dev/instanceTerminated', '{0} has been terminated', this.pluginInstanceURL)
+                : nls.localize('theia/plugin-dev/unknownTerminated', 'The instance has been terminated')));
             this.stateChanged.fire({ state: HostedInstanceState.STOPPED, pluginLocation: this.pluginLocation! });
         } catch (error) {
             this.messageService.error(this.getErrorMessage(error));
@@ -226,7 +232,7 @@ export class HostedPluginManagerClient {
         if (await this.hostedPluginServer.isHostedPluginInstanceRunning()) {
             await this.stop(false);
 
-            this.messageService.info('Starting hosted instance server ...');
+            this.messageService.info(nls.localize('theia/plugin-dev/starting', 'Starting hosted instance server ...'));
 
             // It takes some time before OS released all resources e.g. port.
             // Keep trying to run hosted instance with delay.
@@ -243,7 +249,7 @@ export class HostedPluginManagerClient {
                         this.pluginInstanceURL = await this.hostedPluginServer.runHostedPluginInstance(this.pluginLocation!.toString());
                     }
                     await this.openPluginWindow();
-                    this.messageService.info('Hosted instance is running at: ' + this.pluginInstanceURL);
+                    this.messageService.info(`${nls.localize('theia/plugin-dev/running', 'Hosted instance is running at:')} ${this.pluginInstanceURL}`);
                     this.stateChanged.fire({
                         state: HostedInstanceState.RUNNING,
                         pluginLocation: this.pluginLocation!
@@ -254,11 +260,11 @@ export class HostedPluginManagerClient {
                     await new Promise(resolve => setTimeout(resolve, 500));
                 }
             }
-            this.messageService.error('Failed to run hosted plugin instance: ' + this.getErrorMessage(lastError));
+            this.messageService.error(nls.localize('theia/plugin-dev/failed', 'Failed to run hosted plugin instance: {0}', this.getErrorMessage(lastError)));
             this.stateChanged.fire({ state: HostedInstanceState.FAILED, pluginLocation: this.pluginLocation! });
             this.stop();
         } else {
-            this.messageService.warn('Hosted Plugin instance was not running.');
+            this.messageService.warn(nls.localize('theia/plugin-dev/notRunning', 'Hosted instance is not running.'));
             this.start();
         }
     }
@@ -274,7 +280,7 @@ export class HostedPluginManagerClient {
 
         const result = await this.fileDialogService.showOpenDialog({
             title: HostedPluginCommands.SELECT_PATH.label!,
-            openLabel: 'Select',
+            openLabel: nls.localize('theia/plugin-dev/select', 'Select'),
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false
@@ -283,9 +289,9 @@ export class HostedPluginManagerClient {
         if (result) {
             if (await this.hostedPluginServer.isPluginValid(result.toString())) {
                 this.pluginLocation = result;
-                this.messageService.info('Plugin folder is set to: ' + this.labelProvider.getLongName(result));
+                this.messageService.info(nls.localize('theia/plugin-dev/pluginFolder', 'Plugin folder is set to: {0}', this.labelProvider.getLongName(result)));
             } else {
-                this.messageService.error('Specified folder does not contain valid plugin.');
+                this.messageService.error(nls.localize('theia/plugin-dev/noValidPlugin', 'Specified folder does not contain valid plugin.'));
             }
         }
     }
@@ -386,7 +392,7 @@ class OpenHostedInstanceLinkDialog extends AbstractDialog<string> {
 
     constructor(windowService: WindowService) {
         super({
-            title: 'Your browser prevented opening of a new tab'
+            title: nls.localize('theia/plugin-dev/preventedNewTab', 'Your browser prevented opening of a new tab')
         });
         this.windowService = windowService;
 
@@ -396,7 +402,7 @@ class OpenHostedInstanceLinkDialog extends AbstractDialog<string> {
         this.contentNode.appendChild(this.linkNode);
 
         const messageNode = document.createElement('div');
-        messageNode.innerText = 'Hosted instance is started at: ';
+        messageNode.innerText = nls.localize('theia/plugin-dev/running', 'Hosted instance is running at:') + ' ';
         messageNode.appendChild(this.linkNode);
         this.contentNode.appendChild(messageNode);
 

package/src/browser/hosted-plugin-preferences.ts

@@ -16,18 +16,19 @@
 
 import { interfaces } from '@theia/core/shared/inversify';
 import { createPreferenceProxy, PreferenceProxy, PreferenceService, PreferenceContribution, PreferenceSchema } from '@theia/core/lib/browser';
+import { nls } from '@theia/core/lib/common/nls';
 
 export const HostedPluginConfigSchema: PreferenceSchema = {
     'type': 'object',
     properties: {
         'hosted-plugin.watchMode': {
             type: 'boolean',
-            description: 'Run watcher on plugin under development',
+            description: nls.localize('theia/plugin-dev/watchMode', 'Run watcher on plugin under development'),
             default: true
         },
         'hosted-plugin.debugMode': {
             type: 'string',
-            description: 'Using inspect or inspect-brk for Node.js debug',
+            description: nls.localize('theia/plugin-dev/debugMode', 'Using inspect or inspect-brk for Node.js debug'),
             default: 'inspect',
             enum: ['inspect', 'inspect-brk']
         },
@@ -36,7 +37,10 @@ export const HostedPluginConfigSchema: PreferenceSchema = {
             items: {
                 type: 'string'
             },
-            description: 'Array of glob patterns for locating generated JavaScript files (`${pluginPath}` will be replaced by plugin actual path).',
+            description: nls.localize(
+                'theia/plugin-dev/launchOutFiles',
+                'Array of glob patterns for locating generated JavaScript files (`${pluginPath}` will be replaced by plugin actual path).'
+            ),
             default: ['${pluginPath}/out/**/*.js']
         }
     }

package/src/browser/plugin-dev-frontend-module.ts

@@ -23,8 +23,7 @@ import { ContainerModule } from '@theia/core/shared/inversify';
 import { FrontendApplicationContribution, WebSocketConnectionProvider } from '@theia/core/lib/browser';
 import { HostedPluginFrontendContribution } from './hosted-plugin-frontend-contribution';
 import { CommandContribution } from '@theia/core/lib/common/command';
-import { HostedPluginServer, hostedServicePath } from '../common/plugin-dev-protocol';
-import { HostedPluginWatcher } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin-watcher';
+import { PluginDevServer, pluginDevServicePath } from '../common/plugin-dev-protocol';
 import { DebugContribution } from '@theia/debug/lib/browser/debug-contribution';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
@@ -39,9 +38,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(HostedPluginFrontendContribution).toSelf().inSingletonScope();
     bind(CommandContribution).toService(HostedPluginFrontendContribution);
 
-    bind(HostedPluginServer).toDynamicValue(ctx => {
+    bind(PluginDevServer).toDynamicValue(ctx => {
         const connection = ctx.container.get(WebSocketConnectionProvider);
-        const hostedWatcher = ctx.container.get(HostedPluginWatcher);
-        return connection.createProxy<HostedPluginServer>(hostedServicePath, hostedWatcher.getHostedPluginClient());
+        return connection.createProxy<PluginDevServer>(pluginDevServicePath);
     }).inSingletonScope();
 });

package/src/common/plugin-dev-protocol.ts

@@ -15,12 +15,13 @@
  ********************************************************************************/
 
 import { JsonRpcServer } from '@theia/core/lib/common/messaging/proxy-factory';
+// eslint-disable-next-line @theia/runtime-import-check
 import { DebugPluginConfiguration } from '@theia/debug/lib/browser/debug-contribution';
 import { PluginMetadata } from '@theia/plugin-ext/lib/common/plugin-protocol';
 
-export const hostedServicePath = '/services/plugin-dev';
-export const HostedPluginServer = Symbol('HostedPluginServer');
-export interface HostedPluginServer extends JsonRpcServer<HostedPluginClient> {
+export const pluginDevServicePath = '/services/plugin-dev';
+export const PluginDevServer = Symbol('PluginDevServer');
+export interface PluginDevServer extends JsonRpcServer<PluginDevClient> {
     getHostedPlugin(): Promise<PluginMetadata | undefined>;
     runHostedPluginInstance(uri: string): Promise<string>;
     runDebugHostedPluginInstance(uri: string, debugConfig: DebugPluginConfiguration): Promise<string>;
@@ -36,5 +37,5 @@ export interface HostedPluginServer extends JsonRpcServer<HostedPluginClient> {
     isPluginValid(uri: string): Promise<boolean>;
 }
 
-export interface HostedPluginClient {
+export interface PluginDevClient {
 }

package/src/node/hosted-instance-manager.ts

@@ -29,6 +29,7 @@ import { FileUri } from '@theia/core/lib/node/file-uri';
 import { LogType } from '@theia/plugin-ext/lib/common/types';
 import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/node/hosted-plugin';
 import { MetadataScanner } from '@theia/plugin-ext/lib/hosted/node/metadata-scanner';
+// eslint-disable-next-line @theia/runtime-import-check
 import { DebugPluginConfiguration } from '@theia/debug/lib/browser/debug-contribution';
 import { HostedPluginProcess } from '@theia/plugin-ext/lib/hosted/node/hosted-plugin-process';
 

package/src/node/plugin-dev-backend-module.ts

@@ -20,17 +20,17 @@ import { HostedPluginsManager, HostedPluginsManagerImpl } from './hosted-plugins
 import { ContainerModule, interfaces } from '@theia/core/shared/inversify';
 import { ConnectionContainerModule } from '@theia/core/lib/node/messaging/connection-container-module';
 import { bindContributionProvider } from '@theia/core/lib/common/contribution-provider';
-import { HostedPluginServerImpl } from './hosted-plugin-service';
-import { HostedPluginServer, HostedPluginClient, hostedServicePath } from '../common/plugin-dev-protocol';
+import { PluginDevServerImpl } from './plugin-dev-service';
+import { PluginDevServer, PluginDevClient, pluginDevServicePath } from '../common/plugin-dev-protocol';
 import { HostedPluginReader } from './hosted-plugin-reader';
 import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
 
 const commonHostedConnectionModule = ConnectionContainerModule.create(({ bind, bindBackendService }) => {
     bind(HostedPluginsManagerImpl).toSelf().inSingletonScope();
     bind(HostedPluginsManager).toService(HostedPluginsManagerImpl);
-    bind(HostedPluginServerImpl).toSelf().inSingletonScope();
-    bind(HostedPluginServer).toService(HostedPluginServerImpl);
-    bindBackendService<HostedPluginServer, HostedPluginClient>(hostedServicePath, HostedPluginServer, (server, client) => {
+    bind(PluginDevServerImpl).toSelf().inSingletonScope();
+    bind(PluginDevServer).toService(PluginDevServerImpl);
+    bindBackendService<PluginDevServer, PluginDevClient>(pluginDevServicePath, PluginDevServer, (server, client) => {
         server.setClient(client);
         client.onDidCloseConnection(() => server.dispose());
         return server;

package/src/node/{hosted-plugin-service.ts → plugin-dev-service.ts}

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { HostedPluginServer, HostedPluginClient } from '../common/plugin-dev-protocol';
+import { PluginDevServer, PluginDevClient } from '../common/plugin-dev-protocol';
 import { injectable, inject } from '@theia/core/shared/inversify';
 import { HostedInstanceManager } from './hosted-instance-manager';
 import { PluginMetadata } from '@theia/plugin-ext/lib/common/plugin-protocol';
@@ -22,10 +22,11 @@ import URI from '@theia/core/lib/common/uri';
 import { HostedPluginReader } from './hosted-plugin-reader';
 import { HostedPluginsManager } from './hosted-plugins-manager';
 import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/node/hosted-plugin';
+// eslint-disable-next-line @theia/runtime-import-check
 import { DebugPluginConfiguration } from '@theia/debug/lib/browser/debug-contribution';
 
 @injectable()
-export class HostedPluginServerImpl implements HostedPluginServer {
+export class PluginDevServerImpl implements PluginDevServer {
 
     @inject(HostedPluginsManager)
     protected readonly hostedPluginsManager: HostedPluginsManager;
@@ -45,7 +46,7 @@ export class HostedPluginServerImpl implements HostedPluginServer {
             this.hostedInstanceManager.terminate();
         }
     }
-    setClient(client: HostedPluginClient): void {
+    setClient(client: PluginDevClient): void {
 
     }
 

package/lib/node/hosted-plugin-service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"hosted-plugin-service.d.ts","sourceRoot":"","sources":["../../src/node/hosted-plugin-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAC9E,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,OAAO,EAAE,wBAAwB,EAAE,MAAM,6CAA6C,CAAC;AAEvF,qBACa,sBAAuB,YAAW,kBAAkB;IAG7D,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAG9D,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGhE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;IAG5C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IAEnD,OAAO,IAAI,IAAI;IAMf,SAAS,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI;IAIrC,eAAe,IAAI,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAQ5D,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI5C,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrD,4BAA4B,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC;IAIjG,6BAA6B,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9C,6BAA6B,IAAI,OAAO,CAAC,OAAO,CAAC;IAIjD,0BAA0B,IAAI,OAAO,CAAC,MAAM,CAAC;IAI7C,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIrC,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAQjE,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjD,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAG5D"}

package/lib/node/hosted-plugin-service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"hosted-plugin-service.js","sourceRoot":"","sources":["../../src/node/hosted-plugin-service.ts"],"names":[],"mappings":"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"}