[log] IDEA-117753 trim spaces in log filters

This commit is contained in:
Kirill Likhodedov
2014-03-13 13:18:27 +04:00
parent 8583eb961d
commit 86eda0804b
2 changed files with 8 additions and 2 deletions
@@ -34,6 +34,7 @@ import com.intellij.ui.EditorCustomization;
import com.intellij.ui.EditorTextField;
import com.intellij.ui.EditorTextFieldProvider;
import com.intellij.ui.SoftWrapsEditorCustomization;
import com.intellij.util.Function;
import com.intellij.util.TextFieldCompletionProviderDumbAware;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
@@ -94,7 +95,12 @@ class MultilinePopupBuilder {
@NotNull
Collection<String> getSelectedValues() {
return ContainerUtil.toCollection(StringUtil.tokenize(myTextField.getText().trim(), new String(SEPARATORS)));
return ContainerUtil.map(StringUtil.tokenize(myTextField.getText(), new String(SEPARATORS)), new Function<String, String>() {
@Override
public String fun(String value) {
return value.trim();
}
});
}
private static class MyCompletionProvider extends TextFieldCompletionProviderDumbAware {
@@ -91,7 +91,7 @@ public class VcsLogClassicFilterUi implements VcsLogFilterUi {
@NotNull
@Override
public VcsLogFilterCollection getFilters() {
VcsLogTextFilter textFilter = !myTextFilter.getText().isEmpty() ? new VcsLogTextFilterImpl(myTextFilter.getText()) : null;
VcsLogTextFilter textFilter = !myTextFilter.getText().isEmpty() ? new VcsLogTextFilterImpl(myTextFilter.getText().trim()) : null;
return new VcsLogFilterCollectionImpl(myBranchFilterComponent.getFilter(), myUserFilterComponent.getFilter(),
myDateFilterComponent.getFilter(), textFilter, myStructureFilterComponent.getFilter());
}