Merge branch 'master' into dh-async-repo

src/text-utils.coffee

@@ -57,11 +57,11 @@ isPairedCharacter = (string, index=0) ->
   isVariationSequence(charCodeA, charCodeB) or
   isCombinedCharacter(charCodeA, charCodeB)
 
-isJapaneseCharacter = (charCode) ->
+IsJapaneseKanaCharacter = (charCode) ->
   0x3000 <= charCode <= 0x30FF
 
-isCjkUnifiedIdeograph = (charCode) ->
-  0x4E00 <= charCode <= 0x9FAF
+isCJKUnifiedIdeograph = (charCode) ->
+  0x4E00 <= charCode <= 0x9FFF
 
 isFullWidthForm = (charCode) ->
   0xFF01 <= charCode <= 0xFF5E or
@@ -70,8 +70,8 @@ isFullWidthForm = (charCode) ->
 isDoubleWidthCharacter = (character) ->
   charCode = character.charCodeAt(0)
 
-  isJapaneseCharacter(charCode) or
-  isCjkUnifiedIdeograph(charCode) or
+  IsJapaneseKanaCharacter(charCode) or
+  isCJKUnifiedIdeograph(charCode) or
   isFullWidthForm(charCode)
 
 isHalfWidthCharacter = (character) ->
@@ -89,6 +89,11 @@ isKoreanCharacter = (character) ->
   0xA960 <= charCode <= 0xA97F or
   0xD7B0 <= charCode <= 0xD7FF
 
+isCJKCharacter = (character) ->
+  isDoubleWidthCharacter(character) or
+  isHalfWidthCharacter(character) or
+  isKoreanCharacter(character)
+
 # Does the given string contain at least surrogate pair, variation sequence,
 # or combined character?
 #
@@ -102,4 +107,4 @@ hasPairedCharacter = (string) ->
     index++
   false
 
-module.exports = {isPairedCharacter, hasPairedCharacter, isDoubleWidthCharacter, isHalfWidthCharacter, isKoreanCharacter}
+module.exports = {isPairedCharacter, hasPairedCharacter, isDoubleWidthCharacter, isHalfWidthCharacter, isKoreanCharacter, isCJKCharacter}

src/tokenized-line.coffee

@@ -1,5 +1,5 @@
 _ = require 'underscore-plus'
-{isPairedCharacter} = require './text-utils'
+{isPairedCharacter, isCJKCharacter} = require './text-utils'
 Token = require './token'
 {SoftTab, HardTab, PairedCharacter, SoftWrapIndent} = require './special-token-symbols'
 
@@ -322,15 +322,18 @@ class TokenizedLine
     return unless @text.length > maxColumn
 
     if /\s/.test(@text[maxColumn])
-       # search forward for the start of a word past the boundary
+      # search forward for the start of a word past the boundary
       for column in [maxColumn..@text.length]
         return column if /\S/.test(@text[column])
 
       return @text.length
+    else if isCJKCharacter(@text[maxColumn])
+      maxColumn
     else
       # search backward for the start of the word on the boundary
       for column in [maxColumn..@firstNonWhitespaceIndex]
-        return column + 1 if /\s/.test(@text[column])
+        if /\s/.test(@text[column]) or isCJKCharacter(@text[column])
+          return column + 1
 
       return maxColumn