DefaultHistory.matchPatterns is broken, fixes #635

jline · Jan 15, 2021 · 9a49718 · 9a49718
1 parent 5d4add1
commit 9a49718
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/reader/src/main/java/org/jline/reader/impl/history/DefaultHistory.java b/reader/src/main/java/org/jline/reader/impl/history/DefaultHistory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2021, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -401,6 +401,8 @@ protected boolean matchPatterns(String patterns, String line) {
                 sb.append('|');
             } else if (ch == '*') {
                 sb.append('.').append('*');
+            } else {
+                sb.append(ch);
             }
         }
         return line.matches(sb.toString());

diff --git a/reader/src/test/java/org/jline/reader/impl/history/HistoryTest.java b/reader/src/test/java/org/jline/reader/impl/history/HistoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2021, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -25,6 +25,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
 
 /**
@@ -176,4 +177,15 @@ public void testAddHistoryLine() throws IOException {
             assertTrue(e.getMessage().startsWith("Bad history file syntax!"));
         }
     }
+
+    @Test
+    public void testMatchPatterns() {
+        DefaultHistory defaultHistory = new DefaultHistory();
+        assertFalse(defaultHistory.matchPatterns("foo", "bar"));
+        assertTrue(defaultHistory.matchPatterns("foo", "foo"));
+        assertTrue(defaultHistory.matchPatterns("foo*", "foobar"));
+        assertTrue(defaultHistory.matchPatterns("foo:bar", "bar"));
+        assertFalse(defaultHistory.matchPatterns("foo*", "bar"));
+    }
+
 }