erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-18 14:27:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Apply suggestions from code review

Browse source 
Co-authored-by: Marc Durdin <marc@durdin.net>
This commit is contained in:
Steven R. Loomis 2023-11-25 13:51:53 -06:00 • committed by GitHub
parent 57ec523327
commit bb63ba8a66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/web/types/src/util/util.ts
View file

@ -167,7 +167,7 @@ function Uni_IsNoncharacter(ch : number) {
}
function Uni_InCodespace(ch : number) {
return ((ch) <= Uni_MAX_CODEPOINT);
return (ch >= 0 && ch <= Uni_MAX_CODEPOINT);
};
function Uni_IsValid1(ch: number) {

6
developer/src/kmc-ldml/src/compiler/messages.ts
View file

@ -147,15 +147,15 @@ export class CompilerMessages {
static ERROR_DisplayNeedsToOrId = SevError | 0x0022;
static Hint_PUACharacters = (o: { count: number, lowestCh: number }) =>
m(this.HINT_PUACharacters, `File contained ${o.count} PUA character(s), including ${util.describeCodepoint(o.lowestCh)}`);
m(this.HINT_PUACharacters, `File contains ${o.count} PUA character(s), including ${util.describeCodepoint(o.lowestCh)}`);
static HINT_PUACharacters = SevHint | 0x0023;
static Warn_UnassignedCharacters = (o: { count: number, lowestCh: number }) =>
m(this.WARN_UnassignedCharacters, `File contained ${o.count} unassigned character(s), including ${util.describeCodepoint(o.lowestCh)}`);
m(this.WARN_UnassignedCharacters, `File contains ${o.count} unassigned character(s), including ${util.describeCodepoint(o.lowestCh)}`);
static WARN_UnassignedCharacters = SevWarn | 0x0024;
static Error_IllegalCharacters = (o: { count: number, lowestCh: number }) =>
m(this.ERROR_IllegalCharacters, `File contained ${o.count} illegal character(s), including ${util.describeCodepoint(o.lowestCh)}`);
m(this.ERROR_IllegalCharacters, `File contains ${o.count} illegal character(s), including ${util.describeCodepoint(o.lowestCh)}`);
static ERROR_IllegalCharacters = SevError | 0x0025;
}

13
developer/src/kmc-ldml/test/test-compiler-e2e.ts
View file

@ -9,8 +9,11 @@ import { CompilerMessages } from '../src/compiler/messages.js';
describe('compiler-tests', function() {
this.slow(500); // 0.5 sec -- json schema validation takes a while
before(function() {
compilerTestCallbacks.clear();
});
it('should-build-fixtures', async function() {
compilerTestCallbacks.messages = [];
// Let's build basic.xml
// It should match basic.kmx (built from basic.txt)
@ -34,42 +37,36 @@ describe('compiler-tests', function() {
});
it('should handle non existent files', () => {
compilerTestCallbacks.messages = [];
const filename = 'DOES_NOT_EXIST.xml';
const k = new LdmlKeyboardCompiler(compilerTestCallbacks, { ...compilerTestOptions, saveDebug: true, shouldAddCompilerVersion: false });
const source = k.load(filename);
assert.notOk(source, `Trying to load(${filename})`);
});
it('should handle unparseable files', () => {
compilerTestCallbacks.messages = [];
const filename = makePathToFixture('basic-kvk.txt'); // not an .xml file
const k = new LdmlKeyboardCompiler(compilerTestCallbacks, { ...compilerTestOptions, saveDebug: true, shouldAddCompilerVersion: false });
const source = k.load(filename);
assert.notOk(source, `Trying to load(${filename})`);
});
it('should handle not-valid files', () => {
compilerTestCallbacks.messages = [];
const filename = makePathToFixture('test-fr.xml'); // not a keyboard .xml file
const k = new LdmlKeyboardCompiler(compilerTestCallbacks, { ...compilerTestOptions, saveDebug: true, shouldAddCompilerVersion: false });
const source = k.load(filename);
assert.notOk(source, `Trying to load(${filename})`);
});
it('should handle non existent test files', () => {
compilerTestCallbacks.messages = [];
const filename = 'DOES_NOT_EXIST.xml';
const k = new LdmlKeyboardCompiler(compilerTestCallbacks, { ...compilerTestOptions, saveDebug: true, shouldAddCompilerVersion: false });
const source = k.loadTestData(filename);
assert.notOk(source, `Trying to loadTestData(${filename})`);
});
it('should handle unparseable test files', () => {
compilerTestCallbacks.messages = [];
const filename = makePathToFixture('basic-kvk.txt'); // not an .xml file
const k = new LdmlKeyboardCompiler(compilerTestCallbacks, { ...compilerTestOptions, saveDebug: true, shouldAddCompilerVersion: false });
const source = k.load(filename);
assert.notOk(source, `Trying to loadTestData(${filename})`);
});
it('should fail on illegal chars', async function() {
compilerTestCallbacks.messages = [];
const inputFilename = makePathToFixture('sections/strs/invalid-illegal.xml');
const kmx = await compileKeyboard(inputFilename, { ...compilerTestOptions, saveDebug: true, shouldAddCompilerVersion: false },
[
@ -84,7 +81,6 @@ describe('compiler-tests', function() {
assert.isNull(kmx); // should fail post-validate
});
it('should hint on pua chars', async function() {
compilerTestCallbacks.messages = [];
const inputFilename = makePathToFixture('sections/strs/hint-pua.xml');
// Compile the keyboard
const kmx = await compileKeyboard(inputFilename, { ...compilerTestOptions, saveDebug: true, shouldAddCompilerVersion: false },
@ -101,7 +97,6 @@ describe('compiler-tests', function() {
});
it.skip('should warn on unassigned chars', async function() {
// unassigned not implemented yet
compilerTestCallbacks.messages = [];
const inputFilename = makePathToFixture('sections/strs/warn-unassigned.xml');
const kmx = await compileKeyboard(inputFilename, { ...compilerTestOptions, saveDebug: true, shouldAddCompilerVersion: false },
[