From 2b633184b47c4c88b3564aa0ad70d265fae0f9c5 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Mon, 25 Sep 2017 13:12:56 +0300
Subject: [PATCH] fix editor position byte offset calculation for multibyte
 utf8 characters - fix #313, #324

---
 dub.json                            |  2 +-
 src/dlangide/tools/d/dcdinterface.d |  8 ++++++++
 src/dlangide/tools/d/deditortool.d  | 10 ++++++----
 views/VERSION                       |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/dub.json b/dub.json
index 96247cd..cab64d5 100644
--- a/dub.json
+++ b/dub.json
@@ -12,7 +12,7 @@
     "stringImportPaths": ["views"],
 
     "dependencies": {
-        "dlangui": "==0.9.144",
+        "dlangui": "==0.9.145",
         "dsymbol": "~>0.2.9",
         "dcd": "~>0.9.1"
     },
diff --git a/src/dlangide/tools/d/dcdinterface.d b/src/dlangide/tools/d/dcdinterface.d
index 4390aa3..e064169 100644
--- a/src/dlangide/tools/d/dcdinterface.d
+++ b/src/dlangide/tools/d/dcdinterface.d
@@ -186,8 +186,16 @@ class DCDInterface : Thread {
             int end = pos;
             for (int i = 0; start > 0 && content[start - 1] != '\n' && i < 10; i++)
                 start--;
+            // correct utf8 codepoint bounds
+            while(start + 1 < content.length && ((content[start] & 0xC0) == 0x80)) {
+                start++;
+            }
             for (int i = 0; end < content.length - 1 && content[end] != '\n' && i < 10; i++)
                 end++;
+            // correct utf8 codepoint bounds
+            while(end + 1 < content.length && ((content[end] & 0xC0) == 0x80)) {
+                end++;
+            }
             return content[start .. pos] ~ "|" ~ content[pos .. end];
         }
         return "";
diff --git a/src/dlangide/tools/d/deditortool.d b/src/dlangide/tools/d/deditortool.d
index 9d8367b..81445a0 100644
--- a/src/dlangide/tools/d/deditortool.d
+++ b/src/dlangide/tools/d/deditortool.d
@@ -214,9 +214,10 @@ int caretPositionToByteOffset(string content, TextPosition caretPosition) {
     auto bytes = 0;
     foreach(c; content) {
         if(line == caretPosition.line) {
-            if(pos == caretPosition.pos)
+            if(pos >= caretPosition.pos)
                 break;
-            pos++;
+            if ((c & 0xC0) != 0x80)
+                pos++;
         } else if (line > caretPosition.line) {
             break;
         }
@@ -236,7 +237,7 @@ TextPosition byteOffsetToCaret(string content, int byteOffset) {
     int pos = 0;
     TextPosition textPos;
     foreach(c; content) {
-        if(bytes == byteOffset) {
+        if(bytes >= byteOffset) {
             //We all good.
             textPos.line = line;
             textPos.pos = pos;
@@ -249,7 +250,8 @@ TextPosition byteOffsetToCaret(string content, int byteOffset) {
             pos = 0;
         }
         else {
-            pos++;
+            if ((c & 0xC0) != 0x80)
+                pos++;
         }
     }
     return textPos;
diff --git a/views/VERSION b/views/VERSION
index d091313..0af43a5 100644
--- a/views/VERSION
+++ b/views/VERSION
@@ -1 +1 @@
-v0.7.90
\ No newline at end of file
+v0.7.91
\ No newline at end of file