bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Rename dependency tree view and dependency provider
Browse Source
Giga Bowser 2025-01-07
parent bfb8127 · commit c0eaff7
Diffstat
-rw-r--r--editors/code/src/commands.ts10
-rw-r--r--editors/code/src/ctx.ts26
2 files changed, 18 insertions, 18 deletions
diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts
index 73e39c900e..64af124e72 100644
--- a/editors/code/src/commands.ts
+++ b/editors/code/src/commands.ts
@@ -288,13 +288,13 @@ export function openCargoToml(ctx: CtxInit): Cmd {
export function revealDependency(ctx: CtxInit): Cmd {
return async (editor: RustEditor) => {
- if (!ctx.dependencies?.isInitialized()) {
+ if (!ctx.dependenciesProvider?.isInitialized()) {
return;
}
const documentPath = editor.document.uri.fsPath;
- const dep = ctx.dependencies?.getDependency(documentPath);
+ const dep = ctx.dependenciesProvider?.getDependency(documentPath);
if (dep) {
- await ctx.treeView?.reveal(dep, { select: true, expand: true });
+ await ctx.dependencyTreeView?.reveal(dep, { select: true, expand: true });
} else {
await revealParentChain(editor.document, ctx);
}
@@ -340,10 +340,10 @@ async function revealParentChain(document: RustDocument, ctx: CtxInit) {
// a open file referencing the old version
return;
}
- } while (!ctx.dependencies?.contains(documentPath));
+ } while (!ctx.dependenciesProvider?.contains(documentPath));
parentChain.reverse();
for (const idx in parentChain) {
- const treeView = ctx.treeView;
+ const treeView = ctx.dependencyTreeView;
if (!treeView) {
continue;
}
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index 37a54abf71..7b5cc9f106 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -84,8 +84,8 @@ export class Ctx implements RustAnalyzerExtensionApi {
private commandFactories: Record<string, CommandFactory>;
private commandDisposables: Disposable[];
private unlinkedFiles: vscode.Uri[];
- private _dependencies: RustDependenciesProvider | undefined;
- private _treeView: vscode.TreeView<Dependency | DependencyFile | DependencyId> | undefined;
+ private _dependenciesProvider: RustDependenciesProvider | undefined;
+ private _dependencyTreeView: vscode.TreeView<Dependency | DependencyFile | DependencyId> | undefined;
private lastStatus: ServerStatusParams | { health: "stopped" } = { health: "stopped" };
private _serverVersion: string;
private statusBarActiveEditorListener: Disposable;
@@ -102,12 +102,12 @@ export class Ctx implements RustAnalyzerExtensionApi {
return this._client;
}
- get treeView() {
- return this._treeView;
+ get dependencyTreeView() {
+ return this._dependencyTreeView;
}
- get dependencies() {
- return this._dependencies;
+ get dependenciesProvider() {
+ return this._dependenciesProvider;
}
constructor(
@@ -285,13 +285,13 @@ export class Ctx implements RustAnalyzerExtensionApi {
...this,
client: client,
};
- this._dependencies = new RustDependenciesProvider(ctxInit);
- this._treeView = vscode.window.createTreeView("rustDependencies", {
- treeDataProvider: this._dependencies,
+ this._dependenciesProvider = new RustDependenciesProvider(ctxInit);
+ this._dependencyTreeView = vscode.window.createTreeView("rustDependencies", {
+ treeDataProvider: this._dependenciesProvider,
showCollapseAll: true,
});
- this.pushExtCleanup(this._treeView);
+ this.pushExtCleanup(this._dependencyTreeView);
vscode.window.onDidChangeActiveTextEditor(async (e) => {
// we should skip documents that belong to the current workspace
if (this.shouldRevealDependency(e)) {
@@ -303,7 +303,7 @@ export class Ctx implements RustAnalyzerExtensionApi {
}
});
- this.treeView?.onDidChangeVisibility(async (e) => {
+ this.dependencyTreeView?.onDidChangeVisibility(async (e) => {
if (e.visible) {
const activeEditor = vscode.window.activeTextEditor;
if (this.shouldRevealDependency(activeEditor)) {
@@ -322,7 +322,7 @@ export class Ctx implements RustAnalyzerExtensionApi {
e !== undefined &&
isRustEditor(e) &&
!isDocumentInWorkspace(e.document) &&
- (this.treeView?.visible || false)
+ (this.dependencyTreeView?.visible || false)
);
}
@@ -423,7 +423,7 @@ export class Ctx implements RustAnalyzerExtensionApi {
} else {
statusBar.command = "rust-analyzer.openLogs";
}
- this.dependencies?.refresh();
+ this.dependenciesProvider?.refresh();
break;
case "warning":
statusBar.color = new vscode.ThemeColor("statusBarItem.warningForeground");