Treat Korean characters as different kinds of chars

Shazzaam · Oct 15, 2015 · 4766c98 · 4766c98
1 parent c9eb75c
commit 4766c98
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 22 deletions.
diff --git a/spec/display-buffer-spec.coffee b/spec/display-buffer-spec.coffee
@@ -79,6 +79,17 @@ describe "DisplayBuffer", ->
           expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe("ﾌﾋﾌﾇﾴ￮￮￮hello ")
           expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe("world this is a pretty long line")
 
+      describe "when there are korean characters", ->
+        it "takes them into account when finding the soft wrap column", ->
+          displayBuffer.setDefaultCharWidth(1, 0, 0, 10)
+          buffer.setText("1234세계를 향한 대화, 유니코 제10회유니코드국제")
+
+          expect(displayBuffer.tokenizedLineForScreenRow(0).text).toBe("1234세계를 ")
+          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toBe("향한 대화, ")
+          expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe("유니코 ")
+          expect(displayBuffer.tokenizedLineForScreenRow(3).text).toBe("제10회유니")
+          expect(displayBuffer.tokenizedLineForScreenRow(4).text).toBe("코드국제")
+
       describe "when editor.softWrapAtPreferredLineLength is set", ->
         it "uses the preferred line length as the soft wrap column when it is less than the configured soft wrap column", ->
           atom.config.set('editor.preferredLineLength', 100)

diff --git a/spec/text-editor-component-spec.coffee b/spec/text-editor-component-spec.coffee
@@ -2892,13 +2892,14 @@ describe "TextEditorComponent", ->
         expect(event.abortKeyBinding).toHaveBeenCalled()
 
   describe "when changing the font", ->
-    it "measures the default char, the double width char and the half width char widths ", ->
+    it "measures the default char, the korean char, the double width char and the half width char widths", ->
       expect(editor.getDefaultCharWidth()).toBeCloseTo(12, 0)
 
       component.setFontSize(10)
       nextAnimationFrame()
 
       expect(editor.getDefaultCharWidth()).toBeCloseTo(6, 0)
+      expect(editor.getKoreanCharWidth()).toBeCloseTo(9, 0)
       expect(editor.getDoubleWidthCharWidth()).toBe(10)
       expect(editor.getHalfWidthCharWidth()).toBe(5)
 

diff --git a/spec/text-utils-spec.coffee b/spec/text-utils-spec.coffee
@@ -46,13 +46,11 @@ describe 'text utilities', ->
       expect(textUtils.isPairedCharacter('ae\u0301c', 4)).toBe false
 
   describe ".isDoubleWidthCharacter(character)", ->
-    it "returns true when the character is either japanese, korean, chinese or a full width form", ->
+    it "returns true when the character is either japanese, chinese or a full width form", ->
       expect(textUtils.isDoubleWidthCharacter("我")).toBe(true)
 
       expect(textUtils.isDoubleWidthCharacter("私")).toBe(true)
 
-      expect(textUtils.isDoubleWidthCharacter("우")).toBe(true)
-
       expect(textUtils.isDoubleWidthCharacter("Ｂ")).toBe(true)
       expect(textUtils.isDoubleWidthCharacter("，")).toBe(true)
       expect(textUtils.isDoubleWidthCharacter("￠")).toBe(true)
@@ -65,4 +63,14 @@ describe 'text utilities', ->
       expect(textUtils.isHalfWidthCharacter("ﾋ")).toBe(true)
       expect(textUtils.isHalfWidthCharacter("ﾬ")).toBe(true)
       expect(textUtils.isHalfWidthCharacter("￭")).toBe(true)
+
       expect(textUtils.isHalfWidthCharacter("B")).toBe(false)
+
+  describe ".isKoreanCharacter(character)", ->
+    it "returns true when the character is a korean character", ->
+      expect(textUtils.isKoreanCharacter("우")).toBe(true)
+      expect(textUtils.isKoreanCharacter("가")).toBe(true)
+      expect(textUtils.isKoreanCharacter("ㅢ")).toBe(true)
+      expect(textUtils.isKoreanCharacter("ㄼ")).toBe(true)
+
+      expect(textUtils.isKoreanCharacter("O")).toBe(false)
diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee
@@ -189,19 +189,23 @@ class DisplayBuffer extends Model
   getLineHeightInPixels: -> @lineHeightInPixels
   setLineHeightInPixels: (@lineHeightInPixels) -> @lineHeightInPixels
 
+  getKoreanCharWidth: -> @koreanCharWidth
+
   getHalfWidthCharWidth: -> @halfWidthCharWidth
 
   getDoubleWidthCharWidth: -> @doubleWidthCharWidth
 
   getDefaultCharWidth: -> @defaultCharWidth
 
