Skip to content
This repository was archived by the owner on Nov 18, 2022. It is now read-only.

Commit 0e1114b

Browse files
committed
make intent more clear by using easier to understand names in exchange of cargo cult
1 parent 2a5ab78 commit 0e1114b

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/extension.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ interface ProgressParams {
4545
export async function activate(context: ExtensionContext) {
4646
context.subscriptions.push(configureLanguage());
4747

48-
workspace.onDidOpenTextDocument(doc => didOpenTextDocument(doc, context));
49-
workspace.textDocuments.forEach(doc => didOpenTextDocument(doc, context));
48+
workspace.onDidOpenTextDocument(doc => whenOpeningTextDocument(doc, context));
49+
workspace.textDocuments.forEach(doc => whenOpeningTextDocument(doc, context));
5050
workspace.onDidChangeWorkspaceFolders(e =>
51-
didChangeWorkspaceFolders(e, context),
51+
whenChangingWorkspaceFolders(e, context),
5252
);
5353
}
5454

@@ -57,7 +57,7 @@ export async function deactivate() {
5757
}
5858

5959
// Taken from https://github.com/Microsoft/vscode-extension-samples/blob/master/lsp-multi-server-sample/client/src/extension.ts
60-
function didOpenTextDocument(
60+
function whenOpeningTextDocument(
6161
document: TextDocument,
6262
context: ExtensionContext,
6363
) {
@@ -71,17 +71,17 @@ function didOpenTextDocument(
7171
return;
7272
}
7373

74-
if (
75-
workspace
74+
const inMultiProjectMode = workspace
7675
.getConfiguration()
77-
.get<boolean>('rust-client.enableMultiProjectSetup', false)
78-
) {
79-
folder = getCargoTomlWorkspace(folder, document.uri.fsPath);
80-
} else if (
81-
workspace
82-
.getConfiguration()
83-
.get<boolean>('rust-client.nestedMultiRootConfigInOutermost', true)
84-
) {
76+
.get<boolean>('rust-client.enableMultiProjectSetup', false);
77+
78+
const inNestedOuterProjectMode = workspace
79+
.getConfiguration()
80+
.get<boolean>('rust-client.nestedMultiRootConfigInOutermost', true);
81+
82+
if (inMultiProjectMode) {
83+
folder = workspace_util.nearestParentWorkspace(folder, document.uri.fsPath);
84+
} else if (inNestedOuterProjectMode) {
8585
folder = getOuterMostWorkspaceFolder(folder);
8686
}
8787

@@ -139,7 +139,7 @@ function getOuterMostWorkspaceFolder(folder: WorkspaceFolder): WorkspaceFolder {
139139
return folder;
140140
}
141141

142-
function didChangeWorkspaceFolders(
142+
function whenChangingWorkspaceFolders(
143143
e: WorkspaceFoldersChangeEvent,
144144
context: ExtensionContext,
145145
) {

0 commit comments

Comments
 (0)