forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix editor position byte offset calculation for multibyte utf8 characters - fix #313, #324

This commit is contained in:
Vadim Lopatin 2017-09-25 13:12:56 +03:00
parent c518f55243
commit 2b633184b4
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dub.json
View File

@ -12,7 +12,7 @@
"stringImportPaths": ["views"], "stringImportPaths": ["views"],
"dependencies": { "dependencies": {
"dlangui": "==0.9.144", "dlangui": "==0.9.145",
"dsymbol": "~>0.2.9", "dsymbol": "~>0.2.9",
"dcd": "~>0.9.1" "dcd": "~>0.9.1"
}, },

8
src/dlangide/tools/d/dcdinterface.d
View File

@ -186,8 +186,16 @@ class DCDInterface : Thread {
int end = pos; int end = pos;
for (int i = 0; start > 0 && content[start - 1] != '\n' && i < 10; i++) for (int i = 0; start > 0 && content[start - 1] != '\n' && i < 10; i++)
start--; 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++) for (int i = 0; end < content.length - 1 && content[end] != '\n' && i < 10; i++)
end++; end++;
// correct utf8 codepoint bounds
while(end + 1 < content.length && ((content[end] & 0xC0) == 0x80)) {
end++;
}
return content[start .. pos] ~ "|" ~ content[pos .. end]; return content[start .. pos] ~ "|" ~ content[pos .. end];
} }
return ""; return "";

10
src/dlangide/tools/d/deditortool.d
View File

@ -214,9 +214,10 @@ int caretPositionToByteOffset(string content, TextPosition caretPosition) {
auto bytes = 0; auto bytes = 0;
foreach(c; content) { foreach(c; content) {
if(line == caretPosition.line) { if(line == caretPosition.line) {
if(pos == caretPosition.pos) if(pos >= caretPosition.pos)
break; break;
pos++; if ((c & 0xC0) != 0x80)
pos++;
} else if (line > caretPosition.line) { } else if (line > caretPosition.line) {
break; break;
} }
@ -236,7 +237,7 @@ TextPosition byteOffsetToCaret(string content, int byteOffset) {
int pos = 0; int pos = 0;
TextPosition textPos; TextPosition textPos;
foreach(c; content) { foreach(c; content) {
if(bytes == byteOffset) { if(bytes >= byteOffset) {
//We all good. //We all good.
textPos.line = line; textPos.line = line;
textPos.pos = pos; textPos.pos = pos;
@ -249,7 +250,8 @@ TextPosition byteOffsetToCaret(string content, int byteOffset) {
pos = 0; pos = 0;
} }
else { else {
pos++; if ((c & 0xC0) != 0x80)
pos++;
} }
} }
return textPos; return textPos;

2
views/VERSION
View File

@ -1 +1 @@
v0.7.90 v0.7.91