merge with upstream changes with maxListener on events

Change-Id: I22313a01998bb965152db0385f6adcd96e3998ae Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
eclipse-theia · Jun 20, 2018 · d0f4dca · d0f4dca
1 parent 83f47f5
commit d0f4dca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/plugin-ext/src/plugin/plugin-context.ts b/packages/plugin-ext/src/plugin/plugin-context.ts
@@ -41,7 +41,13 @@ export function createAPI(rpc: RPCProtocol): typeof theia {
 
     const window: typeof theia.window = {
         showQuickPick(items: any, options: theia.QuickPickOptions, token?: theia.CancellationToken): any {
-            return quickOpenExt.showQuickPick(items, options, token);
+            if (token) {
+                const coreEvent = Object.assign(token.onCancellationRequested, { maxListeners: 0 });
+                const coreCancellationToken = { isCancellationRequested: token.isCancellationRequested, onCancellationRequested: coreEvent };
+                return quickOpenExt.showQuickPick(items, options, coreCancellationToken);
+            } else {
+                return quickOpenExt.showQuickPick(items, options);
+            }
         },
         showInformationMessage(message: string,
             optionsOrFirstItem: theia.MessageOptions | string | theia.MessageItem,

diff --git a/packages/plugin/src/theia.d.ts b/packages/plugin/src/theia.d.ts
@@ -99,7 +99,9 @@ declare module '@theia/plugin' {
          * An event emitted when cancellation is requested
          * @event
          */
-        readonly onCancellationRequested: Event<void>;
+        readonly onCancellationRequested: Event<any>;
+
+
     }
 
     /**