Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-29 13:03:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Align browseDirectory errors with filesystem semantics (Written by Copilot)

Browse Source
This commit is contained in:
Rob Lourens
2026-03-14 12:41:47 -07:00
parent ce5e503640
commit 97ef00da2a
5 changed files with 58 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vs/platform/agentHost/test/node/agentSideEffects.test.ts
View File

@@ -6,6 +6,7 @@
import assert from 'assert';
import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
import { observableValue } from '../../../../base/common/observable.js';
import { URI } from '../../../../base/common/uri.js';
import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
import { NullLogService } from '../../../log/common/log.js';
import { AgentSession, IAgent } from '../../common/agentService.js';
@@ -269,6 +270,25 @@ suite('AgentSideEffects', () => {
});
});
// ---- handleBrowseDirectory ------------------------------------------
suite('handleBrowseDirectory', () => {
test('throws when the directory does not exist', async () => {
await assert.rejects(
() => sideEffects.handleBrowseDirectory(URI.file('/path/that/does/not/exist')),
/Directory not found/,
);
});
test('throws when the target is not a directory', async () => {
await assert.rejects(
() => sideEffects.handleBrowseDirectory(URI.file('/Users/roblou/code/vscode/package.json')),
/Not a directory/,
);
});
});
// ---- agents observable --------------------------------------------------
suite('agents observable', () => {

23
src/vs/platform/agentHost/test/node/protocolServerHandler.test.ts
View File

@@ -10,7 +10,7 @@ import { URI } from '../../../../base/common/uri.js';
import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
import { NullLogService } from '../../../log/common/log.js';
import type { ISessionAction } from '../../common/state/sessionActions.js';
import { isJsonRpcNotification, isJsonRpcResponse, type ICreateSessionParams, type IInitializeResult, type IProtocolMessage, type IProtocolNotification, type IReconnectResult, type IStateSnapshot } from '../../common/state/sessionProtocol.js';
import { isJsonRpcNotification, isJsonRpcResponse, JSON_RPC_INTERNAL_ERROR, ProtocolError, type ICreateSessionParams, type IInitializeResult, type IProtocolMessage, type IProtocolNotification, type IReconnectResult, type IStateSnapshot } from '../../common/state/sessionProtocol.js';
import { SessionStatus, type ISessionSummary } from '../../common/state/sessionState.js';
import { PROTOCOL_VERSION } from '../../common/state/sessionCapabilities.js';
import type { IProtocolServer, IProtocolTransport } from '../../common/state/sessionTransport.js';
@@ -62,6 +62,7 @@ class MockProtocolServer implements IProtocolServer {
class MockSideEffectHandler implements IProtocolSideEffectHandler {
readonly handledActions: ISessionAction[] = [];
readonly browsedUris: URI[] = [];
readonly browseErrors = new Map<string, Error>();
handleAction(action: ISessionAction): void {
this.handledActions.push(action);
@@ -72,6 +73,10 @@ class MockSideEffectHandler implements IProtocolSideEffectHandler {
handleSetAuthToken(_token: string): void { }
async handleBrowseDirectory(uri: URI): Promise<{ entries: { name: string; type: 'file' | 'directory' }[] }> {
this.browsedUris.push(uri);
const error = this.browseErrors.get(uri.toString());
if (error) {
throw error;
}
return {
entries: [
{ name: 'src', type: 'directory' },
@@ -355,4 +360,20 @@ suite('ProtocolServerHandler', () => {
assert.strictEqual(result.entries[1].name, 'README.md');
assert.strictEqual(result.entries[1].type, 'file');
});
test('browseDirectory returns a JSON-RPC error when the target is invalid', async () => {
const transport = connectClient('client-browse-error');
transport.sent.length = 0;
const dirUri = URI.file('/missing');
sideEffects.browseErrors.set(dirUri.toString(), new ProtocolError(JSON_RPC_INTERNAL_ERROR, `Directory not found: ${dirUri.toString()}`));
transport.simulateMessage(request(2, 'browseDirectory', { uri: dirUri }));
await new Promise(resolve => setTimeout(resolve, 10));
const resp = findResponse(transport.sent, 2) as { error?: { code: number; message: string } } | undefined;
assert.ok(resp?.error);
assert.strictEqual(resp.error!.code, JSON_RPC_INTERNAL_ERROR);
assert.match(resp.error!.message, /Directory not found/);
});
});