Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minimize size of messages for fetching and executing recipes

Browse Source
This commit is contained in:
aboyko
2023-12-18 20:54:59 -05:00
parent f74f3ec291
commit d6ff60a96e
11 changed files with 449 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
vscode-extensions/vscode-spring-boot/lib/rewrite.ts
View File

@@ -11,11 +11,8 @@ interface RecipeDescriptor {
displayName: string;
description: string;
tags: string[];
estimatedEffortPerOccurrence: number;
options: OptionDescriptor[];
languages: string[];
recipeList: RecipeDescriptor[];
source: string;
hasSubRecipes: boolean;
}
interface OptionDescriptor {
@@ -29,10 +26,16 @@ interface OptionDescriptor {
value: any;
}
interface RecipeSelectionDescriptor {
selected: boolean;
id: string;
subselection: RecipeSelectionDescriptor[];
}
interface RecipeQuickPickItem extends VSCode.QuickPickItem{
readonly id: string;
selected: boolean;
children: RecipeQuickPickItem[],
children: RecipeQuickPickItem[] | undefined,
readonly recipeDescriptor: RecipeDescriptor;
}
@@ -95,45 +98,33 @@ async function showRefactorings(uri: VSCode.Uri, filter: string) {
if (!uri) {
uri = await getTargetPomXml();
}
const choices = await showCurrentPathQuickPick(VSCode.commands.executeCommand('sts/rewrite/list', uri.toString(true), filter).then((cmds: RecipeDescriptor[]) => cmds.map(convertToQuickPickItem)), []);
const recipeDescriptors = choices.filter(i => i.selected).map(convertToRecipeDescriptor);
const choices = await showCurrentPathQuickPick(VSCode.commands.executeCommand('sts/rewrite/list', filter).then((cmds: RecipeDescriptor[]) => cmds.map(d => convertToQuickPickItem(d, false))), []);
const recipeDescriptors = choices.filter(i => i.selected).map(convertToRecipeSelectionDescriptor);
const needsConfirmation = await shwoNeedsConfirmation();
if (recipeDescriptors.length) {
const aggregateRecipeDescriptor = recipeDescriptors.length === 1 ? recipeDescriptors[0] : {
name: `${recipeDescriptors.length} recipes`,
displayName: `${recipeDescriptors.length} recipes`,
description: recipeDescriptors.map(d => d.description).join('\n'),
tags: [...new Set<string>(recipeDescriptors.flatMap(d => d.tags))],
languages: [...new Set<string>(recipeDescriptors.flatMap(d => d.languages))],
options: [],
recipeList: recipeDescriptors,
estimatedEffortPerOccurrence: recipeDescriptors.filter(d => d.estimatedEffortPerOccurrence).map(d => d.estimatedEffortPerOccurrence).reduce((p, c) => p + c, 0)
};
if (aggregateRecipeDescriptor.estimatedEffortPerOccurrence === 0) {
delete aggregateRecipeDescriptor.estimatedEffortPerOccurrence;
}
VSCode.commands.executeCommand('sts/rewrite/execute', uri.toString(true), aggregateRecipeDescriptor, needsConfirmation);
VSCode.commands.executeCommand('sts/rewrite/execute', uri.toString(true), recipeDescriptors, needsConfirmation);
} else {
VSCode.window.showErrorMessage('No Recipes were selected!');
}
}
function convertToRecipeDescriptor(i: RecipeQuickPickItem): RecipeDescriptor {
function convertToRecipeSelectionDescriptor(i: RecipeQuickPickItem): RecipeSelectionDescriptor {
return {
...i.recipeDescriptor,
recipeList: i.children.filter(c => c.selected).map(convertToRecipeDescriptor)
selected: i.selected,
id: i.id,
subselection: i.children ? i.children.map(convertToRecipeSelectionDescriptor) : undefined
};
}
function convertToQuickPickItem(i: RecipeDescriptor): RecipeQuickPickItem {
function convertToQuickPickItem(i: RecipeDescriptor, selected?: boolean): RecipeQuickPickItem {
return {
id: i.name,
label: i.displayName,
detail: i.options.filter(o => !!o.value).map(o => `${o.name}: ${JSON.stringify(o.value)}`).join('\n\n'),
description: i.description,
selected: false,
children: i.recipeList ? i.recipeList.map(convertToQuickPickItem) : [],
buttons: i.recipeList && i.recipeList.length ? [ SUB_RECIPES_BUTTON ] : undefined,
selected: !!selected,
children: undefined,
buttons: i.hasSubRecipes ? [ SUB_RECIPES_BUTTON ] : undefined,
recipeDescriptor: i
};
}
@@ -188,7 +179,7 @@ function showCurrentPathQuickPick(itemsPromise: Thenable<RecipeQuickPickItem[]>,
if (e.button === SUB_RECIPES_BUTTON) {
currentItems.forEach(i => i.selected = quickPick.selectedItems.includes(i));
itemsPath.push(e.item);
showCurrentPathQuickPick(Promise.resolve(items), itemsPath).then(resolve, reject);
showCurrentPathQuickPick(navigateToSubRecipes(e.item, itemsPath).then(() => items), itemsPath).then(resolve, reject);
}
});
quickPick.onDidTriggerButton(b => {
@@ -222,6 +213,17 @@ function showCurrentPathQuickPick(itemsPromise: Thenable<RecipeQuickPickItem[]>,
});
}
async function navigateToSubRecipes(item: RecipeQuickPickItem, itemsPath: RecipeQuickPickItem[]) {
if (!item.children) {
const indexPath = [];
for (let i = 1; i < itemsPath.length; i++) {
indexPath.push(itemsPath[i - 1].children.indexOf(itemsPath[i]));
}
const recipeDescriptors: RecipeDescriptor[] = await VSCode.commands.executeCommand('sts/rewrite/sublist', itemsPath[0].id, indexPath);
item.children = recipeDescriptors.map(d => convertToQuickPickItem(d, item.selected));
}
}
function updateParentSelection(hierarchy: RecipeQuickPickItem[]): void {
if (hierarchy.length) {
const parent = hierarchy.pop();

8
vscode-extensions/vscode-spring-boot/package.json
View File

@@ -12,7 +12,7 @@
"license": "EPL-1.0",
"engines": {
"npm": ">=6.0.0",
"vscode": "^1.67.0"
"vscode": "^1.75.0"
},
"categories": [
"Programming Languages",
@@ -26,8 +26,6 @@
"application-yaml"
],
"activationEvents": [
"onCommand:vscode-spring-boot.rewrite.list.refactorings",
"onCommand:vscode-spring-boot.rewrite.list.boot-upgrades",
"onCommand:vscode-spring-boot.ls.start"
],
"contributes": {
@@ -1029,9 +1027,9 @@
},
"devDependencies": {
"@types/node": "^18.8.0",
"@types/vscode": "1.67.0",
"@types/vscode": "1.75.0",
"typescript": "^4.8.0",
"vsce": "^2.11.0"
"vsce": "^2.15.0"
},
"extensionDependencies": [
"redhat.java"