# HG changeset patch # User wenzelm # Date 1482224513 -3600 # Node ID d1ca9ce0d9e47e1e509de9687386c91e436ad402 # Parent 08e4b1aeac509b8b444e3d85a44b7bd4d35b22c3 proper counting of chars; diff -r 08e4b1aeac50 -r d1ca9ce0d9e4 src/Tools/jEdit/src/jedit_editor.scala --- a/src/Tools/jEdit/src/jedit_editor.scala Tue Dec 20 09:52:01 2016 +0100 +++ b/src/Tools/jEdit/src/jedit_editor.scala Tue Dec 20 10:01:53 2016 +0100 @@ -273,7 +273,7 @@ JEdit_Lib.buffer_lock(buffer) { (Line.Position.zero /: (Symbol.iterator(JEdit_Lib.buffer_text(buffer)). - zipWithIndex.takeWhile(p => p._2 < offset - 1).map(_._1)))(_.advance_symbols(_)) + zipWithIndex.takeWhile(p => p._2 < offset - 1).map(_._1)))(_.advance(_)) } Some(hyperlink_file(focus, name, pos.line1, pos.column1)) case _ => Some(hyperlink_file(focus, name, line)) @@ -296,7 +296,7 @@ node.commands.iterator.takeWhile(_ != command).map(_.source) ++ (if (offset == 0) Iterator.empty else Iterator.single(command.source(Text.Range(0, command.chunk.decode(offset))))) - val pos = (Line.Position.zero /: sources_iterator)(_.advance_symbols(_)) + val pos = (Line.Position.zero /: sources_iterator)(_.advance(_)) Some(hyperlink_file(focus, file_name, pos.line1, pos.column1)) } }