waveterm/xterm.js
0
0
Fork 0
mirror of https://github.com/wavetermdev/xterm.js.git synced 2026-08-05 13:43:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Provide with "15" and "15-graphemes" UnicodeProviders

Browse Source 
Th former doesn't support grapheme clusters, except the old-fashioned
kind of simple modifiers.  However, "15-graphemes" (with full
cluster support) is the default.
This commit is contained in:
Per Bothner
2023-08-21 13:03:06 -07:00
parent 2204375788
commit e5a2ebda0e
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/xterm-addon-unicode-graphemes/src/UnicodeGraphemeProvider.ts
+11 -3
View File
@@ -9,9 +9,13 @@ import { UnicodeService } from 'common/services/UnicodeService';
import * as UC from './third-party/UnicodeProperties'; import * as UC from './third-party/UnicodeProperties';
export class UnicodeGraphemeProvider implements IUnicodeVersionProvider { export class UnicodeGraphemeProvider implements IUnicodeVersionProvider {
public readonly version = '15-graphemes'; public readonly version;
public ambiguousCharsAreWide: boolean = false; public ambiguousCharsAreWide: boolean = false;
constructor() { public readonly handleGraphemes: boolean;
constructor(handleGraphemes: boolean = true) {
this.version = handleGraphemes ? '15-graphemes' : '15';
this.handleGraphemes = handleGraphemes;
} }
private static readonly _plainNarrowProperties: UnicodeCharProperties private static readonly _plainNarrowProperties: UnicodeCharProperties
@@ -36,7 +40,11 @@ export class UnicodeGraphemeProvider implements IUnicodeVersionProvider {
} }
if (preceding !== 0) { if (preceding !== 0) {
const oldWidth = UnicodeService.extractWidth(preceding); const oldWidth = UnicodeService.extractWidth(preceding);
charInfo = UC.shouldJoin(UnicodeService.extractCharKind(preceding), charInfo); if (this.handleGraphemes) {
charInfo = UC.shouldJoin(UnicodeService.extractCharKind(preceding), charInfo);
} else {
charInfo = w === 0 ? 1 : 0;
}
shouldJoin = charInfo > 0; shouldJoin = charInfo > 0;
if (shouldJoin) { if (shouldJoin) {
if (oldWidth > w) { if (oldWidth > w) {
addons/xterm-addon-unicode-graphemes/src/UnicodeGraphemesAddon.ts
+9 -4
View File
@@ -10,17 +10,22 @@ import { UnicodeGraphemeProvider } from './UnicodeGraphemeProvider';
export class UnicodeGraphemesAddon implements ITerminalAddon { export class UnicodeGraphemesAddon implements ITerminalAddon {
private _provider?: UnicodeGraphemeProvider; private _provider15Graphemes?: UnicodeGraphemeProvider;
private _provider15?: UnicodeGraphemeProvider;
private _unicode?: IUnicodeHandling; private _unicode?: IUnicodeHandling;
private _oldVersion: string = ''; private _oldVersion: string = '';
public activate(terminal: Terminal): void { public activate(terminal: Terminal): void {
if (! this._provider) { if (! this._provider15) {
this._provider = new UnicodeGraphemeProvider(); this._provider15 = new UnicodeGraphemeProvider(false);
}
if (! this._provider15Graphemes) {
this._provider15Graphemes = new UnicodeGraphemeProvider(true);
} }
const unicode = terminal.unicode; const unicode = terminal.unicode;
this._unicode = unicode; this._unicode = unicode;
unicode.register(this._provider); unicode.register(this._provider15);
unicode.register(this._provider15Graphemes);
this._oldVersion = unicode.activeVersion; this._oldVersion = unicode.activeVersion;
unicode.activeVersion = '15-graphemes'; unicode.activeVersion = '15-graphemes';
} }
addons/xterm-addon-unicode-graphemes/test/UnicodeGraphemesAddon.api.ts
+1 -1
View File
@@ -39,7 +39,7 @@ describe('UnicodeGraphemesAddon', () => {
window.term.loadAddon(window.unicode); window.term.loadAddon(window.unicode);
`); `);
// should have loaded '15-graphemes' // should have loaded '15-graphemes'
assert.deepEqual(await page.evaluate(`window.term.unicode.versions`), ['6', ourVersion]); assert.deepEqual(await page.evaluate(`window.term.unicode.versions`), ['6', '15', '15-graphemes']);
// switch should not throw // switch should not throw
await page.evaluate(`window.term.unicode.activeVersion = '${ourVersion}';`); await page.evaluate(`window.term.unicode.activeVersion = '${ourVersion}';`);
assert.equal(await page.evaluate(`window.term.unicode.activeVersion`), ourVersion); assert.equal(await page.evaluate(`window.term.unicode.activeVersion`), ourVersion);