Skip to content

Fix issue 83: Dependency view sync with opened files should only work… #85

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
andxu merged 1 commit into from
Nov 6, 2018
Merged

Fix issue 83: Dependency view sync with opened files should only work… #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions src/views/dependencyExplorer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license.

import { ExtensionContext, ProviderResult, TextEditor, TreeView, Uri, window } from "vscode";
import { ExtensionContext, ProviderResult, TextEditor, TreeView, TreeViewVisibilityChangeEvent, Uri, window } from "vscode";
import { Jdtls } from "../java/jdtls";
import { INodeData } from "../java/nodeData";
import { Settings } from "../settings";
Expand All @@ -16,6 +16,8 @@ export class DependencyExplorer {

private _dataProvider: DependencyDataProvider;

private _selectionWhenHidden: DataNode;

constructor(public readonly context: ExtensionContext) {
this._dataProvider = new DependencyDataProvider(context);
this._dependencyViewer = window.createTreeView("javaDependencyExplorer", { treeDataProvider: this._dataProvider });
Expand All @@ -25,6 +27,13 @@ export class DependencyExplorer {
this.reveal(textEditor.document.uri);
}
});

this._dependencyViewer.onDidChangeVisibility((e: TreeViewVisibilityChangeEvent) => {
if (e.visible && this._selectionWhenHidden) {
this._dependencyViewer.reveal(this._selectionWhenHidden);
this._selectionWhenHidden = undefined;
}
});
}

public dispose(): void {
Expand Down Expand Up @@ -56,7 +65,11 @@ export class DependencyExplorer {
for (const c of children) {
if (c.path === paths[0].path) {
if (paths.length === 1) {
this._dependencyViewer.reveal(c);
if (this._dependencyViewer.visible) {
this._dependencyViewer.reveal(c);
} else {
this._selectionWhenHidden = c;
}
} else {
paths.shift();
this.revealPath(c, paths);
Expand Down