sync

package.json

@@ -1,7 +1,7 @@
 {
   "name": "vscode-java-dependency",
-  "displayName": "Java Dependency Viewer",
-  "description": "View Java Dependencies in Visual Studio Code",
+  "displayName": "Project Manager for Java",
+  "description": "%description%",
   "version": "0.10.2",
   "publisher": "vscjava",
   "preview": true,
@@ -152,6 +152,26 @@
     },
     "menus": {
       "commandPalette": [
+        {
+          "command": "java.view.package.refresh",
+          "when": "java:serverMode != LightWeight"
+        },
+        {
+          "command": "java.view.package.changeToHierarchicalPackageView",
+          "when": "java:serverMode != LightWeight"
+        },
+        {
+          "command": "java.view.package.changeToFlatPackageView",
+          "when": "java:serverMode != LightWeight"
+        },
+        {
+          "command": "java.view.package.linkWithFolderExplorer",
+          "when": "java:serverMode != LightWeight"
+        },
+        {
+          "command": "java.view.package.unlinkWithFolderExplorer",
+          "when": "java:serverMode != LightWeight"
+        },
         {
           "command": "java.view.package.revealFileInOS",
           "when": "never"
@@ -184,73 +204,73 @@
       "view/title": [
         {
           "command": "java.view.package.refresh",
-          "when": "view == javaDependencyExplorer",
+          "when": "view == javaProjectExplorer && java:serverMode!= LightWeight",
           "group": "navigation@2"
         },
         {
           "command": "java.view.package.changeToHierarchicalPackageView",
-          "when": "view == javaDependencyExplorer && config.java.dependency.packagePresentation == flat",
+          "when": "view == javaProjectExplorer && config.java.dependency.packagePresentation == flat && java:serverMode!= LightWeight",
           "group": "navigation@1"
         },
         {
           "command": "java.view.package.changeToFlatPackageView",
-          "when": "view == javaDependencyExplorer && config.java.dependency.packagePresentation != flat",
+          "when": "view == javaProjectExplorer && config.java.dependency.packagePresentation != flat && java:serverMode!= LightWeight",
           "group": "navigation@1"
         },
         {
           "command": "java.view.package.linkWithFolderExplorer",
-          "when": "view == javaDependencyExplorer && config.java.dependency.syncWithFolderExplorer != true",
+          "when": "view == javaProjectExplorer && config.java.dependency.syncWithFolderExplorer != true && java:serverMode!= LightWeight",
           "group": "navigation@0"
         },
         {
           "command": "java.view.package.unlinkWithFolderExplorer",
-          "when": "view == javaDependencyExplorer && config.java.dependency.syncWithFolderExplorer == true",
+          "when": "view == javaProjectExplorer && config.java.dependency.syncWithFolderExplorer == true && java:serverMode!= LightWeight",
           "group": "navigation@0"
         }
       ],
       "view/item/context": [
         {
           "command": "java.view.package.revealFileInOS",
-          "when": "view == javaDependencyExplorer && viewItem =~ /java:.*?\\+uri/",
+          "when": "view == javaProjectExplorer && viewItem =~ /java:.*?\\+uri/",
           "group": "@1"
         },
         {
           "command": "java.view.package.copyFilePath",
-          "when": "view == javaDependencyExplorer && viewItem =~ /java:.*?\\+uri/",
+          "when": "view == javaProjectExplorer && viewItem =~ /java:.*?\\+uri/",
           "group": "@2"
         },
         {
           "command": "java.view.package.copyRelativeFilePath",
-          "when": "view == javaDependencyExplorer && viewItem =~ /java:.*?\\+uri/",
+          "when": "view == javaProjectExplorer && viewItem =~ /java:.*?\\+uri/",
           "group": "@2"
         },
         {
           "command": "java.project.addLibraries",
-          "when": "view == javaDependencyExplorer && viewItem =~ /java:container\/referenced-libraries$/",
+          "when": "view == javaProjectExplorer && viewItem =~ /java:container\/referenced-libraries$/",
           "group": "inline@0"
         },
         {
           "command": "java.project.removeLibrary",
-          "when": "view == javaDependencyExplorer && viewItem =~ /java:jar\/referenced-libraries\\+uri$/",
+          "when": "view == javaProjectExplorer && viewItem =~ /java:jar\/referenced-libraries\\+uri$/",
           "group": "inline"
         },
         {
           "command": "java.project.refreshLibraries",
-          "when": "view == javaDependencyExplorer && viewItem =~ /java:container\/referenced-libraries$/",
+          "when": "view == javaProjectExplorer && viewItem =~ /java:container\/referenced-libraries$/",
           "group": "inline@1"
         },
         {
           "command": "java.project.maven.addDependency",
-          "when": "view == javaDependencyExplorer && mavenEnabled && viewItem =~ /container\/maven-dependencies/",
+          "when": "view == javaProjectExplorer && mavenEnabled && viewItem =~ /container\/maven-dependencies/",
           "group": "inline@0"
         }
       ]
     },
     "views": {
       "explorer": [
         {
-          "id": "javaDependencyExplorer",
-          "name": "Java Dependencies",
+          "id": "javaProjectExplorer",
+          "name": "Java Projects",
           "when": "extensionActivated"
         }
       ]

package.nls.json

@@ -1,5 +1,5 @@
 {
-  "description": "Manage Java Dependencies in VSCode",
+  "description": "Manage Java projects in Visual Studio Code",
   "contributes.commands.java.project.create": "Create Java Project",
   "contributes.commands.java.project.addLibraries": "Add a jar file or a folder to project classpath",
   "contributes.commands.java.project.maven.addDependency": "Add a new dependency to the Maven project",

package.nls.zh.json

@@ -1,5 +1,5 @@
 {
-  "description": "在 VSCode 中管理 Java 依赖项",
+  "description": "在 Visual Studio Code 中管理 Java 项目",
   "contributes.commands.java.project.create": "创建 Java 项目",
   "contributes.commands.java.project.addLibraries": "将一个 Jar 文件或一个目录添加到 Java 项目类路径中",
   "contributes.commands.java.project.maven.addDependency": "为该 Maven 项目增加依赖库",

src/commands.ts

@@ -48,6 +48,13 @@ export namespace Commands {
 
     export const JAVA_GETPACKAGEDATA = "java.getPackageData";
 
+    export const JAVA_PROJECT_SWITCH_SERVER_MODE = "java.project.switch.server.mode";
+
+    /**
+     * command from VS Code Java to switch the language server mode
+     */
+    export const JAVA_SWITCH_SERVER_MODE = "java.server.mode.switch";
+
     export const JAVA_RESOLVEPATH = "java.resolvePath";
 
     export const VSCODE_OPEN_FOLDER = "vscode.openFolder";

src/extension.ts

@@ -1,8 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { Extension, ExtensionContext, extensions } from "vscode";
-import { dispose as disposeTelemetryWrapper, initializeFromJsonFile, instrumentOperation } from "vscode-extension-telemetry-wrapper";
+import { commands, Event, Extension, ExtensionContext, extensions, Uri } from "vscode";
+import { dispose as disposeTelemetryWrapper, initializeFromJsonFile, instrumentOperation, instrumentOperationAsVsCodeCommand } from "vscode-extension-telemetry-wrapper";
+import { Commands } from "./commands";
 import { Context } from "./constants";
 import { contextManager } from "./contextManager";
 import { LibraryController } from "./controllers/libraryController";
@@ -17,6 +18,38 @@ export async function activate(context: ExtensionContext): Promise<any> {
 }
 
 async function activateExtension(_operationId: string, context: ExtensionContext): Promise<void> {
+    const extension: Extension<any> | undefined = extensions.getExtension("redhat.java");
+    if (extension && extension.isActive) {
+        const extensionApi: any = extension.exports;
+        if (!extensionApi) {
+            return;
+        }
+
+        serverMode = extensionApi.serverMode;
+
+        if (extensionApi.onDidClasspathUpdate) {
+            const onDidClasspathUpdate: Event<Uri> = extensionApi.onDidClasspathUpdate;
+            context.subscriptions.push(onDidClasspathUpdate(async () => {
+                await commands.executeCommand(Commands.VIEW_PACKAGE_REFRESH, /* debounce = */true);
+            }));
+        }
+
+        if (extensionApi.onDidServerModeChange) {
+            const onDidServerModeChange: Event<string> = extensionApi.onDidServerModeChange;
+            context.subscriptions.push(onDidServerModeChange(async (mode: string) => {
+                serverMode = mode;
+                commands.executeCommand(Commands.VIEW_PACKAGE_REFRESH, /* debounce = */false);
+            }));
+        }
+
+        if (extensionApi.onDidProjectsImport) {
+            const onDidProjectsImport: Event<Uri[]> = extensionApi.onDidProjectsImport;
+            context.subscriptions.push(onDidProjectsImport(async () => {
+                commands.executeCommand(Commands.VIEW_PACKAGE_REFRESH, /* debounce = */true);
+            }));
+        }
+    }
+
     Settings.initialize(context);
     contextManager.initialize(context);
     setMavenExtensionState();
@@ -28,6 +61,13 @@ async function activateExtension(_operationId: string, context: ExtensionContext
     contextManager.setContextValue(Context.EXTENSION_ACTIVATED, true);
 
     initExpService(context);
+
+    context.subscriptions.push(instrumentOperationAsVsCodeCommand(Commands.JAVA_PROJECT_SWITCH_SERVER_MODE, async () => {
+        if (isSwitchingServer()) {
+            return;
+        }
+        await commands.executeCommand(Commands.JAVA_SWITCH_SERVER_MODE, "Standard" /*mode*/);
+    }));
 }
 
 // determine if the add dependency shortcut will show or not
@@ -47,3 +87,22 @@ function setMavenExtensionState() {
 export async function deactivate() {
     await disposeTelemetryWrapper();
 }
+
+export function isStandardServerReady(): boolean {
+    // undefined serverMode indicates an older version language server
+    if (serverMode === undefined) {
+        return true;
+    }
+
+    if (serverMode !== "Standard") {
+        return false;
+    }
+
+    return true;
+}
+
+export function isSwitchingServer(): boolean {
+    return serverMode === "Hybrid";
+}
+
+let serverMode: string | undefined;

src/views/dependencyDataProvider.ts

@@ -3,16 +3,18 @@
 
 import * as _ from "lodash";
 import {
-    commands, Event, EventEmitter, ExtensionContext, ProviderResult, Range,
-    Selection, TextEditorRevealType, TreeDataProvider, TreeItem, Uri, window, workspace,
+    commands, Event, EventEmitter, ExtensionContext, extensions, ProviderResult,
+    Range, Selection, TextEditorRevealType, TreeDataProvider, TreeItem, Uri, window, workspace,
 } from "vscode";
 import { instrumentOperation, instrumentOperationAsVsCodeCommand } from "vscode-extension-telemetry-wrapper";
 import { Commands } from "../commands";
+import { isStandardServerReady, isSwitchingServer } from "../extension";
 import { Jdtls } from "../java/jdtls";
 import { INodeData, NodeKind } from "../java/nodeData";
 import { Settings } from "../settings";
 import { DataNode } from "./dataNode";
 import { ExplorerNode } from "./explorerNode";
+import { LightWeightNode } from "./lightWeightNode";
 import { ProjectNode } from "./projectNode";
 import { WorkspaceNode } from "./workspaceNode";
 
@@ -87,7 +89,19 @@ export class DependencyDataProvider implements TreeDataProvider<ExplorerNode> {
         return element.getTreeItem();
     }
 
-    public getChildren(element?: ExplorerNode): ProviderResult<ExplorerNode[]> {
+    public async getChildren(element?: ExplorerNode): Promise<ExplorerNode[]> {
+        if (isSwitchingServer()) {
+            await new Promise<void>((resolve: () => void): void => {
+                extensions.getExtension("redhat.java")!.exports.onDidServerModeChange(resolve);
+            });
+        }
+
+        if (!isStandardServerReady()) {
+            return [
+                new LightWeightNode(),
+            ];
+        }
+
         if (!this._rootItems || !element) {
             return this.getRootNodes();
         } else {

src/views/dependencyExplorer.ts

@@ -2,10 +2,10 @@
 // Licensed under the MIT license.
 
 import { Disposable, ExtensionContext, TextEditor, TreeView, TreeViewVisibilityChangeEvent, Uri, window } from "vscode";
+import { isStandardServerReady } from "../extension";
 import { Jdtls } from "../java/jdtls";
 import { INodeData } from "../java/nodeData";
 import { Settings } from "../settings";
-import { DataNode } from "./dataNode";
 import { DependencyDataProvider } from "./dependencyDataProvider";
 import { ExplorerNode } from "./explorerNode";
 
@@ -17,7 +17,7 @@ export class DependencyExplorer implements Disposable {
 
     constructor(public readonly context: ExtensionContext) {
         this._dataProvider = new DependencyDataProvider(context);
-        this._dependencyViewer = window.createTreeView("javaDependencyExplorer", { treeDataProvider: this._dataProvider, showCollapseAll: true });
+        this._dependencyViewer = window.createTreeView("javaProjectExplorer", { treeDataProvider: this._dataProvider, showCollapseAll: true });
 
         context.subscriptions.push(
             window.onDidChangeActiveTextEditor((textEditor: TextEditor) => {
@@ -51,6 +51,10 @@ export class DependencyExplorer implements Disposable {
     }
 
     public async reveal(uri: Uri): Promise<void> {
+        if (!isStandardServerReady()) {
+            return;
+        }
+
         const paths: INodeData[] = await Jdtls.resolvePath(uri.toString());
         if (!paths || paths.length === 0) {
             return;

src/views/lightWeightNode.ts

@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+import * as _ from "lodash";
+import { ProviderResult, ThemeIcon, TreeItem, TreeItemCollapsibleState } from "vscode";
+import { Commands } from "../commands";
+import { ExplorerNode } from "./explorerNode";
+
+export class LightWeightNode extends ExplorerNode {
+    constructor() {
+        super(null);
+    }
+
+    public getTreeItem(): TreeItem | Promise<TreeItem> {
+        return {
+            label: "Click to load dependencies...",
+            collapsibleState: TreeItemCollapsibleState.None,
+            command: {
+                command: Commands.JAVA_PROJECT_SWITCH_SERVER_MODE,
+                title: "Switch to Standard mode",
+            },
+            tooltip: "Switch the Java Language Server to Standard mode to show all the dependencies",
+            iconPath: new ThemeIcon("info"),
+        };
+    }
+
+    public getChildren(): ProviderResult<ExplorerNode[]> {
+        return null;
+    }
+}