# HG changeset patch
# User wenzelm
# Date 1347897994 -7200
# Node ID 3cfc114acd0502f9bc5981463b1f265f4594ec5b
# Parent  215ba6884bdf3ee2c8b583a8f650e5b1246a9cbb
tuned signature;

diff -r 215ba6884bdf -r 3cfc114acd05 src/Tools/jEdit/src/document_view.scala
--- a/src/Tools/jEdit/src/document_view.scala	Mon Sep 17 17:56:10 2012 +0200
+++ b/src/Tools/jEdit/src/document_view.scala	Mon Sep 17 18:06:34 2012 +0200
@@ -88,31 +88,6 @@
   }
 
 
-  /* visible text range */
-
-  // NB: TextArea.getScreenLineEndOffset of last line is beyond Buffer.getLength
-  def proper_line_range(start: Text.Offset, end: Text.Offset): Text.Range =
-    Text.Range(start, end min model.buffer.getLength)
-
-  def visible_range(): Option[Text.Range] =
-  {
-    val n = text_area.getVisibleLines
-    if (n > 0) {
-      val start = text_area.getScreenLineStartOffset(0)
-      val raw_end = text_area.getScreenLineEndOffset(n - 1)
-      Some(proper_line_range(start, if (raw_end >= 0) raw_end else model.buffer.getLength))
-    }
-    else None
-  }
-
-  def invalidate_range(range: Text.Range)
-  {
-    text_area.invalidateLineRange(
-      model.buffer.getLineOfOffset(range.start),
-      model.buffer.getLineOfOffset(range.stop))
-  }
-
-
   /* perspective */
 
   def perspective(): Text.Perspective =
@@ -156,7 +131,7 @@
       val old_info = the_info
       if (new_info != old_info) {
         for { opt <- List(old_info, new_info); Text.Info(range, _) <- opt }
-          invalidate_range(range)
+          JEdit_Lib.invalidate_range(text_area, range)
         the_info = new_info
       }
     }
@@ -249,12 +224,13 @@
         val FOLD_MARKER_SIZE = 12
 
         if (gutter.isSelectionAreaEnabled && !gutter.isExpanded && width >= 12 && line_height >= 12) {
-          JEdit_Lib.buffer_lock(model.buffer) {
+          val buffer = model.buffer
+          JEdit_Lib.buffer_lock(buffer) {
             val rendering = Isabelle_Rendering(model.snapshot(), Isabelle.options.value)
 
             for (i <- 0 until physical_lines.length) {
               if (physical_lines(i) != -1) {
-                val line_range = proper_line_range(start(i), end(i))
+                val line_range = JEdit_Lib.proper_line_range(buffer, start(i), end(i))
 
                 // gutter icons
                 rendering.gutter_message(line_range) match {
@@ -318,9 +294,9 @@
                      changed.commands.exists(snapshot.node.commands.contains)))
                   Swing_Thread.later { overview.delay_repaint.invoke() }
 
-                visible_range() match {
+                JEdit_Lib.visible_range(text_area) match {
                   case Some(visible) =>
-                    if (changed.assignment) invalidate_range(visible)
+                    if (changed.assignment) JEdit_Lib.invalidate_range(text_area, visible)
                     else {
                       val visible_cmds =
                         snapshot.node.command_range(snapshot.revert(visible)).map(_._1)
@@ -329,7 +305,7 @@
                           line <- 0 until text_area.getVisibleLines
                           start = text_area.getScreenLineStartOffset(line) if start >= 0
                           end = text_area.getScreenLineEndOffset(line) if end >= 0
-                          range = proper_line_range(start, end)
+                          range = JEdit_Lib.proper_line_range(buffer, start, end)
                           line_cmds = snapshot.node.command_range(snapshot.revert(range)).map(_._1)
                           if line_cmds.exists(changed.commands)
                         } text_area.invalidateScreenLineRange(line, line)
diff -r 215ba6884bdf -r 3cfc114acd05 src/Tools/jEdit/src/jedit_lib.scala
--- a/src/Tools/jEdit/src/jedit_lib.scala	Mon Sep 17 17:56:10 2012 +0200
+++ b/src/Tools/jEdit/src/jedit_lib.scala	Mon Sep 17 18:06:34 2012 +0200
@@ -77,5 +77,35 @@
       }
       catch { case _: ArrayIndexOutOfBoundsException => Text.Range(offset, offset + 1) }
     }
+
+
+  /* proper line range */
+
+  // NB: TextArea.getScreenLineEndOffset of last line is beyond Buffer.getLength
+  def proper_line_range(buffer: JEditBuffer, start: Text.Offset, end: Text.Offset): Text.Range =
+    Text.Range(start, end min buffer.getLength)
+
+
+  /* visible text range */
+
+  def visible_range(text_area: TextArea): Option[Text.Range] =
+  {
+    val buffer = text_area.getBuffer
+    val n = text_area.getVisibleLines
+    if (n > 0) {
+      val start = text_area.getScreenLineStartOffset(0)
+      val raw_end = text_area.getScreenLineEndOffset(n - 1)
+      Some(proper_line_range(buffer, start, if (raw_end >= 0) raw_end else buffer.getLength))
+    }
+    else None
+  }
+
+  def invalidate_range(text_area: TextArea, range: Text.Range)
+  {
+    val buffer = text_area.getBuffer
+    text_area.invalidateLineRange(
+      buffer.getLineOfOffset(range.start),
+      buffer.getLineOfOffset(range.stop))
+  }
 }
 
diff -r 215ba6884bdf -r 3cfc114acd05 src/Tools/jEdit/src/text_area_painter.scala
--- a/src/Tools/jEdit/src/text_area_painter.scala	Mon Sep 17 17:56:10 2012 +0200
+++ b/src/Tools/jEdit/src/text_area_painter.scala	Mon Sep 17 18:06:34 2012 +0200
@@ -119,7 +119,7 @@
 
         for (i <- 0 until physical_lines.length) {
           if (physical_lines(i) != -1) {
-            val line_range = doc_view.proper_line_range(start(i), end(i))
+            val line_range = JEdit_Lib.proper_line_range(buffer, start(i), end(i))
 
             // background color (1)
             for {
@@ -286,7 +286,7 @@
       robust_rendering { rendering =>
         for (i <- 0 until physical_lines.length) {
           if (physical_lines(i) != -1) {
-            val line_range = doc_view.proper_line_range(start(i), end(i))
+            val line_range = JEdit_Lib.proper_line_range(buffer, start(i), end(i))
 
             // foreground color
             for {