Merge pull request #44259 from yh1224/fulllwidth

Treat full-width character as two visible columns.
microsoft · Mar 1, 2018 · bae62c1 · bae62c1
2 parents 0af74d6 + ba7354f
commit bae62c1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/vs/editor/common/controller/cursorCommon.ts b/src/vs/editor/common/controller/cursorCommon.ts
@@ -454,6 +454,8 @@ export class CursorColumns {
  let charCode = lineContent.charCodeAt(i);
  if (charCode === CharCode.Tab) {
  result = this.nextTabStop(result, tabSize);
+ } else if (strings.isFullWidthCharacter(charCode)) {
+ result = result + 2;
  } else {
  result = result + 1;
  }
@@ -479,6 +481,8 @@ export class CursorColumns {
  let afterVisibleColumn: number;
  if (charCode === CharCode.Tab) {
  afterVisibleColumn = this.nextTabStop(beforeVisibleColumn, tabSize);
+ } else if (strings.isFullWidthCharacter(charCode)) {
+ afterVisibleColumn = beforeVisibleColumn + 2;
  } else {
  afterVisibleColumn = beforeVisibleColumn + 1;
  }