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

VIM-2615 add support to sort u command #638

Merged
merged 1 commit into from
May 29, 2023
Merged

VIM-2615 add support to sort u command #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 26 additions & 10 deletions src/main/java/com/maddyhome/idea/vim/group/ChangeGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package com.maddyhome.idea.vim.group;

import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import com.intellij.codeInsight.actions.AsyncActionExecutionService;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.DataContext;
Expand Down Expand Up @@ -49,6 +48,7 @@
import com.maddyhome.idea.vim.newapi.IjEditorExecutionContextKt;
import com.maddyhome.idea.vim.newapi.IjVimCaret;
import com.maddyhome.idea.vim.newapi.IjVimEditor;
import com.maddyhome.idea.vim.vimscript.model.commands.SortOption;
import kotlin.Pair;
import kotlin.Unit;
import kotlin.jvm.functions.Function0;
Expand All @@ -58,10 +58,9 @@
import org.jetbrains.annotations.TestOnly;

import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;

import static com.maddyhome.idea.vim.api.VimInjectorKt.injector;
import static com.maddyhome.idea.vim.api.VimInjectorKt.options;
Expand Down Expand Up @@ -500,9 +499,11 @@ public void indentRange(@NotNull VimEditor editor,
* @param editor The editor to replace text in
* @param range The range to sort
* @param lineComparator The comparator to use to sort
* @param sortOption The option to sort the range
* @return true if able to sort the text, false if not
*/
public boolean sortRange(@NotNull VimEditor editor, @NotNull VimCaret caret, @NotNull LineRange range, @NotNull Comparator<String> lineComparator) {
public boolean sortRange(@NotNull VimEditor editor, @NotNull VimCaret caret, @NotNull LineRange range, @NotNull Comparator<String> lineComparator,
@NotNull SortOption sortOption) {
final int startLine = range.startLine;
final int endLine = range.endLine;
final int count = endLine - startLine + 1;
Expand All @@ -513,7 +514,7 @@ public boolean sortRange(@NotNull VimEditor editor, @NotNull VimCaret caret, @No
final int startOffset = editor.getLineStartOffset(startLine);
final int endOffset = editor.getLineEndOffset(endLine);

return sortTextRange(editor, caret, startOffset, endOffset, lineComparator);
return sortTextRange(editor, caret, startOffset, endOffset, lineComparator, sortOption);
}

/**
Expand All @@ -523,19 +524,34 @@ public boolean sortRange(@NotNull VimEditor editor, @NotNull VimCaret caret, @No
* @param start The starting position for the sort
* @param end The ending position for the sort
* @param lineComparator The comparator to use to sort
* @param sortOption The option to sort the range
* @return true if able to sort the text, false if not
*/
private boolean sortTextRange(@NotNull VimEditor editor,
@NotNull VimCaret caret,
int start,
int end,
@NotNull Comparator<String> lineComparator) {
@NotNull Comparator<String> lineComparator,
@NotNull SortOption sortOption) {
final String selectedText = ((IjVimEditor) editor).getEditor().getDocument().getText(new TextRangeInterval(start, end));
final List<String> lines = Lists.newArrayList(Splitter.on("\n").split(selectedText));
final List<String> lines = StreamSupport.stream(Splitter.on("\n").split(selectedText).spliterator(), false).sorted(lineComparator)
.collect(Collectors.toCollection(ArrayList::new));
if (sortOption.getUnique()) {
Iterator<String> iterator = lines.iterator();
String previous = null;
while (iterator.hasNext()) {
String current = iterator.next();
if (current.equals(previous) || sortOption.getIgnoreCase() && current.equalsIgnoreCase(previous)) {
iterator.remove();
}
else {
previous = current;
}
}
}
if (lines.size() < 1) {
return false;
}
lines.sort(lineComparator);
replaceText(editor, caret, start, end, StringUtil.join(lines, "\n"));
return true;
}
Expand Down
Loading