Custom regex search support

ippschi · Oct 15, 2019 · c10b4c3 · c10b4c3
1 parent 622ba42
commit c10b4c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/main/kotlin/org/acejump/control/Handler.kt b/src/main/kotlin/org/acejump/control/Handler.kt
@@ -55,6 +55,9 @@ object Handler : TypedActionHandler, Resettable {
   fun regexSearch(regex: Pattern, bounds: Boundary = FULL_FILE_BOUNDARY) =
     Canvas.reset().also { Finder.search(regex, bounds) }
 
+  fun customRegexSearch(regex: String, bounds: Boundary = FULL_FILE_BOUNDARY) =
+    Canvas.reset().also { Finder.search(regex, bounds) }
+
   fun activate() = if (!enabled) configureEditor() else { }
 
   private fun clear() {

diff --git a/src/main/kotlin/org/acejump/search/Finder.kt b/src/main/kotlin/org/acejump/search/Finder.kt
@@ -86,11 +86,15 @@ object Finder : Resettable {
 
   fun search(pattern: Pattern, bounds: Boundary = FULL_FILE_BOUNDARY) {
     logger.info("Searching for regular expression: ${pattern.name} in $bounds")
+    search(pattern.string, bounds)
+  }
+
+  fun search(pattern: String, bounds: Boundary = FULL_FILE_BOUNDARY) {
     boundaries = bounds
     // TODO: Fix this broken reset
     reset()
     Tagger.reset()
-    search(AceFindModel(pattern.string, true))
+    search(AceFindModel(pattern, true))
   }
 
   fun search(model: AceFindModel = AceFindModel(query)) {