Switch colors of search icon for the two search modes (#3871)

CHANGELOG.md

@@ -56,6 +56,7 @@ The new default removes the linked file from the entry instead of deleting the f
 - We fixed the name of the group editing window to "Add group" instead of "Edit Group" when adding a new group. [koppor#277](https://github.com/koppor/jabref/issues/277)
 - We fixed the `pureauth` [BibTeX key generator pattern](https://help.jabref.org/en/BibtexKeyPatterns) to just return the author if no author, but an editor is present.
 - We fixed an issue where the "Copy linked files" dialog produced an error when the entry had no file [#3818](https://github.com/JabRef/jabref/issues/3818)
+- We fixed the coloring of the search box icon in case a user switches to advanced search mode [#3870](https://github.com/JabRef/jabref/issues/3870)
 - We fixed an issue where pressing <kbd>del</kbd> in the `file` field would trigger the delete dialog a second file, if the first file is deleted [#3926](https://github.com/JabRef/jabref/issues/3926)
 
 ### Removed

src/main/java/org/jabref/gui/search/GlobalSearchBar.java

@@ -334,9 +334,11 @@ public void performSearch() {
             searchWorker.cancel(true);
         }
 
-        // An empty search field should cause the search to be cleared.
+        // An empty search field should cause the search to be cleared
         if (searchField.getText().isEmpty()) {
             clearSearch(currentBasePanel);
+            // also make sure the search icon has the standard color
+            searchIcon.setIcon(IconTheme.JabRefIcon.SEARCH.getIcon());
             return;
         }
 

src/main/java/org/jabref/logic/search/SearchQuery.java

@@ -84,6 +84,11 @@ private String getLocalizedRegularExpressionDescription() {
         }
     }
 
+    /**
+     * Tests if the query is an advanced search query described as described in the help
+     *
+     * @return true if the query is an advanced search query
+     */
     public boolean isGrammarBasedSearch() {
         return rule instanceof GrammarBasedSearchRule;
     }

src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java

@@ -27,6 +27,8 @@
 
 /**
  * The search query must be specified in an expression that is acceptable by the Search.g4 grammar.
+ *
+ * This class implements the "Advanced Search Mode" described in the help
  */
 public class GrammarBasedSearchRule implements SearchRule {
 

src/main/java/org/jabref/model/search/rules/SearchRules.java

@@ -1,17 +1,20 @@
 package org.jabref.model.search.rules;
 
-import org.jabref.model.strings.StringUtil;
+import java.util.regex.Pattern;
 
 public class SearchRules {
 
+
+    private static final Pattern SIMPLE_EXPRESSION = Pattern.compile("[^\\p{Punct}]*");
+
     private SearchRules() {
     }
 
     /**
      * Returns the appropriate search rule that fits best to the given parameter.
      */
     public static SearchRule getSearchRuleByQuery(String query, boolean caseSensitive, boolean regex) {
-        if (StringUtil.isBlank(query)) {
+        if (isSimpleQuery(query)) {
             return new ContainBasedSearchRule(caseSensitive);
         }
 
@@ -25,6 +28,10 @@ public static SearchRule getSearchRuleByQuery(String query, boolean caseSensitiv
         }
     }
 
+    private static boolean isSimpleQuery(String query) {
+        return SIMPLE_EXPRESSION.matcher(query).matches();
+    }
+
     private static SearchRule getSearchRule(boolean caseSensitive, boolean regex) {
         if (regex) {
             return new RegexBasedSearchRule(caseSensitive);

src/test/java/org/jabref/logic/search/SearchQueryTest.java

@@ -21,15 +21,15 @@ public void testToString() {
 
     @Test
     public void testIsContainsBasedSearch() {
-        assertFalse(new SearchQuery("asdf", true, false).isContainsBasedSearch());
-        assertFalse(new SearchQuery("asdf", true, true).isContainsBasedSearch());
+        assertTrue(new SearchQuery("asdf", true, false).isContainsBasedSearch());
+        assertTrue(new SearchQuery("asdf", true, true).isContainsBasedSearch());
         assertFalse(new SearchQuery("author=asdf", true, false).isContainsBasedSearch());
     }
 
     @Test
     public void testIsGrammarBasedSearch() {
-        assertTrue(new SearchQuery("asdf", true, false).isGrammarBasedSearch());
-        assertTrue(new SearchQuery("asdf", true, true).isGrammarBasedSearch());
+        assertFalse(new SearchQuery("asdf", true, false).isGrammarBasedSearch());
+        assertFalse(new SearchQuery("asdf", true, true).isGrammarBasedSearch());
         assertTrue(new SearchQuery("author=asdf", true, false).isGrammarBasedSearch());
     }
 
@@ -186,4 +186,13 @@ public void isMatchedForNormalAndFieldBasedSearchMixed() {
 
     }
 
+    @Test
+    public void testSimpleTerm() {
+        String query = "progress";
+
+        SearchQuery result = new SearchQuery(query, false, false);
+
+        assertFalse(result.isGrammarBasedSearch());
+    }
+
 }