Skip to content

Add Sorting Functionality for Quick Search Results #3012

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Sorting Functionality for Quick Search Results #3012

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
88 changes: 80 additions & 8 deletions ...ipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Deque;
import java.util.LinkedList;
import java.util.List;
Expand Down Expand Up @@ -840,19 +841,47 @@ public void getName(AccessibleEvent e) {
// new ScrollListener(list.getTable().getVerticalBar());
// new SelectionChangedListener(list);

final int[] sortColumnIndex = {-1};
final boolean[] sortDirectionAscending = {true};
Table table = list.getTable();
TableViewerColumn col = new TableViewerColumn(list, SWT.RIGHT);
TableColumn column = col.getColumn();
column.setText(Messages.QuickSearchDialog_line);
column.setWidth(40);
column.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
Comparator<LineItem> lineNumberComparator = Comparator.comparingInt(LineItem::getLineNumber);
handleColumnSort( table, 0, lineNumberComparator, sortColumnIndex, sortDirectionAscending);
}
});
col.setLabelProvider(LINE_NUMBER_LABEL_PROVIDER);
col.getColumn().setText(Messages.QuickSearchDialog_line);
col.getColumn().setWidth(40);

col = new TableViewerColumn(list, SWT.LEFT);
col.getColumn().setText(Messages.QuickSearchDialog_text);
column = col.getColumn();
column.setText(Messages.QuickSearchDialog_text);
column.setWidth(400);
column.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
Comparator<LineItem> textComparator = Comparator.comparing( LineItem::getText);
handleColumnSort( table, 1, textComparator, sortColumnIndex, sortDirectionAscending);
}
});
col.setLabelProvider(LINE_TEXT_LABEL_PROVIDER);
col.getColumn().setWidth(400);

col = new TableViewerColumn(list, SWT.LEFT);
col.getColumn().setText(Messages.QuickSearchDialog_path);
column = col.getColumn();
column.setText(Messages.QuickSearchDialog_path);
column.setWidth(150);
column.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
Comparator<LineItem> lineItemComparator = Comparator.comparing( item -> item.getFile().getFullPath().toString());
handleColumnSort( table, 2,lineItemComparator, sortColumnIndex, sortDirectionAscending);
}
});
col.setLabelProvider(LINE_FILE_LABEL_PROVIDER);
col.getColumn().setWidth(150);

new TableResizeHelper(list).enableResizing();

//list.setLabelProvider(getItemsListLabelProvider());
Expand Down Expand Up @@ -951,6 +980,26 @@ public void keyPressed(KeyEvent e) {
return dialogArea;
}

private void handleColumnSort(Table table, int columnIndex, Comparator sorter,int[] sortColumnIndex, boolean[] sortDirectionAscending) {
if (sortColumnIndex[0] == columnIndex) {
sortDirectionAscending[0] = !sortDirectionAscending[0];
} else {
sortColumnIndex[0] = columnIndex;
sortDirectionAscending[0] = true;
}
table.setSortColumn(table.getColumn(columnIndex));
table.setSortDirection(sortDirectionAscending[0] ? SWT.UP : SWT.DOWN);

if(sortDirectionAscending[0]) {
contentProvider.setComparator(sorter);
contentProvider.sortList();
} else {
contentProvider.setComparator(sorter.reversed());
contentProvider.sortList();
}
refreshWidgets();
}

private Composite createNestedComposite(Composite parent, int numRows, boolean equalRows) {
Composite nested = new Composite(parent, SWT.NONE);
{
Expand Down Expand Up @@ -1227,6 +1276,7 @@ protected IDialogSettings getDialogSettings() {
public void refreshWidgets() {
if (list != null && !list.getTable().isDisposed()) {
int itemCount = contentProvider.getNumberOfElements();
contentProvider.sortList();
list.setItemCount(itemCount);
if (itemCount < MAX_RESULTS) {
listLabel.setText(NLS.bind(Messages.QuickSearchDialog_listLabel, itemCount));
Expand Down Expand Up @@ -1468,7 +1518,7 @@ private void applyPathMatcher() {
private class ContentProvider implements IStructuredContentProvider, ILazyContentProvider {

private List items;

private Comparator<LineItem> comparator;
/**
* Creates new instance of <code>ContentProvider</code>.
*/
Expand Down Expand Up @@ -1511,6 +1561,9 @@ public void refresh() {
*/
@Override
public Object[] getElements(Object inputElement) {
if(comparator!=null) {
items.sort(comparator);
}
return items.toArray();
}

Expand Down Expand Up @@ -1551,6 +1604,25 @@ public void updateElement(int index) {

}

/**
* Sorts the current search results based on current comparator
*/
public void sortList() {
if(comparator==null) {
return;
}
items.sort(comparator);
}

/**
* Sets a custom comparator for comparing LineItem objects.
*
* @param comparator a <code>Comparator<code> object that defines the custom comparison logic.
*/
public void setComparator(Comparator<LineItem> comparator) {
this.comparator = comparator;
}

}

/**
Expand Down