-  setDefaultCharWidth: (defaultCharWidth, doubleWidthCharWidth, halfWidthCharWidth) ->
+  setDefaultCharWidth: (defaultCharWidth, doubleWidthCharWidth, halfWidthCharWidth, koreanCharWidth) ->
     doubleWidthCharWidth ?= defaultCharWidth
     halfWidthCharWidth ?= defaultCharWidth
-    if defaultCharWidth isnt @defaultCharWidth or doubleWidthCharWidth isnt @doubleWidthCharWidth
+    koreanCharWidth ?= defaultCharWidth
+    if defaultCharWidth isnt @defaultCharWidth or doubleWidthCharWidth isnt @doubleWidthCharWidth and halfWidthCharWidth isnt @halfWidthCharWidth and koreanCharWidth isnt @koreanCharWidth
       @defaultCharWidth = defaultCharWidth
       @doubleWidthCharWidth = doubleWidthCharWidth
       @halfWidthCharWidth = halfWidthCharWidth
+      @koreanCharWidth = koreanCharWidth
       @updateWrappedScreenLines() if @isSoftWrapped() and @getEditorWidthInChars()?
     defaultCharWidth
 
@@ -290,6 +294,8 @@ class DisplayBuffer extends Model
           charWidth = @getDoubleWidthCharWidth()
         else if iterator.hasHalfWidthCharacterAt(textIndex)
           charWidth = @getHalfWidthCharWidth()
+        else if iterator.hasKoreanCharacterAt(textIndex)
+          charWidth = @getKoreanCharWidth()
         else
           charWidth = @getDefaultCharWidth()
 

diff --git a/src/lines-component.coffee b/src/lines-component.coffee
@@ -9,9 +9,11 @@ DummyLineNode.style.visibility = 'hidden'
 DummyLineNode.appendChild(document.createElement('span'))
 DummyLineNode.appendChild(document.createElement('span'))
 DummyLineNode.appendChild(document.createElement('span'))
+DummyLineNode.appendChild(document.createElement('span'))
 DummyLineNode.children[0].textContent = 'x'
 DummyLineNode.children[1].textContent = '我'
 DummyLineNode.children[2].textContent = 'ﾊ'
+DummyLineNode.children[3].textContent = '세'
 
 RangeForMeasurement = document.createRange()
 
@@ -88,11 +90,12 @@ class LinesComponent extends TiledComponent
     defaultCharWidth = DummyLineNode.children[0].getBoundingClientRect().width
     doubleWidthCharWidth = DummyLineNode.children[1].getBoundingClientRect().width
     halfWidthCharWidth = DummyLineNode.children[2].getBoundingClientRect().width
+    koreanCharWidth = DummyLineNode.children[3].getBoundingClientRect().width
 
     @domNode.removeChild(DummyLineNode)
 
     @presenter.setLineHeight(lineHeightInPixels)
-    @presenter.setBaseCharacterWidth(defaultCharWidth, doubleWidthCharWidth, halfWidthCharWidth)
+    @presenter.setBaseCharacterWidth(defaultCharWidth, doubleWidthCharWidth, halfWidthCharWidth, koreanCharWidth)
 
   lineNodeForLineIdAndScreenRow: (lineId, screenRow) ->
     tile = @presenter.tileForRow(screenRow)

diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee
@@ -1122,12 +1122,13 @@ class TextEditorPresenter
       @mouseWheelScreenRow = screenRow
       @didStartScrolling()
 
-  setBaseCharacterWidth: (baseCharacterWidth, doubleWidthCharWidth, halfWidthCharWidth) ->
-    unless @baseCharacterWidth is baseCharacterWidth and @doubleWidthCharWidth is doubleWidthCharWidth and @halfWidthCharWidth is halfWidthCharWidth
+  setBaseCharacterWidth: (baseCharacterWidth, doubleWidthCharWidth, halfWidthCharWidth, koreanCharWidth) ->
+    unless @baseCharacterWidth is baseCharacterWidth and @doubleWidthCharWidth is doubleWidthCharWidth and @halfWidthCharWidth is halfWidthCharWidth and koreanCharWidth is @koreanCharWidth
       @baseCharacterWidth = baseCharacterWidth
       @doubleWidthCharWidth = doubleWidthCharWidth
       @halfWidthCharWidth = halfWidthCharWidth
-      @model.setDefaultCharWidth(baseCharacterWidth, doubleWidthCharWidth, halfWidthCharWidth)
+      @koreanCharWidth = koreanCharWidth
+      @model.setDefaultCharWidth(baseCharacterWidth, doubleWidthCharWidth, halfWidthCharWidth, koreanCharWidth)
       @characterWidthsChanged()
 
   characterWidthsChanged: ->

