Handle regular expressions in global search [WIP]

Fixes JabRef#5349
CaptainDaVinci · Oct 15, 2019 · 2f89a04 · 2f89a04
1 parent b3cda90
commit 2f89a04
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
@@ -8,6 +8,7 @@
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 
 import javax.swing.undo.UndoManager;
 
@@ -112,7 +113,11 @@ public SourceTab(BibDatabaseContext bibDatabaseContext, CountingUndoManager undo
         this.stateManager = stateManager;
 
         stateManager.activeSearchQueryProperty().addListener((observable, oldValue, newValue) -> {
-            searchHighlightPattern = newValue.flatMap(SearchQuery::getPatternForWords);
+            try {
+                searchHighlightPattern = newValue.flatMap(SearchQuery::getPatternForWords);
+            } catch (PatternSyntaxException e) {
+                LOGGER.error(e.getMessage());
+            }
             highlightSearchPattern();
         });
 

diff --git a/src/main/java/org/jabref/gui/preview/PreviewViewer.java b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
@@ -3,6 +3,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -62,7 +63,11 @@ public class PreviewViewer extends ScrollPane implements InvalidationListener {
     private boolean registered;
 
     private ChangeListener<Optional<SearchQuery>> listener = (queryObservable, queryOldValue, queryNewValue) -> {
-        searchHighlightPattern = queryNewValue.flatMap(SearchQuery::getPatternForWords);
+        try {
+            searchHighlightPattern = queryNewValue.flatMap(SearchQuery::getPatternForWords);
+        } catch (PatternSyntaxException e) {
+            LOGGER.error(e.getMessage());
+        }
         highlightSearchPattern();
     };