Pass pluginInfo through to output channel append method

Signed-off-by: Josh Pinkney <joshpinkney@gmail.com>
eclipse-theia · Oct 10, 2019 · ef08840 · ef08840
1 parent 54f646c
commit ef08840
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/packages/plugin-ext/src/common/plugin-api-rpc.ts b/packages/plugin-ext/src/common/plugin-api-rpc.ts
@@ -993,7 +993,7 @@ export interface PreferenceRegistryExt {
 }
 
 export interface OutputChannelRegistryMain {
-    $append(channelName: string, value: string): PromiseLike<void>;
+    $append(channelName: string, value: string, pluginInfo: PluginInfo): PromiseLike<void>;
     $clear(channelName: string): PromiseLike<void>;
     $dispose(channelName: string): PromiseLike<void>;
     $reveal(channelName: string, preserveFocus: boolean): PromiseLike<void>;

diff --git a/packages/plugin-ext/src/main/browser/output-channel-registry-main.ts b/packages/plugin-ext/src/main/browser/output-channel-registry-main.ts
@@ -18,7 +18,7 @@ import { injectable, inject } from 'inversify';
 import { OutputWidget } from '@theia/output/lib/browser/output-widget';
 import { OutputContribution } from '@theia/output/lib/browser/output-contribution';
 import { OutputChannel, OutputChannelManager } from '@theia/output/lib/common/output-channel';
-import { OutputChannelRegistryMain } from '../../common/plugin-api-rpc';
+import { OutputChannelRegistryMain, PluginInfo } from '../../common/plugin-api-rpc';
 
 @injectable()
 export class OutputChannelRegistryMainImpl implements OutputChannelRegistryMain {
@@ -33,7 +33,7 @@ export class OutputChannelRegistryMainImpl implements OutputChannelRegistryMain
 
     private channels: Map<string, OutputChannel> = new Map();
 
-    $append(channelName: string, value: string): PromiseLike<void> {
+    $append(channelName: string, value: string, pluginInfo: PluginInfo): PromiseLike<void> {
         const outputChannel = this.getChannel(channelName);
         if (outputChannel) {
             outputChannel.append(value);

diff --git a/packages/plugin-ext/src/plugin/output-channel-registry.ts b/packages/plugin-ext/src/plugin/output-channel-registry.ts
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import {
-    PLUGIN_RPC_CONTEXT as Ext, OutputChannelRegistryMain
+    PLUGIN_RPC_CONTEXT as Ext, OutputChannelRegistryMain, PluginInfo
 } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';
 import * as theia from '@theia/plugin';
@@ -28,12 +28,12 @@ export class OutputChannelRegistryExt {
         this.proxy = rpc.getProxy(Ext.OUTPUT_CHANNEL_REGISTRY_MAIN);
     }
 
-    createOutputChannel(name: string): theia.OutputChannel {
+    createOutputChannel(name: string, pluginInfo: PluginInfo): theia.OutputChannel {
         name = name.trim();
         if (!name) {
             throw new Error('illegal argument \'name\'. must not be falsy');
         } else {
-            return new OutputChannelImpl(name, this.proxy);
+            return new OutputChannelImpl(name, this.proxy, pluginInfo);
         }
     }
 }
diff --git a/packages/plugin-ext/src/plugin/output-channel/output-channel-item.ts b/packages/plugin-ext/src/plugin/output-channel/output-channel-item.ts
@@ -14,13 +14,13 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import * as theia from '@theia/plugin';
-import {OutputChannelRegistryMain} from '../../common/plugin-api-rpc';
+import { OutputChannelRegistryMain, PluginInfo } from '../../common/plugin-api-rpc';
 
 export class OutputChannelImpl implements theia.OutputChannel {
 
     private disposed: boolean;
 
-    constructor(readonly name: string, private proxy: OutputChannelRegistryMain) {
+    constructor(readonly name: string, private proxy: OutputChannelRegistryMain, private readonly pluginInfo: PluginInfo) {
     }
 
     dispose(): void {
@@ -33,7 +33,7 @@ export class OutputChannelImpl implements theia.OutputChannel {
 
     append(value: string): void {
         this.validate();
-        this.proxy.$append(this.name, value);
+        this.proxy.$append(this.name, value, this.pluginInfo);
     }
 
     appendLine(value: string): void {

diff --git a/packages/plugin-ext/src/plugin/plugin-context.ts b/packages/plugin-ext/src/plugin/plugin-context.ts
@@ -333,7 +333,7 @@ export function createAPIFactory(
                 return statusBarMessageRegistryExt.createStatusBarItem(alignment, priority);
             },
             createOutputChannel(name: string): theia.OutputChannel {
-                return outputChannelRegistryExt.createOutputChannel(name);
+                return outputChannelRegistryExt.createOutputChannel(name, pluginToPluginInfo(plugin));
             },
             createWebviewPanel(viewType: string,
                 title: string,