fix: NPE error when open non-project file (#417)

Co-authored-by: Sheng Chen <[email protected]>

Author: xqzlgy2

src/utility.ts

@@ -1,8 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { window, workspace, WorkspaceFolder } from "vscode";
+import { Uri, window, workspace, WorkspaceFolder } from "vscode";
 import { setUserError } from "vscode-extension-telemetry-wrapper";
+import { languageServerApiManager } from "./languageServerApi/languageServerApiManager";
+import { Settings } from "./settings";
 
 export class Utility {
 
@@ -21,6 +23,19 @@ export class Utility {
         return undefined;
     }
 
+    public static async isRevealable(uri: Uri): Promise<boolean> {
+        if (!SUPPORTED_URI_SCHEMES.includes(uri.scheme)) {
+            return false;
+        }
+        if (uri.scheme === "file" && !workspace.getWorkspaceFolder(uri)) {
+            return false;
+        }
+        if (!Settings.syncWithFolderExplorer() || !await languageServerApiManager.isStandardServerReady()) {
+            return false;
+        }
+        return true;
+    }
+
 }
 
 export class UserError extends Error {
@@ -61,6 +76,8 @@ const keywords: Set<string> = new Set([
     "const", "for", "new", "switch", "continue", "goto", "package", "synchronized", "true", "false", "null", "assert", "enum",
 ]);
 
+const SUPPORTED_URI_SCHEMES: string[] = ["file", "jdt"];
+
 export function isKeyword(identifier: string): boolean {
     return keywords.has(identifier);
 }

src/views/dataNode.ts

@@ -110,7 +110,7 @@ export abstract class DataNode extends ExplorerNode {
 
     protected abstract get iconPath(): string | Uri | { light: string | Uri; dark: string | Uri } | ThemeIcon;
 
-    protected async abstract loadData(): Promise<any[] | undefined>;
+    protected abstract loadData(): Promise<any[] | undefined>;
 
     protected abstract createChildNodeList(): ExplorerNode[] | undefined;
 }

src/views/dependencyDataProvider.ts

@@ -125,7 +125,7 @@ export class DependencyDataProvider implements TreeDataProvider<ExplorerNode> {
         const projects = await this.getRootProjects();
         const project = projects ? <DataNode>projects.find((node: DataNode) =>
             node.path === projectNodeData?.path && node.nodeData.name === projectNodeData?.name) : undefined;
-        return project ? project.revealPaths(paths) : undefined;
+        return project?.revealPaths(paths);
     }
 
     private doRefresh(element?: ExplorerNode): void {

src/views/dependencyExplorer.ts

@@ -13,8 +13,7 @@ import { renameFile } from "../explorerCommands/rename";
 import { getCmdNode } from "../explorerCommands/utility";
 import { Jdtls } from "../java/jdtls";
 import { INodeData } from "../java/nodeData";
-import { languageServerApiManager } from "../languageServerApi/languageServerApiManager";
-import { Settings } from "../settings";
+import { Utility } from "../utility";
 import { Lock } from "../utils/Lock";
 import { DataNode } from "./dataNode";
 import { DependencyDataProvider } from "./dependencyDataProvider";
@@ -38,34 +37,30 @@ export class DependencyExplorer implements Disposable {
 
     private _dataProvider: DependencyDataProvider;
 
-    private readonly SUPPORTED_URI_SCHEMES: string[] = ["file", "jdt"];
-
     constructor(public readonly context: ExtensionContext) {
         this._dataProvider = new DependencyDataProvider(context);
         this._dependencyViewer = window.createTreeView("javaProjectExplorer", { treeDataProvider: this._dataProvider, showCollapseAll: true });
 
         context.subscriptions.push(
-            window.onDidChangeActiveTextEditor((textEditor: TextEditor) => {
-                if (this._dependencyViewer.visible && textEditor && textEditor.document && Settings.syncWithFolderExplorer()) {
+            window.onDidChangeActiveTextEditor((textEditor: TextEditor | undefined) => {
+                if (this._dependencyViewer.visible && textEditor?.document) {
                     const uri: Uri = textEditor.document.uri;
-                    if (this.SUPPORTED_URI_SCHEMES.includes(uri.scheme)) {
-                        this.reveal(uri);
-                    }
+                    this.reveal(uri);
                 }
             }),
         );
 
         context.subscriptions.push(
             this._dependencyViewer.onDidChangeVisibility((e: TreeViewVisibilityChangeEvent) => {
-                if (e.visible && window.activeTextEditor && Settings.syncWithFolderExplorer()) {
+                if (e.visible && window.activeTextEditor) {
                     this.reveal(window.activeTextEditor.document.uri);
                 }
             }),
         );
 
         context.subscriptions.push(
             this._dataProvider.onDidChangeTreeData(() => {
-                if (window.activeTextEditor && Settings.syncWithFolderExplorer()) {
+                if (window.activeTextEditor) {
                     this.reveal(window.activeTextEditor.document.uri);
                 }
             }),
@@ -140,7 +135,7 @@ export class DependencyExplorer implements Disposable {
         try {
             await this._lock.acquire();
 
-            if (!await languageServerApiManager.isStandardServerReady()) {
+            if (!await Utility.isRevealable(uri)) {
                 return;
             }