Skip to content

Commit 5f1084f

Browse files
committed
fix(code-index): honor workspace root resolution for status updates
1 parent 66d9fb0 commit 5f1084f

2 files changed

Lines changed: 58 additions & 7 deletions

File tree

‎src/services/code-index/__tests__/code-index-status-manager.spec.ts‎

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
11
import * as vscode from "vscode"
2-
import { makeUri, makeTextDocument, makeTextEditor, makeExtensionContext } from "../../../test-utils/vscode"
2+
import {
3+
makeUri,
4+
makeTextDocument,
5+
makeTextEditor,
6+
makeExtensionContext,
7+
makeWorkspaceConfiguration,
8+
} from "../../../test-utils/vscode"
39
import { CodeIndexManager } from "../manager"
410
import { CodeIndexStateManager } from "../state-manager"
511
import { CodeIndexStatusManager, type CodeIndexStatus } from "../code-index-status-manager"
612

13+
// Reload the real workspace resolver against this suite's VS Code mock,
14+
// rather than the VS Code instance cached by the global test setup.
15+
vi.hoisted(() => vi.resetModules())
16+
717
vi.mock("../../../core/webview/ClineProvider", () => ({ ClineProvider: { getAllInstances: vi.fn(() => []) } }))
818
vi.mock("../manager")
919
vi.mock("../state-manager")
1020

1121
vi.mock("vscode", () => ({
1222
window: { onDidChangeActiveTextEditor: vi.fn(), activeTextEditor: undefined },
13-
workspace: { workspaceFolders: undefined, getWorkspaceFolder: vi.fn() },
23+
workspace: { workspaceFolders: undefined, getWorkspaceFolder: vi.fn(), getConfiguration: vi.fn() },
1424
}))
1525

1626
function makeSource(workspacePath: string) {
@@ -52,6 +62,7 @@ describe("CodeIndexStatusManager", () => {
5262

5363
beforeEach(() => {
5464
vi.clearAllMocks()
65+
vi.mocked(vscode.workspace.getConfiguration).mockReturnValue(makeWorkspaceConfiguration())
5566
Object.defineProperty(vscode.window, "activeTextEditor", { configurable: true, value: undefined })
5667
Object.defineProperty(vscode.workspace, "workspaceFolders", {
5768
configurable: true,
@@ -89,6 +100,48 @@ describe("CodeIndexStatusManager", () => {
89100
manager.dispose()
90101
})
91102

103+
it.each([
104+
["firstFolder", "/first"],
105+
["activeEditor", "/second"],
106+
])("publishes status for the configured %s workspace", (strategy, expectedPath) => {
107+
vi.mocked(vscode.workspace.getConfiguration).mockReturnValue(
108+
makeWorkspaceConfiguration({ "workspace.rootResolution": strategy }),
109+
)
110+
const firstFolder = { uri: makeUri("/first"), name: "first", index: 0 }
111+
const secondFolder = { uri: makeUri("/second"), name: "second", index: 1 }
112+
Object.defineProperty(vscode.workspace, "workspaceFolders", {
113+
configurable: true,
114+
value: [firstFolder, secondFolder],
115+
})
116+
Object.defineProperty(vscode.window, "activeTextEditor", {
117+
configurable: true,
118+
value: makeTextEditor({ document: makeTextDocument({ uri: makeUri("/second/file.ts") }) }),
119+
})
120+
vi.mocked(vscode.workspace.getWorkspaceFolder).mockReturnValue(secondFolder)
121+
const first = makeSource("/first")
122+
const second = makeSource("/second")
123+
const resolve = vi.fn((path: string) => (path === "/first" ? first : second))
124+
const publish = vi.fn()
125+
const manager = new CodeIndexStatusManager(resolve)
126+
manager["publishStatus"] = publish
127+
try {
128+
manager.init()
129+
expect(resolve).toHaveBeenLastCalledWith(expectedPath)
130+
const selected = expectedPath === "/first" ? first : second
131+
const other = selected === first ? second : first
132+
expect(publish).toHaveBeenCalledExactlyOnceWith(selected.status)
133+
expect(other.onProgressUpdate).not.toHaveBeenCalled()
134+
editorChanged()
135+
selected.status.message = "Updated"
136+
selected.emit()
137+
expect(publish).toHaveBeenLastCalledWith(selected.status)
138+
expect(publish).toHaveBeenCalledTimes(2)
139+
expect(selected.onProgressUpdate).toHaveBeenCalledTimes(1)
140+
} finally {
141+
manager.dispose()
142+
}
143+
})
144+
92145
it.each([undefined, []])("does not request a manager without a workspace: %s", (folders) => {
93146
Object.defineProperty(vscode.workspace, "workspaceFolders", { configurable: true, value: folders })
94147
const resolve = vi.fn()

‎src/services/code-index/code-index-status-manager.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as vscode from "vscode"
22
import { ClineProvider } from "../../core/webview/ClineProvider"
3+
import { getWorkspacePath } from "../../utils/path"
34
import type { CodeIndexManager } from "./manager"
45

56
export type CodeIndexStatus = ReturnType<CodeIndexManager["getCurrentStatus"]>
@@ -20,11 +21,8 @@ export class CodeIndexStatusManager implements vscode.Disposable {
2021
}
2122

2223
private getCurrentManager(): CodeIndexManager | undefined {
23-
const editor = vscode.window.activeTextEditor
24-
const folder =
25-
(editor ? vscode.workspace.getWorkspaceFolder(editor.document.uri) : undefined) ??
26-
vscode.workspace.workspaceFolders?.[0]
27-
return folder ? this.getManagerForWorkspace(folder.uri.fsPath) : undefined
24+
const workspacePath = getWorkspacePath()
25+
return workspacePath ? this.getManagerForWorkspace(workspacePath) : undefined
2826
}
2927

3028
private updateSubscription(): void {

0 commit comments

Comments
 (0)