Fix onivim#170 - Dead key / encoding issues (onivim#173)

* Fix dead keys / UTF-8 character entry * Formatting * Remove logging * Remove additional logging
szbergeron · Mar 20, 2019 · 27e38a0 · 27e38a0
1 parent 53bacef
commit 27e38a0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/assets/viml/init.vim b/assets/viml/init.vim
@@ -49,7 +49,7 @@ augroup END
 function OniGetContext()
     let bufferNumber = bufnr("%")
     let line = line(".")
-    let column = col(".")
+    let column = virtcol(".")
     let modified = getbufvar(bufferNumber, "&modified")
 
     let context = [bufferNumber, line, column, modified]

diff --git a/src/editor/Model/Tokenizer.re b/src/editor/Model/Tokenizer.re
@@ -23,7 +23,7 @@ let _isNonWhitespace = c => !_isWhitespace(c);
 
 let _moveToNextMatchingToken = (f, str, startIdx) => {
   let idx = ref(startIdx);
-  let length = String.length(str);
+  let length = Zed_utf8.length(str);
   let found = ref(false);
 
   while (idx^ < length && ! found^) {
@@ -45,15 +45,15 @@ let _getAllTokens = (s: string, color: Color.t, startPos, endPos) => {
   let idx = ref(startPos);
   let tokens: ref(list(t)) = ref([]);
 
-  let endPos = min(endPos, String.length(s));
+  let endPos = min(endPos, Zed_utf8.length(s));
 
   while (idx^ < endPos) {
     let startToken = _moveToNextNonWhitespace(s, idx^);
     let endToken = min(endPos, _moveToNextWhitespace(s, startToken + 1));
 
     if (startToken < endPos) {
       let length = endToken - startToken;
-      let text = String.sub(s, startToken, length);
+      let text = Zed_utf8.sub(s, startToken, length);
 
       let token: t = {
         text,
@@ -83,7 +83,7 @@ let rec getTokens =
 
   let ret: list(t) =
     switch (tokens) {
-    | [] => _getAllTokens(s, defaultForegroundColor, pos, String.length(s))
+    | [] => _getAllTokens(s, defaultForegroundColor, pos, Zed_utf8.length(s))
     | [last] =>
       _getAllTokens(
         s,
@@ -94,7 +94,7 @@ let rec getTokens =
           defaultBackgroundColor,
         ),
         last.index,
-        String.length(s),
+        Zed_utf8.length(s),
       )
     | [v1, v2, ...tail] =>
       let nextBatch =

diff --git a/src/editor/bin/Input.re b/src/editor/bin/Input.re
@@ -9,6 +9,8 @@ open Oni_Model;
 open Reglfw.Glfw;
 open Reglfw.Glfw.Key;
 
+open CamomileLibraryDefault.Camomile;
+
 let keyPressToString = (~altKey, ~shiftKey, ~ctrlKey, ~superKey, s) => {
   let s = s == "<" ? "lt" : s;
 
@@ -17,11 +19,12 @@ let keyPressToString = (~altKey, ~shiftKey, ~ctrlKey, ~superKey, s) => {
   let s = altKey ? "A-" ++ s : s;
   let s = superKey ? "D-" ++ s : s;
 
-  String.length(s) > 1 ? "<" ++ s ++ ">" : s;
+  let ret = Zed_utf8.length(s) > 1 ? "<" ++ s ++ ">" : s;
+  ret;
 };
 
 let charToCommand = (codepoint: int, mods: Modifier.t) => {
-  let char = String.make(1, Uchar.to_char(Uchar.of_int(codepoint)));
+  let char = Zed_utf8.singleton(UChar.of_int(codepoint));
 
   let altKey = Modifier.isAltPressed(mods);
   let ctrlKey = Modifier.isControlPressed(mods);