simplify and refactor, debugging #251

acejump · Oct 10, 2018 · 6075cdf · 6075cdf
1 parent 97e2eec
commit 6075cdf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/src/main/kotlin/org/acejump/search/AceUtil.kt b/src/main/kotlin/org/acejump/search/AceUtil.kt
@@ -31,8 +31,7 @@ operator fun CharSequence.get(i: Int, j: Int) = substring(i, j).toCharArray()
 
 fun String.hasSpaceRight(i: Int) = length <= i + 1 || this[i + 1].isWhitespace()
 
-fun runAndWait(t: () -> Unit) =
-  ApplicationManager.getApplication().invokeAndWait(t, defaultModalityState())
+fun runAndWait(t: () -> Unit) = ApplicationManager.getApplication().invokeAndWait(t)
 
 fun runLater(t: () -> Unit) = ApplicationManager.getApplication().invokeLater(t)
 

diff --git a/src/main/kotlin/org/acejump/search/Finder.kt b/src/main/kotlin/org/acejump/search/Finder.kt
@@ -27,6 +27,7 @@ import kotlin.system.measureTimeMillis
  */
 
 object Finder : Resettable {
+  @Volatile
   private var results: SortedSet<Int> = sortedSetOf()
   @Volatile
   private var textHighlights = listOf<RangeHighlighter>()
@@ -81,7 +82,7 @@ object Finder : Resettable {
       skim = true
       logger.info("Skimming document for matches of: $query")
       search()
-      Trigger(400L) { runLater { skim = false; search() } }
+      Trigger(400L) { skim = false; search() }
     } else search()
 
   fun search(pattern: Pattern, bounds: Boundary = FULL_FILE_BOUNDARY) {
@@ -108,28 +109,29 @@ object Finder : Resettable {
    * @see com.intellij.openapi.editor.markup.MarkupModel
    */
 
-  fun paintTextHighlights(model: AceFindModel = AceFindModel(query)) {
-    val newHighlights = results.map { index ->
-      val s = if (index == editorText.length) index - 1 else index
-      val e = if (model.isRegularExpressions) s + 1 else s + query.length
-      createTextHighlight(s, e)
-    }
+  fun paintTextHighlights(model: AceFindModel = AceFindModel(query)) =
+    runLater {
+      val newHighlights = results.map { index ->
+        val s = if (index == editorText.length) index - 1 else index
+        val e = if (model.isRegularExpressions) s + 1 else s + query.length
+        createTextHighlight(s, e)
+      }
 
-    if (!results.isEmpty()) {
-      textHighlights.forEach { markup.removeHighlighter(it) }
-      textHighlights = newHighlights
-    }
+      if (!results.isEmpty()) {
+        textHighlights.forEach { markup.removeHighlighter(it) }
+        textHighlights = newHighlights
+      }
 
-    viewHighlights = textHighlights.filter { it.startOffset in viewBounds }
-  }
+      viewHighlights = textHighlights.filter { it.startOffset in viewBounds }
+    }
 
   private fun createTextHighlight(start: Int, end: Int) =
     markup.addRangeHighlighter(start, end, HIGHLIGHT_LAYER, null, EXACT_RANGE)
       .apply { customRenderer = Marker(query, null, this.startOffset) }
 
   private fun tag(model: AceFindModel, results: SortedSet<Int>) {
     synchronized(this) { Tagger.markOrJump(model, results) }
-    viewHighlights = viewHighlights.narrowBy { Tagger canDiscard startOffset }
+    viewHighlights = viewHighlights.discardIf { Tagger canDiscard startOffset }
       .also { newHighlights ->
         val numDiscarded = viewHighlights.size - newHighlights.size
         if (numDiscarded != 0) logger.info("Discarded $numDiscarded highlights")
@@ -138,7 +140,7 @@ object Finder : Resettable {
     if (model.stringToFind == query || model.isRegularExpressions) Handler.repaintTagMarkers()
   }
 
-  private fun List<RangeHighlighter>.narrowBy(cond: RangeHighlighter.() -> Boolean) =
+  private fun List<RangeHighlighter>.discardIf(cond: RangeHighlighter.() -> Boolean) =
     filter {
       if (cond(it)) {
         runLater { markup.removeHighlighter(it) }

diff --git a/src/main/kotlin/org/acejump/view/Canvas.kt b/src/main/kotlin/org/acejump/view/Canvas.kt
@@ -5,6 +5,7 @@ import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.editor.Editor
 import org.acejump.search.Resettable
 import org.acejump.search.getView
+import org.acejump.search.runLater
 import org.acejump.view.Model.fontWidth
 import org.acejump.view.Model.viewBounds
 import java.awt.Graphics
@@ -27,7 +28,7 @@ object Canvas : JComponent(), Resettable {
   var jumpLocations: Collection<Marker> = emptyList()
     set(value) {
       field = value
-      repaint()
+      runLater { repaint() }
     }
 
   fun Editor.bindCanvas() {