#2695 fix review comments

Signed-off-by: Yevhen Vydolob <yvydolob@redhat.com>
eclipse-theia · Aug 29, 2018 · fc4f15e · fc4f15e
1 parent bc14826
commit fc4f15e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts b/packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts
@@ -14,9 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { BackendInitializationFn, createAPI, PluginMetadata } from '@theia/plugin-ext';
+import { BackendInitializationFn, createAPI, PluginMetadata, PluginManager } from '@theia/plugin-ext';
 
-export const doInitialization: BackendInitializationFn = (rpc: any, manager: any, pluginMetadata: PluginMetadata) => {
+export const doInitialization: BackendInitializationFn = (rpc: any, manager: PluginManager, pluginMetadata: PluginMetadata) => {
     const module = require('module');
     const vscodeModuleName = 'vscode';
     const vscode = createAPI(rpc, manager);

diff --git a/packages/plugin-ext/src/api/plugin-api.ts b/packages/plugin-ext/src/api/plugin-api.ts
@@ -40,7 +40,7 @@ export interface Plugin {
     pluginPath: string;
     initPath: string;
     model: PluginModel;
-    rowModel: PluginPackage;
+    rawModel: PluginPackage;
     lifecycle: PluginLifecycle;
 }
 

diff --git a/packages/plugin-ext/src/common/plugin-protocol.ts b/packages/plugin-ext/src/common/plugin-protocol.ts
@@ -361,7 +361,7 @@ export interface PluginLifecycle {
  * The export function of initialization module of backend plugin.
  */
 export interface BackendInitializationFn {
-    (rpc: RPCProtocol, manger: PluginManager, pluginMetadata: PluginMetadata): void;
+    (rpc: RPCProtocol, manager: PluginManager, pluginMetadata: PluginMetadata): void;
 }
 
 export interface BackendLoadingFn {

diff --git a/packages/plugin-ext/src/hosted/browser/worker/worker-main.ts b/packages/plugin-ext/src/hosted/browser/worker/worker-main.ts
@@ -56,10 +56,10 @@ const pluginManager = new PluginManagerExtImpl({
             return ctx[plugin.lifecycle.frontendModuleName];
         }
     },
-    init(raw: PluginMetadata[]): [Plugin[], Plugin[]] {
+    init(rawPluginData: PluginMetadata[]): [Plugin[], Plugin[]] {
         const result: Plugin[] = [];
         const foreign: Plugin[] = [];
-        for (const plg of raw) {
+        for (const plg of rawPluginData) {
             const pluginModel = plg.model;
             const pluginLifecycle = plg.lifecycle;
             if (pluginModel.entryPoint!.frontend) {
@@ -74,7 +74,7 @@ const pluginManager = new PluginManagerExtImpl({
                     initPath: frontendInitPath,
                     model: pluginModel,
                     lifecycle: pluginLifecycle,
-                    rowModel: plg.source
+                    rawModel: plg.source
                 };
                 result.push(plugin);
             } else {
@@ -83,7 +83,7 @@ const pluginManager = new PluginManagerExtImpl({
                     initPath: pluginLifecycle.backendInitPath!,
                     model: pluginModel,
                     lifecycle: pluginLifecycle,
-                    rowModel: plg.source
+                    rawModel: plg.source
                 });
             }
         }

diff --git a/packages/plugin-ext/src/hosted/node/plugin-host.ts b/packages/plugin-ext/src/hosted/node/plugin-host.ts
@@ -79,7 +79,7 @@ const pluginManager = new PluginManagerExtImpl({
                     initPath: backendInitPath,
                     model: pluginModel,
                     lifecycle: pluginLifecycle,
-                    rowModel: plg.source
+                    rawModel: plg.source
                 };
                 result.push(plugin);
             } else {
@@ -88,7 +88,7 @@ const pluginManager = new PluginManagerExtImpl({
                     initPath: pluginLifecycle.frontendInitPath!,
                     model: pluginModel,
                     lifecycle: pluginLifecycle,
-                    rowModel: plg.source
+                    rawModel: plg.source
                 });
             }
         }

diff --git a/packages/plugin-ext/src/plugin/plugin-context.ts b/packages/plugin-ext/src/plugin/plugin-context.ts
@@ -18,7 +18,7 @@ import { CommandRegistryImpl } from './command-registry';
 import { Emitter } from '@theia/core/lib/common/event';
 import { CancellationTokenSource } from '@theia/core/lib/common/cancellation';
 import { QuickOpenExtImpl } from './quick-open';
-import { MAIN_RPC_CONTEXT, Plugin as PPlugin, PluginManager } from '../api/plugin-api';
+import { MAIN_RPC_CONTEXT, Plugin as InternalPlugin, PluginManager } from '../api/plugin-api';
 import { RPCProtocol } from '../api/rpc-protocol';
 import { MessageRegistryExt } from './message-registry';
 import { StatusBarMessageRegistryExt } from './status-bar-message-registry';
@@ -339,10 +339,10 @@ class Plugin<T> implements theia.Plugin<T> {
     isActive: boolean;
     packageJSON: any;
     pluginType: theia.PluginType;
-    constructor(private readonly pluginManager: PluginManager, plugin: PPlugin) {
+    constructor(private readonly pluginManager: PluginManager, plugin: InternalPlugin) {
         this.id = plugin.model.id;
-        this.pluginPath = plugin.rowModel.packagePath;
-        this.packageJSON = plugin.rowModel;
+        this.pluginPath = plugin.rawModel.packagePath;
+        this.packageJSON = plugin.rawModel;
         this.isActive = true;
         this.pluginType = plugin.model.entryPoint.frontend ? 'frontend' : 'backend';
     }

diff --git a/packages/plugin-ext/src/plugin/plugin-manager.ts b/packages/plugin-ext/src/plugin/plugin-manager.ts
@@ -28,14 +28,14 @@ export interface PluginHost {
     init(data: PluginMetadata[]): [Plugin[], Plugin[]];
 }
 
-interface StopFun {
+interface StopFn {
     (): void;
 }
 
 class ActivatedPlugin {
     constructor(public readonly pluginContext: theia.PluginContext,
         public readonly exports?: PluginAPI,
-        public readonly stopFun?: StopFun) {
+        public readonly stopFun?: StopFn) {
     }
 }