Merge pull request #130 from vim-jp/fix-js-len

Fix len() for js

Author: mattn

Diff for: js/vimlfunc.js

@@ -155,7 +155,12 @@ function viml_keys(obj) {
 
 function viml_len(obj) {
     if (typeof obj === 'string') {
-      return encodeURIComponent(obj).replace(/%../g, ' ').length;
+      var len = 0;
+      for (var i = 0; i < obj.length; i++) {
+          var c = obj.charCodeAt(i);
+          len += c < 128 ? 1 : ((c > 127) && (c < 2048)) ? 2 : 3;
+      }
+      return len;
     }
     return obj.length;
 }

Diff for: js/vimlparser.js

@@ -155,7 +155,12 @@ function viml_keys(obj) {
 
 function viml_len(obj) {
     if (typeof obj === 'string') {
-      return encodeURIComponent(obj).replace(/%../g, ' ').length;
+      var len = 0;
+      for (var i = 0; i < obj.length; i++) {
+          var c = obj.charCodeAt(i);
+          len += c < 128 ? 1 : ((c > 127) && (c < 2048)) ? 2 : 3;
+      }
+      return len;
     }
     return obj.length;
 }

Diff for: py/vimlfunc.py

@@ -132,7 +132,11 @@ def viml_keys(obj):
 
 def viml_len(obj):
     if type(obj) is str:
-        return len(obj.encode('utf-8'))
+        if sys.version_info < (3, 0):
+            b = bytes(obj)
+        else:
+            b = bytes(obj, 'utf8')
+        return len(b)
     return len(obj)
 
 def viml_printf(*args):

Diff for: py/vimlparser.py

@@ -132,7 +132,11 @@ def viml_keys(obj):
 
 def viml_len(obj):
     if type(obj) is str:
-        return len(obj.encode('utf-8'))
+        if sys.version_info < (3, 0):
+            b = bytes(obj)
+        else:
+            b = bytes(obj, 'utf8')
+        return len(b)
     return len(obj)
 
 def viml_printf(*args):

Diff for: test/test1.ok

@@ -53,3 +53,4 @@
 (let %= a 5)
 (let ..= a 'foo')
 (echo (concat (concat 'foo' 'bar') 'baz'))
+(let = a '🐥')

Diff for: test/test1.vim

@@ -58,3 +58,4 @@ let a /= 4
 let a %= 5
 let a ..= 'foo'
 echo ('foo' .. 'bar')..'baz'
+let a = '🐥'