Skip to content

Commit 3657535

Browse files
committed
fix(code-index): guard disposal races
1 parent 54ffa0f commit 3657535

3 files changed

Lines changed: 60 additions & 0 deletions

File tree

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,20 @@ describe("CodeIndexManagerRegistry", () => {
184184
)
185185
})
186186

187+
it("creates and retains a new manager after disposal fails", () => {
188+
const disposedManager = CodeIndexManagerRegistry.getInstance(context, first.uri.fsPath)!
189+
vi.mocked(disposedManager.dispose).mockImplementation(() => {
190+
throw new Error("cleanup failed")
191+
})
192+
193+
expect(() => CodeIndexManagerRegistry.disposeAll()).toThrow("cleanup failed")
194+
195+
const newManager = CodeIndexManagerRegistry.getInstance(context, first.uri.fsPath)
196+
expect(newManager).toBeDefined()
197+
expect(newManager).not.toBe(disposedManager)
198+
expect(CodeIndexManagerRegistry.getAllInstances()).toEqual([newManager])
199+
})
200+
187201
it("clears the registry before disposal callbacks run", () => {
188202
const manager = CodeIndexManagerRegistry.getInstance(context, first.uri.fsPath)!
189203
vi.mocked(manager.dispose).mockImplementation(() => {

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,39 @@ describe("CodeIndexManager - handleSettingsChange regression", () => {
170170
})
171171

172172
describe("handleSettingsChange", () => {
173+
it("does not remain initialized when disposed during initialization", async () => {
174+
let finishCreatingServices: (() => void) | undefined
175+
const stopIndexing = vi.fn()
176+
const loadConfiguration = vi.fn().mockResolvedValue({ requiresRestart: false })
177+
Object.defineProperty(manager, "_configManager", {
178+
value: {
179+
loadConfiguration,
180+
isFeatureConfigured: true,
181+
isFeatureEnabled: true,
182+
},
183+
configurable: true,
184+
})
185+
Object.defineProperty(manager, "_cacheManager", { value: {}, writable: true })
186+
Object.defineProperty(manager, "_recreateServices", {
187+
value: vi.fn(async () => {
188+
await new Promise<void>((resolve) => {
189+
finishCreatingServices = resolve
190+
})
191+
Object.defineProperty(manager, "_orchestrator", { value: { stopIndexing }, writable: true })
192+
Object.defineProperty(manager, "_searchService", { value: {}, writable: true })
193+
}),
194+
})
195+
const initialization = manager.initialize(mockContext)
196+
await Promise.resolve()
197+
manager.dispose()
198+
finishCreatingServices?.()
199+
await initialization
200+
201+
expect(loadConfiguration).toHaveBeenCalledTimes(1)
202+
expect(stopIndexing).toHaveBeenCalledTimes(1)
203+
expect(manager.isInitialized).toBe(false)
204+
})
205+
173206
it("should log background indexing failures", async () => {
174207
const indexingError = new Error("indexing startup failed")
175208
const startIndexing = vi.fn().mockRejectedValue(indexingError)

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export class CodeIndexManager {
2626
private _searchService: CodeIndexSearchService | undefined
2727
private _cacheManager: CacheManager | undefined
2828
private _sembleProvider: SembleProvider | undefined
29+
private _disposed = false
2930

3031
// Flag to prevent race conditions during error recovery
3132
private _isRecoveringFromError = false
@@ -159,6 +160,14 @@ export class CodeIndexManager {
159160

160161
if (needsServiceRecreation) {
161162
await this._recreateServices()
163+
if (this._disposed) {
164+
this.stopIndexing()
165+
this._sembleProvider?.dispose()
166+
this._orchestrator = undefined
167+
this._searchService = undefined
168+
this._sembleProvider = undefined
169+
return { requiresRestart }
170+
}
162171
}
163172

164173
// 7. Handle Indexing Start/Restart
@@ -289,6 +298,10 @@ export class CodeIndexManager {
289298
* Cleans up the manager instance.
290299
*/
291300
public dispose(): void {
301+
if (this._disposed) {
302+
return
303+
}
304+
this._disposed = true
292305
this.stopIndexing()
293306
if (this._sembleProvider) {
294307
this._sembleProvider.dispose()

0 commit comments

Comments
 (0)