diff --git a/src/text-editor.coffee b/src/text-editor.coffee
@@ -2976,13 +2976,15 @@ class TextEditor extends Model
   getLineHeightInPixels: -> @displayBuffer.getLineHeightInPixels()
   setLineHeightInPixels: (lineHeightInPixels) -> @displayBuffer.setLineHeightInPixels(lineHeightInPixels)
 
+  getKoreanCharWidth: -> @displayBuffer.getKoreanCharWidth()
+
   getHalfWidthCharWidth: -> @displayBuffer.getHalfWidthCharWidth()
 
   getDoubleWidthCharWidth: -> @displayBuffer.getDoubleWidthCharWidth()
 
   getDefaultCharWidth: -> @displayBuffer.getDefaultCharWidth()
-  setDefaultCharWidth: (defaultCharWidth, doubleWidthCharWidth, halfWidthCharWidth) ->
-    @displayBuffer.setDefaultCharWidth(defaultCharWidth, doubleWidthCharWidth, halfWidthCharWidth)
+  setDefaultCharWidth: (defaultCharWidth, doubleWidthCharWidth, halfWidthCharWidth, koreanCharWidth) ->
+    @displayBuffer.setDefaultCharWidth(defaultCharWidth, doubleWidthCharWidth, halfWidthCharWidth, koreanCharWidth)
 
   setHeight: (height, reentrant=false) ->
     if reentrant

diff --git a/src/text-utils.coffee b/src/text-utils.coffee
@@ -57,13 +57,6 @@ isPairedCharacter = (string, index=0) ->
   isVariationSequence(charCodeA, charCodeB) or
   isCombinedCharacter(charCodeA, charCodeB)
 
-isKoreanCharacter = (charCode) ->
-  0xAC00 <= charCode <= 0xD7A3 or
-  0x1100 <= charCode <= 0x11FF or
-  0x3130 <= charCode <= 0x318F or
-  0xA960 <= charCode <= 0xA97F or
-  0xD7B0 <= charCode <= 0xD7FF
-
 isJapaneseCharacter = (charCode) ->
   0x3000 <= charCode <= 0x30FF
 
@@ -77,7 +70,6 @@ isFullWidthForm = (charCode) ->
 isDoubleWidthCharacter = (character) ->
   charCode = character.charCodeAt(0)
 
-  isKoreanCharacter(charCode) or
   isJapaneseCharacter(charCode) or
   isCjkUnifiedIdeograph(charCode) or
   isFullWidthForm(charCode)
@@ -88,6 +80,15 @@ isHalfWidthCharacter = (character) ->
   0xFF65 <= charCode <= 0xFFDC or
   0xFFE8 <= charCode <= 0xFFEE
 
+isKoreanCharacter = (character) ->
+  charCode = character.charCodeAt(0)
+
+  0xAC00 <= charCode <= 0xD7A3 or
+  0x1100 <= charCode <= 0x11FF or
+  0x3130 <= charCode <= 0x318F or
+  0xA960 <= charCode <= 0xA97F or
+  0xD7B0 <= charCode <= 0xD7FF
+
 # Does the given string contain at least surrogate pair, variation sequence,
 # or combined character?
 #
@@ -101,4 +102,4 @@ hasPairedCharacter = (string) ->
     index++
   false
 
-module.exports = {isPairedCharacter, hasPairedCharacter, isDoubleWidthCharacter, isHalfWidthCharacter}
+module.exports = {isPairedCharacter, hasPairedCharacter, isDoubleWidthCharacter, isHalfWidthCharacter, isKoreanCharacter}
diff --git a/src/token-iterator.coffee b/src/token-iterator.coffee
@@ -1,5 +1,5 @@
 {SoftTab, HardTab, PairedCharacter, SoftWrapIndent} = require './special-token-symbols'
-{isDoubleWidthCharacter, isHalfWidthCharacter} = require './text-utils'
+{isDoubleWidthCharacter, isHalfWidthCharacter, isKoreanCharacter} = require './text-utils'
 
 module.exports =
 class TokenIterator
@@ -89,5 +89,8 @@ class TokenIterator
   hasHalfWidthCharacterAt: (charIndex) ->
     isHalfWidthCharacter(@getText()[charIndex])
 
+  hasKoreanCharacterAt: (charIndex) ->
+    isKoreanCharacter(@getText()[charIndex])
+
   isAtomic: ->
     @isSoftTab() or @isHardTab() or @isSoftWrapIndentation() or @isPairedCharacter()