Skip to content

fix: Duplicated tree items show in the explorer #629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdneo merged 2 commits into from
Jun 9, 2022
Merged

fix: Duplicated tree items show in the explorer #629

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9e0a5b
fix: Duplicated tree items show in the explorer
jdneo Jun 9, 2022
9b617a1
fix tslint
jdneo Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 25 additions & 16 deletions src/views/dependencyExplorer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license.

import AwaitLock from "await-lock";
import * as fse from "fs-extra";
import * as _ from "lodash";
import * as path from "path";
Expand Down Expand Up @@ -38,9 +39,12 @@ export class DependencyExplorer implements Disposable {

private _dataProvider: DependencyDataProvider;

private _revealLock: AwaitLock;

constructor(public readonly context: ExtensionContext) {
this._dataProvider = new DependencyDataProvider(context);
this._dependencyViewer = window.createTreeView("javaProjectExplorer", { treeDataProvider: this._dataProvider, showCollapseAll: true });
this._revealLock = new AwaitLock();

// register reveal events
context.subscriptions.push(
Expand Down Expand Up @@ -141,27 +145,32 @@ export class DependencyExplorer implements Disposable {
}

public async reveal(uri: Uri, needCheckSyncSetting: boolean = true): Promise<void> {
if (needCheckSyncSetting && !Settings.syncWithFolderExplorer()) {
return;
}
try {
await this._revealLock.acquireAsync();
if (needCheckSyncSetting && !Settings.syncWithFolderExplorer()) {
return;
}

if (!await Utility.isRevealable(uri)) {
return;
}
if (!await Utility.isRevealable(uri)) {
return;
}

let node: DataNode | undefined = explorerNodeCache.getDataNode(uri);
if (!node) {
const paths: INodeData[] = await Jdtls.resolvePath(uri.toString());
if (!_.isEmpty(paths)) {
node = await this._dataProvider.revealPaths(paths);
let node: DataNode | undefined = explorerNodeCache.getDataNode(uri);
if (!node) {
const paths: INodeData[] = await Jdtls.resolvePath(uri.toString());
if (!_.isEmpty(paths)) {
node = await this._dataProvider.revealPaths(paths);
}
}
}

if (!node) {
return;
}
if (!node) {
return;
}

await this._dependencyViewer.reveal(node);
await this._dependencyViewer.reveal(node);
} finally {
this._revealLock.release();
}
}

public get dataProvider(): DependencyDataProvider {
Expand Down