# HG changeset patch
# User wenzelm
# Date 1283269232 -7200
# Node ID 0998a635684a7c4c56cce31b73dc6629db55fad0
# Parent  e1fb3bbc22aba6e7a892224661aa4c13aa52c740
refined proper_line_range (again), to make text_area_extension work with soft wwrap;
NB: text_area.offsetToXY returns null for "invisible" positions;

diff -r e1fb3bbc22ab -r 0998a635684a src/Tools/jEdit/src/jedit/document_view.scala
--- a/src/Tools/jEdit/src/jedit/document_view.scala	Tue Aug 31 17:35:41 2010 +0200
+++ b/src/Tools/jEdit/src/jedit/document_view.scala	Tue Aug 31 17:40:32 2010 +0200
@@ -99,14 +99,11 @@
 
   /* visible line ranges */
 
-  // simplify slightly odd result of TextArea.getLineEndOffset etc.
+  // simplify slightly odd result of TextArea.getScreenLineEndOffset etc.
   // NB: jEdit already normalizes \r\n and \r to \n
   def proper_line_range(start: Text.Offset, end: Text.Offset): Text.Range =
   {
-    val stop =
-      if (start < end && end - 1 < model.buffer.getLength &&
-          model.buffer.getSegment(end - 1, 1).charAt(0) == '\n') end - 1
-      else end min model.buffer.getLength
+    val stop = if (start < end) end - 1 else end min model.buffer.getLength
     Text.Range(start, stop)
   }
 
@@ -175,8 +172,10 @@
                 val range = line_range.restrict(snapshot.convert(command.range + command_start))
                 val p = text_area.offsetToXY(range.start)
                 val q = text_area.offsetToXY(range.stop)
-                gfx.setColor(Document_View.choose_color(snapshot, command))
-                gfx.fillRect(p.x, y, q.x - p.x, line_height)
+                if (p != null && q != null) {
+                  gfx.setColor(Document_View.choose_color(snapshot, command))
+                  gfx.fillRect(p.x, y, q.x - p.x, line_height)
+                }
               }
             }
             y += line_height