Skip to content

Commit d8864b2

Browse files
authored
use params for query (microsoft#273563)
1 parent 04c6127 commit d8864b2

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

src/vs/workbench/contrib/chat/browser/actions/chatContext.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,8 @@ export class TerminalContext implements IChatContextValueItem {
278278
if (!terminal) {
279279
return;
280280
}
281-
282-
const command = terminal.capabilities.get(TerminalCapability.CommandDetection)?.commands.find(cmd => cmd.id === this._resource.query.replace('command=', ''));
281+
const params = new URLSearchParams(this._resource.query);
282+
const command = terminal.capabilities.get(TerminalCapability.CommandDetection)?.commands.find(cmd => cmd.id === params.get('command'));
283283
if (!command) {
284284
return;
285285
}

src/vs/workbench/contrib/terminal/browser/terminalService.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,8 @@ export class TerminalService extends Disposable implements ITerminalService {
775775
if (instance) {
776776
this.revealTerminal(instance);
777777
const commands = instance.capabilities.get(TerminalCapability.CommandDetection)?.commands;
778-
const relevantCommand = commands?.find(c => c.id === resource.query.replace('command=', ''));
778+
const params = new URLSearchParams(resource.query);
779+
const relevantCommand = commands?.find(c => c.id === params.get('command'));
779780
if (relevantCommand) {
780781
instance.xterm?.markTracker.revealCommand(relevantCommand);
781782
}

src/vs/workbench/contrib/terminal/browser/terminalUri.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,15 @@ export function parseTerminalUri(resource: URI): ITerminalIdentifier {
2222
}
2323

2424
export function getTerminalUri(workspaceId: string, instanceId: number, title?: string, commandId?: string): URI {
25-
25+
const params = new URLSearchParams();
26+
if (commandId) {
27+
params.set('command', commandId);
28+
}
2629
return URI.from({
2730
scheme: Schemas.vscodeTerminal,
2831
path: `/${workspaceId}/${instanceId}`,
2932
fragment: title || undefined,
30-
query: `command=${commandId}`
33+
query: commandId ? params.toString() : undefined
3134
});
3235
}
3336

0 commit comments

Comments
 (0)