development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement Unicode's grapheme cluster boundary rules

Browse source
This commit is contained in:
Alexandru Dima 2019-11-27 11:23:09 +01:00
parent 453e750ca4
commit 3f1a2f690a
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
5 changed files with 214 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

305
src/vs/base/common/strings.ts
View file

File diff suppressed because one or more lines are too long

4
src/vs/base/test/common/strings.test.ts
View file

@ -492,4 +492,8 @@ suite('Strings', () => {
assertEncodeDecodeUTF8('🧝', [240, 159, 167, 157]);
});
test('getGraphemeBreakType', () => {
assert.equal(strings.getGraphemeBreakType(0xBC1), strings.GraphemeBreakType.SpacingMark);
});
});

10
src/vs/editor/common/controller/cursorCommon.ts
View file

@ -523,12 +523,15 @@ export class CursorColumns {
if (codePoint === CharCode.Tab) {
result = CursorColumns.nextRenderTabStop(result, tabSize);
} else {
let graphemeBreakType = strings.getGraphemeBreakType(codePoint);
while (i < endOffset) {
const nextCodePoint = strings.getNextCodePoint(lineContent, endOffset, i);
if (!strings.isUnicodeMark(nextCodePoint)) {
const nextGraphemeBreakType = strings.getGraphemeBreakType(nextCodePoint);
if (strings.breakBetweenGraphemeBreakType(graphemeBreakType, nextGraphemeBreakType)) {
break;
}
i += (nextCodePoint >= Constants.UNICODE_SUPPLEMENTARY_PLANE_BEGIN ? 2 : 1);
graphemeBreakType = nextGraphemeBreakType;
}
if (strings.isFullWidthCharacter(codePoint) || strings.isEmojiImprecise(codePoint)) {
result = result + 2;
@ -582,12 +585,15 @@ export class CursorColumns {
if (codePoint === CharCode.Tab) {
afterVisibleColumn = CursorColumns.nextRenderTabStop(beforeVisibleColumn, tabSize);
} else {
let graphemeBreakType = strings.getGraphemeBreakType(codePoint);
while (i < lineLength) {
const nextCodePoint = strings.getNextCodePoint(lineContent, lineLength, i);
if (!strings.isUnicodeMark(nextCodePoint)) {
const nextGraphemeBreakType = strings.getGraphemeBreakType(nextCodePoint);
if (strings.breakBetweenGraphemeBreakType(graphemeBreakType, nextGraphemeBreakType)) {
break;
}
i += (nextCodePoint >= Constants.UNICODE_SUPPLEMENTARY_PLANE_BEGIN ? 2 : 1);
graphemeBreakType = nextGraphemeBreakType;
}
if (strings.isFullWidthCharacter(codePoint) || strings.isEmojiImprecise(codePoint)) {
afterVisibleColumn = beforeVisibleColumn + 2;

2
src/vs/editor/test/browser/controller/cursor.test.ts
View file

@ -726,7 +726,7 @@ suite('Editor Controller - Cursor', () => {
});
});
test('combining marks', () => {
test('grapheme breaking', () => {
withTestCodeEditor([
'abcabc',
'ãããããã',

2
src/vs/editor/test/common/model/textModel.test.ts
View file

@ -755,7 +755,7 @@ suite('Editor Model - TextModel', () => {
assert.deepEqual(actual, expected, `validateRange for ${input}, got ${actual}, expected ${expected}`);
}
test('combining marks', () => {
test('grapheme breaking', () => {
const m = TextModel.createFromString([
'abcabc',
'ãããããã',