development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-26 20:39:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support directory history

Browse source 
Fixes #141009
This commit is contained in:
Daniel Imms 2022-02-17 13:27:30 -08:00
parent 72ef0f3977
commit ab0c6f374c
2 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
View file

@ -68,7 +68,7 @@ import { XtermTerminal } from 'vs/workbench/contrib/terminal/browser/xterm/xterm
import { ITerminalCommand, TerminalCapability } from 'vs/workbench/contrib/terminal/common/capabilities/capabilities';
import { TerminalCapabilityStoreMultiplexer } from 'vs/workbench/contrib/terminal/common/capabilities/terminalCapabilityStore';
import { IEnvironmentVariableInfo } from 'vs/workbench/contrib/terminal/common/environmentVariable';
import { getCommandHistory } from 'vs/workbench/contrib/terminal/common/history';
import { getCommandHistory, getDirectoryHistory } from 'vs/workbench/contrib/terminal/common/history';
import { DEFAULT_COMMANDS_TO_SKIP_SHELL, INavigationMode, ITerminalBackend, ITerminalProcessManager, ITerminalProfileResolverService, ProcessState, ShellIntegrationExitCode, TerminalCommandId, TERMINAL_CREATION_COMMANDS, TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
import { formatMessageForTerminal } from 'vs/workbench/contrib/terminal/common/terminalStrings';
@ -404,6 +404,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
this._cwd = e;
this._xtermOnKey?.dispose();
this.refreshTabLabels(this.title, TitleEventSource.Config);
this._instantiationService.invokeFunction(getDirectoryHistory)?.add(e, null);
});
} else if (e === TerminalCapability.CommandDetection) {
this.capabilities.get(TerminalCapability.CommandDetection)?.onCommandFinished(e => {
@ -848,7 +849,27 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
for (const label of cwds) {
items.push({ label });
}
items = items.reverse();
// Gather previous session history
const history = this._instantiationService.invokeFunction(getDirectoryHistory);
const previousSessionItems: IQuickPickItem[] = [];
// Only add previous session item if it's not in this session
for (const [label] of history.entries) {
if (!cwds.includes(label)) {
previousSessionItems.push({
label,
buttons: [removeFromCommandHistoryButton]
});
}
}
if (previousSessionItems.length > 0) {
items.push(
{ type: 'separator', label: 'previous sessions' },
...previousSessionItems
);
}
}
if (items.length === 0) {
return;
@ -859,22 +880,27 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
return new Promise<void>(r => {
quickPick.onDidTriggerItemButton(async e => {
if (e.button === removeFromCommandHistoryButton) {
this._instantiationService.invokeFunction(getCommandHistory)?.remove(e.item.label);
}
const selectedCommand = (e.item as Item).command;
const output = selectedCommand?.getOutput();
if (output && selectedCommand?.command) {
const textContent = await outputProvider.provideTextContent(URI.from(
{
scheme: TerminalOutputProvider.scheme,
path: `${selectedCommand.command}... ${fromNow(selectedCommand.timestamp, true)}`,
fragment: output,
query: `terminal-output-${selectedCommand.timestamp}-${this.instanceId}`
}));
if (textContent) {
await this._editorService.openEditor({
resource: textContent.uri
});
if (type === 'command') {
this._instantiationService.invokeFunction(getCommandHistory)?.remove(e.item.label);
} else {
this._instantiationService.invokeFunction(getDirectoryHistory)?.remove(e.item.label);
}
} else {
const selectedCommand = (e.item as Item).command;
const output = selectedCommand?.getOutput();
if (output && selectedCommand?.command) {
const textContent = await outputProvider.provideTextContent(URI.from(
{
scheme: TerminalOutputProvider.scheme,
path: `${selectedCommand.command}... ${fromNow(selectedCommand.timestamp, true)}`,
fragment: output,
query: `terminal-output-${selectedCommand.timestamp}-${this.instanceId}`
}));
if (textContent) {
await this._editorService.openEditor({
resource: textContent.uri
});
}
}
}
quickPick.hide();

8
src/vs/workbench/contrib/terminal/common/history.ts
View file

@ -53,6 +53,14 @@ export function getCommandHistory(accessor: ServicesAccessor): ITerminalPersiste
return commandHistory;
}
let directoryHistory: ITerminalPersistedHistory<null> | undefined = undefined;
export function getDirectoryHistory(accessor: ServicesAccessor): ITerminalPersistedHistory<null> {
if (!directoryHistory) {
directoryHistory = accessor.get(IInstantiationService).createInstance(TerminalPersistedHistory, 'dirs') as TerminalPersistedHistory<null>;
}
return directoryHistory;
}
export class TerminalPersistedHistory<T> extends Disposable implements ITerminalPersistedHistory<T> {
private readonly _entries: LRUCache<string, T>;
private _timestamp: number = 0;