add java-debug extension based on vscode-java-debug

.travis.yml

@@ -29,6 +29,7 @@ cache:
   - packages/filesystem/node_modules
   - packages/getting-started/node_modules
   - packages/git/node_modules
+  - packages/java-debug/node_modules
   - packages/java/node_modules
   - packages/json/node_modules
   - packages/keymaps/node_modules

.vscode/launch.json

@@ -54,7 +54,7 @@
             "name": "Launch Backend",
             "program": "${workspaceRoot}/examples/browser/src-gen/backend/main.js",
             "args": [
-                "--log-level=debug",
+                "--hostname=0.0.0.0",
                 "--port=3000",
                 "--no-cluster",
                 "--app-project-path=${workspaceRoot}/examples/browser",

configs/warnings.tslint.json

@@ -1,5 +1,6 @@
 {
   "rules": {
+    "deprecation": true,
     "await-promise": {
       "severity": "warning",
       "options": [

examples/browser/package.json

@@ -25,6 +25,7 @@
     "@theia/getting-started": "^0.3.17",
     "@theia/git": "^0.3.17",
     "@theia/java": "^0.3.17",
+    "@theia/java-debug": "^0.3.17",
     "@theia/json": "^0.3.17",
     "@theia/keymaps": "^0.3.17",
     "@theia/languages": "^0.3.17",

examples/electron/package.json

@@ -12,7 +12,7 @@
   },
   "//": [
     "`@theia/plugin-ext` and `@theia/plugin-ext-vscode` are missing due to https://github.com/theia-ide/theia/issues/3723",
-    "`@theia/debug` and `@theia/debug-nodejs` are removed due to https://github.com/theia-ide/theia/issues/3716"
+    "`@theia/debug`, `@theia/debug-nodejs` and `@theia/java-debug` are removed due to https://github.com/theia-ide/theia/issues/3716"
   ],
   "dependencies": {
     "@theia/callhierarchy": "^0.3.17",

packages/core/src/browser/frontend-application-module.ts

@@ -23,19 +23,20 @@ import {
     bindContributionProvider,
     SelectionService,
     ResourceProvider, ResourceResolver, DefaultResourceProvider,
-    CommandContribution, CommandRegistry, CommandService,
+    CommandContribution, CommandRegistry, CommandService, commandServicePath,
     MenuModelRegistry, MenuContribution,
     MessageService,
     MessageClient,
-    InMemoryResources
+    InMemoryResources,
+    messageServicePath
 } from '../common';
 import { KeybindingRegistry, KeybindingContext, KeybindingContribution } from './keybinding';
 import { FrontendApplication, FrontendApplicationContribution, DefaultFrontendApplicationContribution } from './frontend-application';
 import { DefaultOpenerService, OpenerService, OpenHandler } from './opener-service';
 import { HttpOpenHandler } from './http-open-handler';
 import { CommonFrontendContribution } from './common-frontend-contribution';
 import {
-    QuickOpenService, QuickCommandService, QuickCommandFrontendContribution, QuickPickService, QuickOpenContribution,
+    QuickOpenService, QuickCommandService, QuickCommandFrontendContribution, QuickOpenContribution,
     QuickOpenHandlerRegistry, CommandQuickOpenContribution, HelpQuickOpenHandler,
     QuickOpenFrontendContribution, PrefixQuickOpenService, QuickInputService
 } from './quick-open';
@@ -64,6 +65,8 @@ import { FrontendApplicationStateService } from './frontend-application-state';
 import { JsonSchemaStore } from './json-schema-store';
 import { TabBarToolbarRegistry, TabBarToolbarContribution, TabBarToolbarFactory, TabBarToolbar } from './shell/tab-bar-toolbar';
 import { bindCorePreferences } from './core-preferences';
+import { QuickPickServiceImpl } from './quick-open/quick-pick-service-impl';
+import { QuickPickService, quickPickServicePath } from '../common/quick-pick-service';
 
 export const frontendApplicationModule = new ContainerModule((bind, unbind, isBound, rebind) => {
     const themeService = ThemeService.get();
@@ -124,7 +127,10 @@ export const frontendApplicationModule = new ContainerModule((bind, unbind, isBo
     bind(ResourceResolver).toService(InMemoryResources);
 
     bind(SelectionService).toSelf().inSingletonScope();
-    bind(CommandRegistry).toSelf().inSingletonScope();
+    bind(CommandRegistry).toSelf().inSingletonScope().onActivation(({ container }, registry) => {
+        WebSocketConnectionProvider.createProxy(container, commandServicePath, registry);
+        return registry;
+    });
     bind(CommandService).toService(CommandRegistry);
     bindContributionProvider(bind, CommandContribution);
     bind(QuickOpenContribution).to(CommandQuickOpenContribution);
@@ -137,22 +143,30 @@ export const frontendApplicationModule = new ContainerModule((bind, unbind, isBo
     bindContributionProvider(bind, KeybindingContribution);
 
     bind(MessageClient).toSelf().inSingletonScope();
-    bind(MessageService).toSelf().inSingletonScope();
+    bind(MessageService).toSelf().inSingletonScope().onActivation(({ container }, messages) => {
+        const client = container.get(MessageClient);
+        WebSocketConnectionProvider.createProxy(container, messageServicePath, client);
+        return messages;
+    });
 
     bind(CommonFrontendContribution).toSelf().inSingletonScope();
     [FrontendApplicationContribution, CommandContribution, KeybindingContribution, MenuContribution].forEach(serviceIdentifier =>
         bind(serviceIdentifier).toService(CommonFrontendContribution)
     );
 
     bind(QuickOpenService).toSelf().inSingletonScope();
-    bind(QuickPickService).toSelf().inSingletonScope();
     bind(QuickInputService).toSelf().inSingletonScope();
     bind(QuickCommandService).toSelf().inSingletonScope();
     bind(QuickCommandFrontendContribution).toSelf().inSingletonScope();
     [CommandContribution, KeybindingContribution, MenuContribution].forEach(serviceIdentifier =>
         bind(serviceIdentifier).toService(QuickCommandFrontendContribution)
     );
 
+    bind(QuickPickService).to(QuickPickServiceImpl).inSingletonScope().onActivation(({ container }, quickPickService) => {
+        WebSocketConnectionProvider.createProxy(container, quickPickServicePath, quickPickService);
+        return quickPickService;
+    });
+
     bind(PrefixQuickOpenService).toSelf().inSingletonScope();
     bindContributionProvider(bind, QuickOpenContribution);
     bind(QuickOpenHandlerRegistry).toSelf().inSingletonScope();

packages/core/src/browser/quick-open/quick-pick-service-impl.ts

@@ -0,0 +1,85 @@
+/********************************************************************************
+ * Copyright (C) 2018 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, inject } from 'inversify';
+import { QuickOpenItem, QuickOpenMode, QuickOpenGroupItem, QuickOpenItemOptions } from './quick-open-model';
+import { QuickOpenService } from './quick-open-service';
+import { QuickPickService, QuickPickOptions, QuickPickItem, QuickPickSeparator, QuickPickValue } from '../../common/quick-pick-service';
+
+@injectable()
+export class QuickPickServiceImpl implements QuickPickService {
+
+    @inject(QuickOpenService)
+    protected readonly quickOpenService: QuickOpenService;
+
+    show(elements: string[], options?: QuickPickOptions): Promise<string | undefined>;
+    show<T>(elements: QuickPickItem<T>[], options?: QuickPickOptions): Promise<T | undefined>;
+    async show(elements: (string | QuickPickItem<Object>)[], options?: QuickPickOptions): Promise<Object | undefined> {
+        return new Promise<Object | undefined>(resolve => {
+            const items = this.toItems(elements, resolve);
+            if (items.length === 0) {
+                resolve(undefined);
+                return;
+            }
+            if (items.length === 1) {
+                items[0].run(QuickOpenMode.OPEN);
+                return;
+            }
+            this.quickOpenService.open({ onType: (_, acceptor) => acceptor(items) }, Object.assign({
+                onClose: () => resolve(undefined),
+                fuzzyMatchLabel: true,
+                fuzzyMatchDescription: true
+            }, options));
+        });
+    }
+    protected toItems(elements: (string | QuickPickItem<Object>)[], resolve: (element: Object) => void): QuickOpenItem[] {
+        const items: QuickOpenItem[] = [];
+        let groupLabel: string | undefined;
+        for (const element of elements) {
+            if (QuickPickSeparator.is(element)) {
+                groupLabel = element.label;
+            } else {
+                const options = this.toItemOptions(element, resolve);
+                if (groupLabel) {
+                    items.push(new QuickOpenGroupItem(Object.assign(options, { groupLabel, showBorder: true })));
+                    groupLabel = undefined;
+                } else {
+                    items.push(new QuickOpenItem(options));
+                }
+            }
+        }
+        return items;
+    }
+    protected toItemOptions(element: string | QuickPickValue<Object>, resolve: (element: Object) => void): QuickOpenItemOptions {
+        const label = typeof element === 'string' ? element : element.label;
+        const value = typeof element === 'string' ? element : element.value;
+        const description = typeof element === 'string' ? undefined : element.description;
+        const iconClass = typeof element === 'string' ? undefined : element.iconClass;
+        return {
+            label,
+            description,
+            iconClass,
+            run: mode => {
+                if (mode !== QuickOpenMode.OPEN) {
+                    return false;
+                }
+                resolve(value);
+                return true;
+            }
+        };
+    }
+
+}

packages/core/src/browser/quick-open/quick-pick-service.ts

@@ -14,102 +14,28 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { injectable, inject } from 'inversify';
-import { QuickOpenItem, QuickOpenMode, QuickOpenGroupItem, QuickOpenItemOptions } from './quick-open-model';
-import { QuickOpenService } from './quick-open-service';
-
-export type QuickPickItem<T> = QuickPickValue<T> | QuickPickSeparator;
-
-export interface QuickPickSeparator {
-    type: 'separator'
-    label: string
-}
-export namespace QuickPickSeparator {
-    export function is(item: string | QuickPickItem<Object>): item is QuickPickSeparator {
-        return typeof item === 'object' && 'type' in item && item['type'] === 'separator';
-    }
-}
-
-export interface QuickPickValue<T> {
-    label: string
-    value: T
-    description?: string
-    iconClass?: string
-}
-
-export interface QuickPickOptions {
-    placeholder?: string
-    /**
-     * default: true
-     */
-    fuzzyMatchLabel?: boolean
-    /**
-     * default: true
-     */
-    fuzzyMatchDescription?: boolean
-}
-
-@injectable()
-export class QuickPickService {
-
-    @inject(QuickOpenService)
-    protected readonly quickOpenService: QuickOpenService;
-
-    show(elements: string[], options?: QuickPickOptions): Promise<string | undefined>;
-    show<T>(elements: QuickPickItem<T>[], options?: QuickPickOptions): Promise<T | undefined>;
-    async show(elements: (string | QuickPickItem<Object>)[], options?: QuickPickOptions): Promise<Object | undefined> {
-        return new Promise<Object | undefined>(resolve => {
-            const items = this.toItems(elements, resolve);
-            if (items.length === 0) {
-                resolve(undefined);
-                return;
-            }
-            if (items.length === 1) {
-                items[0].run(QuickOpenMode.OPEN);
-                return;
-            }
-            this.quickOpenService.open({ onType: (_, acceptor) => acceptor(items) }, Object.assign({
-                onClose: () => resolve(undefined),
-                fuzzyMatchLabel: true,
-                fuzzyMatchDescription: true
-            }, options));
-        });
-    }
-    protected toItems(elements: (string | QuickPickItem<Object>)[], resolve: (element: Object) => void): QuickOpenItem[] {
-        const items: QuickOpenItem[] = [];
-        let groupLabel: string | undefined;
-        for (const element of elements) {
-            if (QuickPickSeparator.is(element)) {
-                groupLabel = element.label;
-            } else {
-                const options = this.toItemOptions(element, resolve);
-                if (groupLabel) {
-                    items.push(new QuickOpenGroupItem(Object.assign(options, { groupLabel, showBorder: true })));
-                    groupLabel = undefined;
-                } else {
-                    items.push(new QuickOpenItem(options));
-                }
-            }
-        }
-        return items;
-    }
-    protected toItemOptions(element: string | QuickPickValue<Object>, resolve: (element: Object) => void): QuickOpenItemOptions {
-        const label = typeof element === 'string' ? element : element.label;
-        const value = typeof element === 'string' ? element : element.value;
-        const description = typeof element === 'string' ? undefined : element.description;
-        const iconClass = typeof element === 'string' ? undefined : element.iconClass;
-        return {
-            label,
-            description,
-            iconClass,
-            run: mode => {
-                if (mode !== QuickOpenMode.OPEN) {
-                    return false;
-                }
-                resolve(value);
-                return true;
-            }
-        };
-    }
-
-}
+import * as common from '../../common/quick-pick-service';
+/**
+ * @deprecated import from `@theia/core/lib/common/quick-pick-service` instead
+ */
+export const QuickPickService = common.QuickPickService;
+/**
+ * @deprecated import from `@theia/core/lib/common/quick-pick-service` instead
+ */
+export type QuickPickService = common.QuickPickService;
+/**
+ * @deprecated import from `@theia/core/lib/common/quick-pick-service` instead
+ */
+export type QuickPickOptions = common.QuickPickOptions;
+/**
+ * @deprecated import from `@theia/core/lib/common/quick-pick-service` instead
+ */
+export type QuickPickItem<T> = common.QuickPickItem<T>;
+/**
+ * @deprecated import from `@theia/core/lib/common/quick-pick-service` instead
+ */
+export type QuickPickSeparator = common.QuickPickSeparator;
+/**
+ * @deprecated import from `@theia/core/lib/common/quick-pick-service` instead
+ */
+export type QuickPickValue<T> = common.QuickPickValue<T>;

packages/core/src/common/command.ts

@@ -102,6 +102,7 @@ export interface CommandContribution {
     registerCommands(commands: CommandRegistry): void;
 }
 
+export const commandServicePath = '/services/commands';
 export const CommandService = Symbol('CommandService');
 /**
  * The command service should be used to execute commands.
@@ -234,13 +235,14 @@ export class CommandRegistry implements CommandService {
      * Reject if a command cannot be executed.
      */
     // tslint:disable-next-line:no-any
-    executeCommand<T>(command: string, ...args: any[]): Promise<T | undefined> {
+    async executeCommand<T>(command: string, ...args: any[]): Promise<T | undefined> {
         const handler = this.getActiveHandler(command, ...args);
         if (handler) {
-            return Promise.resolve(handler.execute(...args));
+            const result = await handler.execute(...args);
+            return result;
         }
         const argsMessage = args && args.length > 0 ? ` (args: ${JSON.stringify(args)})` : '';
-        return Promise.reject(`The command '${command}' cannot be executed. There are no active handlers available for the command.${argsMessage}`);
+        throw new Error(`The command '${command}' cannot be executed. There are no active handlers available for the command.${argsMessage}`);
     }
 
     /**

packages/core/src/common/disposable.ts

@@ -56,7 +56,7 @@ export class DisposableCollection implements Disposable {
 
     private disposingElements = false;
     dispose(): void {
-        if (this.disposed) {
+        if (this.disposed || this.disposingElements) {
             return;
         }
         this.disposingElements = true;