Skip to content

Update CodeActionOnSaveParticipant #108193

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

Merged
Matt Bierner (mjbvz) merged 2 commits into from
Nov 20, 2020
Merged

Update CodeActionOnSaveParticipant #108193

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f44a5ee
Update CodeActionOnSaveParticipant
turara Oct 6, 2020
b7a0902
Add CodeActionOnSaveParticipant#createCodeActionsOnSave method to rem…
turara Oct 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,7 @@ class CodeActionOnSaveParticipant implements ITextFileSaveParticipant {
? setting
: Object.keys(setting).filter(x => setting[x]);

const codeActionsOnSave = settingItems
.map(x => new CodeActionKind(x));
const codeActionsOnSave = this.createCodeActionsOnSave(settingItems);

if (!Array.isArray(setting)) {
codeActionsOnSave.sort((a, b) => {
Expand Down Expand Up @@ -319,6 +318,28 @@ class CodeActionOnSaveParticipant implements ITextFileSaveParticipant {
await this.applyOnSaveActions(textEditorModel, codeActionsOnSave, excludedActions, progress, token);
}

private createCodeActionsOnSave(settingItems: string[]): CodeActionKind[] {
const actionSeeds = new Set<string>();

// Remove subsets
const len = settingItems.length;

@mjbvz Matt Bierner (mjbvz) Nov 4, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of nested for loops, can you use array.filter? That should simplify the logic

outer: for (let i = 0; i < len; i++) {
const s1 = settingItems[i];
for (let j = 0; j < len; j++) {
if (j === i) {
continue;
}
const s2 = settingItems[j];
if (s1.startsWith(s2) && s1.length > s2.length) {
continue outer;
}
}
actionSeeds.add(s1);
}

return Array.from(actionSeeds).map(x => new CodeActionKind(x));
}

private async applyOnSaveActions(model: ITextModel, codeActionsOnSave: readonly CodeActionKind[], excludes: readonly CodeActionKind[], progress: IProgress<IProgressStep>, token: CancellationToken): Promise<void> {

const getActionProgress = new class implements IProgress<CodeActionProvider> {
Expand Down