vscode clipboard api + support editor/title for webviews

configs/warnings.tslint.json

@@ -38,7 +38,8 @@
           "vscode-languageserver-types",
           "vscode-ws-jsonrpc",
           "vscode-uri",
-          "yargs"
+          "yargs",
+          "electron"
         ]
       ]
     },

packages/core/src/browser/browser-clipboard-service.ts

@@ -0,0 +1,50 @@
+/********************************************************************************
+ * Copyright (C) 2019 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { injectable } from 'inversify';
+import { ClipboardService } from './clipboard-service';
+
+export interface NavigatorClipboard {
+    readText(): Promise<string>;
+    writeText(value: string): Promise<void>;
+}
+export interface NavigatorPermissions {
+    query(options: { name: string }): Promise<{ state: 'granted' | 'prompt' | 'denied' }>
+}
+
+@injectable()
+export class BrowserClipboardService implements ClipboardService {
+
+    async readText(): Promise<string> {
+        if ('permissions' in navigator && 'clipboard' in navigator) {
+            const result = await (<NavigatorPermissions>navigator['permissions']).query({ name: 'clipboard-read' });
+            if (result.state === 'granted' || result.state === 'prompt') {
+                return (<NavigatorClipboard>navigator['clipboard']).readText();
+            }
+        }
+        return '';
+    }
+
+    async writeText(value: string): Promise<void> {
+        if ('permissions' in navigator && 'clipboard' in navigator) {
+            const result = await (<NavigatorPermissions>navigator['permissions']).query({ name: 'clipboard-write' });
+            if (result.state === 'granted' || result.state === 'prompt') {
+                return (<NavigatorClipboard>navigator['clipboard']).writeText(value);
+            }
+        }
+    }
+
+}

packages/core/src/browser/clipboard-service.ts

@@ -0,0 +1,23 @@
+/********************************************************************************
+ * Copyright (C) 2019 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { MaybePromise } from '../common/types';
+
+export const ClipboardService = Symbol('ClipboardService');
+export interface ClipboardService {
+    readText(): MaybePromise<string>;
+    writeText(value: string): MaybePromise<void>;
+}

packages/core/src/browser/window/browser-window-module.ts

@@ -18,9 +18,12 @@ import { ContainerModule } from 'inversify';
 import { WindowService } from '../../browser/window/window-service';
 import { DefaultWindowService } from '../../browser/window/default-window-service';
 import { FrontendApplicationContribution } from '../frontend-application';
+import { ClipboardService } from '../clipboard-service';
+import { BrowserClipboardService } from '../browser-clipboard-service';
 
 export default new ContainerModule(bind => {
     bind(DefaultWindowService).toSelf().inSingletonScope();
     bind(WindowService).toService(DefaultWindowService);
     bind(FrontendApplicationContribution).toService(DefaultWindowService);
+    bind(ClipboardService).to(BrowserClipboardService).inSingletonScope();
 });

packages/core/src/electron-browser/electron-clipboard-service.ts

@@ -0,0 +1,32 @@
+/********************************************************************************
+ * Copyright (C) 2019 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { clipboard } from 'electron';
+import { injectable } from 'inversify';
+import { ClipboardService } from '../browser/clipboard-service';
+
+@injectable()
+export class ElectronClipboardService implements ClipboardService {
+
+    readText(): string {
+        return clipboard.readText();
+    }
+
+    writeText(value: string): void {
+        clipboard.writeText(value);
+    }
+
+}

packages/core/src/electron-browser/window/electron-window-module.ts

@@ -18,8 +18,11 @@ import { ContainerModule } from 'inversify';
 import { WindowService } from '../../browser/window/window-service';
 import { ElectronWindowService } from './electron-window-service';
 import { FrontendApplicationContribution } from '../../browser/frontend-application';
+import { ElectronClipboardService } from '../electron-clipboard-service';
+import { ClipboardService } from '../../browser/clipboard-service';
 
 export default new ContainerModule(bind => {
     bind(WindowService).to(ElectronWindowService).inSingletonScope();
     bind(FrontendApplicationContribution).toService(WindowService);
+    bind(ClipboardService).to(ElectronClipboardService).inSingletonScope();
 });

packages/plugin-ext/src/api/plugin-api.ts

@@ -1179,6 +1179,11 @@ export interface FileSystemMain {
     $unregisterProvider(handle: number): void;
 }
 
+export interface ClipboardMain {
+    $readText(): Promise<string>;
+    $writeText(value: string): Promise<void>;
+}
+
 export const PLUGIN_RPC_CONTEXT = {
     COMMAND_REGISTRY_MAIN: <ProxyIdentifier<CommandRegistryMain>>createProxyIdentifier<CommandRegistryMain>('CommandRegistryMain'),
     QUICK_OPEN_MAIN: createProxyIdentifier<QuickOpenMain>('QuickOpenMain'),
@@ -1203,7 +1208,8 @@ export const PLUGIN_RPC_CONTEXT = {
     DEBUG_MAIN: createProxyIdentifier<DebugMain>('DebugMain'),
     FILE_SYSTEM_MAIN: createProxyIdentifier<FileSystemMain>('FileSystemMain'),
     SCM_MAIN: createProxyIdentifier<ScmMain>('ScmMain'),
-    DECORATIONS_MAIN: createProxyIdentifier<DecorationsMain>('DecorationsMain')
+    DECORATIONS_MAIN: createProxyIdentifier<DecorationsMain>('DecorationsMain'),
+    CLIPBOARD_MAIN: <ProxyIdentifier<ClipboardMain>>createProxyIdentifier<ClipboardMain>('ClipboardMain')
 };
 
 export const MAIN_RPC_CONTEXT = {

packages/plugin-ext/src/hosted/browser/worker/worker-main.ts

@@ -28,6 +28,7 @@ import { EditorsAndDocumentsExtImpl } from '../../../plugin/editors-and-document
 import { WorkspaceExtImpl } from '../../../plugin/workspace';
 import { MessageRegistryExt } from '../../../plugin/message-registry';
 import { WorkerEnvExtImpl } from './worker-env-ext';
+import { ClipboardExt } from '../../../plugin/clipboard-ext';
 
 // tslint:disable-next-line:no-any
 const ctx = self as any;
@@ -55,6 +56,7 @@ const messageRegistryExt = new MessageRegistryExt(rpc);
 const workspaceExt = new WorkspaceExtImpl(rpc, editorsAndDocuments, messageRegistryExt);
 const preferenceRegistryExt = new PreferenceRegistryExtImpl(rpc, workspaceExt);
 const debugExt = createDebugExtStub(rpc);
+const clipboardExt = new ClipboardExt(rpc);
 
 const pluginManager = new PluginManagerExtImpl({
     // tslint:disable-next-line:no-any
@@ -133,7 +135,8 @@ const apiFactory = createAPIFactory(
     preferenceRegistryExt,
     editorsAndDocuments,
     workspaceExt,
-    messageRegistryExt
+    messageRegistryExt,
+    clipboardExt
 );
 let defaultApi: typeof theia;
 

packages/plugin-ext/src/hosted/node/plugin-host-rpc.ts

@@ -26,6 +26,7 @@ import { EditorsAndDocumentsExtImpl } from '../../plugin/editors-and-documents';
 import { WorkspaceExtImpl } from '../../plugin/workspace';
 import { MessageRegistryExt } from '../../plugin/message-registry';
 import { EnvNodeExtImpl } from '../../plugin/node/env-node-ext';
+import { ClipboardExt } from '../../plugin/clipboard-ext';
 
 /**
  * Handle the RPC calls.
@@ -47,6 +48,7 @@ export class PluginHostRPC {
         const messageRegistryExt = new MessageRegistryExt(this.rpc);
         const workspaceExt = new WorkspaceExtImpl(this.rpc, editorsAndDocumentsExt, messageRegistryExt);
         const preferenceRegistryExt = new PreferenceRegistryExtImpl(this.rpc, workspaceExt);
+        const clipboardExt = new ClipboardExt(this.rpc);
         this.pluginManager = this.createPluginManager(envExt, preferenceRegistryExt, this.rpc);
         this.rpc.set(MAIN_RPC_CONTEXT.HOSTED_PLUGIN_MANAGER_EXT, this.pluginManager);
         this.rpc.set(MAIN_RPC_CONTEXT.EDITORS_AND_DOCUMENTS_EXT, editorsAndDocumentsExt);
@@ -61,7 +63,8 @@ export class PluginHostRPC {
             preferenceRegistryExt,
             editorsAndDocumentsExt,
             workspaceExt,
-            messageRegistryExt
+            messageRegistryExt,
+            clipboardExt
         );
     }
 

packages/plugin-ext/src/main/browser/clipboard-main.ts

@@ -0,0 +1,38 @@
+/********************************************************************************
+ * Copyright (C) 2019 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { interfaces } from 'inversify';
+import { ClipboardMain } from '../../common';
+import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
+
+export class ClipboardMainImpl implements ClipboardMain {
+
+    protected readonly clipboardService: ClipboardService;
+
+    constructor(container: interfaces.Container) {
+        this.clipboardService = container.get(ClipboardService);
+    }
+
+    async $readText(): Promise<string> {
+        const result = await this.clipboardService.readText();
+        return result;
+    }
+
+    async $writeText(value: string): Promise<void> {
+        await this.clipboardService.writeText(value);
+    }
+
+}

packages/plugin-ext/src/main/browser/main-context.ts

@@ -40,6 +40,7 @@ import { DebugMainImpl } from './debug/debug-main';
 import { FileSystemMainImpl } from './file-system-main';
 import { ScmMainImpl } from './scm-main';
 import { DecorationsMainImpl } from './decorations/decorations-main';
+import { ClipboardMainImpl } from './clipboard-main';
 
 export function setUpPluginApi(rpc: RPCProtocol, container: interfaces.Container): void {
     const commandRegistryMain = new CommandRegistryMainImpl(rpc, container);
@@ -111,4 +112,7 @@ export function setUpPluginApi(rpc: RPCProtocol, container: interfaces.Container
 
     const decorationsMain = new DecorationsMainImpl(rpc, container);
     rpc.set(PLUGIN_RPC_CONTEXT.DECORATIONS_MAIN, decorationsMain);
+
+    const clipboardMain = new ClipboardMainImpl(container);
+    rpc.set(PLUGIN_RPC_CONTEXT.CLIPBOARD_MAIN, clipboardMain);
 }

packages/plugin-ext/src/main/browser/menus/menus-contribution-handler.ts

@@ -16,6 +16,7 @@
 
 // tslint:disable:no-any
 
+import CodeUri from 'vscode-uri';
 import { injectable, inject } from 'inversify';
 import { MenuPath, ILogger, CommandRegistry, Command, Mutable, MenuAction, SelectionService, CommandHandler } from '@theia/core';
 import { EDITOR_CONTEXT_MENU, EditorWidget } from '@theia/editor/lib/browser';
@@ -33,6 +34,19 @@ import { ScmService } from '@theia/scm/lib/browser/scm-service';
 import { ScmRepository } from '@theia/scm/lib/browser/scm-repository';
 import { PluginScmProvider, PluginScmResourceGroup, PluginScmResource } from '../scm-main';
 import { ResourceContextKey } from '@theia/core/lib/browser/resource-context-key';
+import { WebviewWidget } from '../webview/webview';
+import { Navigatable } from '@theia/core/lib/browser/navigatable';
+
+type CodeEditorWidget = EditorWidget | WebviewWidget;
+export namespace CodeEditorWidget {
+    export function is(arg: any): arg is CodeEditorWidget {
+        return arg instanceof EditorWidget || arg instanceof WebviewWidget;
+    }
+    export function getResourceUri(editor: CodeEditorWidget): CodeUri | undefined {
+        const resourceUri = Navigatable.is(editor) && editor.getResourceUri();
+        return resourceUri ? resourceUri['codeUri'] : undefined;
+    }
+}
 
 @injectable()
 export class MenusContributionPointHandler {
@@ -75,14 +89,10 @@ export class MenusContributionPointHandler {
                 }
             } else if (location === 'editor/title') {
                 for (const action of allMenus[location]) {
-                    const selectedResource = (widget: EditorWidget) => {
-                        const resourceUri = widget.getResourceUri();
-                        return resourceUri && resourceUri['codeUri'];
-                    };
                     this.registerTitleAction(location, action, {
-                        execute: widget => widget instanceof EditorWidget && this.commands.executeCommand(action.command, selectedResource(widget)),
-                        isEnabled: widget => widget instanceof EditorWidget && this.commands.isEnabled(action.command, selectedResource(widget)),
-                        isVisible: widget => widget instanceof EditorWidget && this.commands.isVisible(action.command, selectedResource(widget))
+                        execute: widget => CodeEditorWidget.is(widget) && this.commands.executeCommand(action.command, CodeEditorWidget.getResourceUri(widget)),
+                        isEnabled: widget => CodeEditorWidget.is(widget) && this.commands.isEnabled(action.command, CodeEditorWidget.getResourceUri(widget)),
+                        isVisible: widget => CodeEditorWidget.is(widget) && this.commands.isVisible(action.command, CodeEditorWidget.getResourceUri(widget))
                     });
                 }
             } else if (location === 'view/item/context') {
@@ -154,14 +164,28 @@ export class MenusContributionPointHandler {
         const command: Command = { id };
         this.commands.registerCommand(command, handler);
 
-        const { group, when } = action;
-        const item: Mutable<TabBarToolbarItem> = { id, command: id, group, when };
+        const { when } = action;
+        let group = (action.group || '').trim();
+        let priority: number | undefined = undefined;
+        const sortIndex = group.indexOf('@');
+        if (sortIndex !== -1) {
+            const sort = group.substr(sortIndex + 1).trim();
+            priority = !!sort ? Number(sort) : undefined;
+            priority = priority && !Number.isNaN(priority) ? priority : undefined;
+
+            group = group.substr(0, sortIndex);
+        }
+        if (!group) {
+            group = 'navigation';
+        }
+
+        const item: Mutable<TabBarToolbarItem> = { id, command: id, group, priority, when };
         this.tabBarToolbar.registerItem(item);
 
         this.onDidRegisterCommand(action.command, pluginCommand => {
             command.category = pluginCommand.category;
             item.tooltip = pluginCommand.label;
-            if (group === undefined || group === 'navigation') {
+            if (group === 'navigation') {
                 command.iconClass = pluginCommand.iconClass;
             }
         });

packages/plugin-ext/src/plugin/clipboard-ext.ts

@@ -0,0 +1,37 @@
+/********************************************************************************
+ * Copyright (C) 2019 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import * as theia from '@theia/plugin';
+import { RPCProtocol } from '../api/rpc-protocol';
+import { PLUGIN_RPC_CONTEXT, ClipboardMain } from '../common';
+
+export class ClipboardExt implements theia.Clipboard {
+
+    protected readonly proxy: ClipboardMain;
+
+    constructor(rpc: RPCProtocol) {
+        this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.CLIPBOARD_MAIN);
+    }
+
+    readText(): Promise<string> {
+        return this.proxy.$readText();
+    }
+
+    writeText(value: string): Promise<void> {
+        return this.proxy.$writeText(value);
+    }
+
+}