Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

iterate through all providers before returning #161649

Merged
merged 4 commits into from Sep 26, 2022
Merged

iterate through all providers before returning #161649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60bbfd1
fix #161628
meganrogge Sep 23, 2022
1018271
Update src/vs/workbench/contrib/terminal/test/browser/contextualActio…
meganrogge Sep 23, 2022
69f8fc0
remove mandated spaces
meganrogge Sep 23, 2022
e424272
Merge branch 'main' into merogge/multi-providers
meganrogge Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/vs/workbench/contrib/terminal/browser/terminalBaseContextualActions.ts
View file
Open in desktop
Expand Up @@ -14,9 +14,9 @@ export const GitCommandLineRegex = /git/;
export const GitPushCommandLineRegex = /git\s+push/;
export const AnyCommandLineRegex = /.{4,}/;
export const GitSimilarOutputRegex = /most similar command is\s+([^\s]{3,})/;
export const FreePortOutputRegex = /address already in use \d\.\d\.\d\.\d:(\d\d\d\d)\s+|Unable to bind [^ ]*:(\d+)|can't listen on port (\d+)|listen EADDRINUSE [^ ]*:(\d+)/;
export const GitPushOutputRegex = /git push --set-upstream origin ([^\s]+)\s+/;
export const GitCreatePrOutputRegex = /Create a pull request for \'([^\s]+)\' on GitHub by visiting:\s+remote:\s+(https:.+pull.+)\s+/;
export const FreePortOutputRegex = /address already in use \d\.\d\.\d\.\d:(\d\d\d\d)|Unable to bind [^ ]*:(\d+)|can't listen on port (\d+)|listen EADDRINUSE [^ ]*:(\d+)/;
export const GitPushOutputRegex = /git push --set-upstream origin ([^\s]+)/;
export const GitCreatePrOutputRegex = /Create a pull request for \'([^\s]+)\' on GitHub by visiting:\s+remote:\s+(https:.+pull.+)/;

export function gitSimilarCommand(): ITerminalContextualActionOptions {
return {
Expand Down
33 changes: 16 additions & 17 deletions src/vs/workbench/contrib/terminal/browser/xterm/contextualActionAddon.ts
View file
Open in desktop
Expand Up @@ -152,23 +152,22 @@ export function getMatchActions(command: ITerminalCommand, actionOptions: Map<st
outputMatch = command.getOutputMatch(outputMatcher);
}
const actions = actionOption.getActions({ commandLineMatch, outputMatch }, command);
if (!actions) {
return matchActions.length === 0 ? undefined : matchActions;
}
for (const a of actions) {
matchActions.push({
id: a.id,
label: a.label,
class: a.class,
enabled: a.enabled,
run: async () => {
await a.run();
if (a.commandToRunInTerminal) {
onDidRequestRerunCommand?.fire({ command: a.commandToRunInTerminal, addNewLine: a.addNewLine });
}
},
tooltip: a.tooltip
});
if (actions) {
for (const a of actions) {
matchActions.push({
id: a.id,
label: a.label,
class: a.class,
enabled: a.enabled,
run: async () => {
await a.run();
if (a.commandToRunInTerminal) {
onDidRequestRerunCommand?.fire({ command: a.commandToRunInTerminal, addNewLine: a.addNewLine });
}
},
tooltip: a.tooltip
});
}
}
}
}
Expand Down
47 changes: 44 additions & 3 deletions src/vs/workbench/contrib/terminal/test/browser/contextualActionAddon.test.ts
View file
Open in desktop
Expand Up @@ -117,7 +117,7 @@ suite('ContextualActionAddon', () => {
strictEqual(getMatchActions(createCommand(portCommand, `invalid output`, FreePortOutputRegex), expected), undefined);
});
});
test.skip('returns actions', () => {
test('returns actions', () => {
meganrogge marked this conversation as resolved.
Show resolved Hide resolved
assertMatchOptions(getMatchActions(createCommand(portCommand, output, FreePortOutputRegex), expected), actionOptions);
});
});
Expand All @@ -127,7 +127,7 @@ suite('ContextualActionAddon', () => {
const output = `fatal: The current branch test22 has no upstream branch.
To push the current branch and set the remote as upstream, use

git push --set-upstream origin test22 `;
git push --set-upstream origin test22`;
const exitCode = 128;
const actions = [
{
Expand All @@ -151,7 +151,7 @@ suite('ContextualActionAddon', () => {
strictEqual(getMatchActions(createCommand(`git status`, output, GitPushOutputRegex, exitCode), expectedMap), undefined);
});
});
suite('returns undefined when', () => {
suite('returns actions when', () => {
test('expected unix exit code', () => {
assertMatchOptions(getMatchActions(createCommand(command, output, GitPushOutputRegex, exitCode), expectedMap), actions);
});
Expand Down Expand Up @@ -204,6 +204,47 @@ suite('ContextualActionAddon', () => {
});
});
});
suite('gitPush - multiple providers', () => {
const expectedMap = new Map();
const command = `git push`;
const output = `fatal: The current branch test22 has no upstream branch.
To push the current branch and set the remote as upstream, use

git push --set-upstream origin test22`;
const exitCode = 128;
const actions = [
{
id: 'terminal.gitPush',
label: 'Git push test22',
run: true,
tooltip: 'Git push test22',
enabled: true
}
];
setup(() => {
const pushCommand = gitPushSetUpstream();
const prCommand = gitCreatePr(openerService);
contextualActionAddon.registerCommandFinishedListener(pushCommand);
contextualActionAddon.registerCommandFinishedListener(prCommand);
expectedMap.set(pushCommand.commandLineMatcher.toString(), [pushCommand, prCommand]);
});
suite('returns undefined when', () => {
test('output does not match', () => {
strictEqual(getMatchActions(createCommand(command, `invalid output`, GitPushOutputRegex, exitCode), expectedMap), undefined);
});
test('command does not match', () => {
strictEqual(getMatchActions(createCommand(`git status`, output, GitPushOutputRegex, exitCode), expectedMap), undefined);
});
});
suite('returns actions when', () => {
test('expected unix exit code', () => {
assertMatchOptions(getMatchActions(createCommand(command, output, GitPushOutputRegex, exitCode), expectedMap), actions);
});
test('matching exit status', () => {
assertMatchOptions(getMatchActions(createCommand(command, output, GitPushOutputRegex, 2), expectedMap), actions);
});
});
});
});

function createCommand(command: string, output: string, outputMatcher?: RegExp | string, exitCode?: number): ITerminalCommand {
Expand Down