Skip to content

fix modulo case #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 5, 2020
Merged

fix modulo case #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
693f13e
fix modulo case
kazupon Aug 5, 2020
f3f51cd
remove
kazupon Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 38 additions & 22 deletions src/message/tokenizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export interface TokenizeContext {
lastEndLoc: Position
braceNest: number
inLinked: boolean
text: string
}

export interface Tokenizer {
Expand Down Expand Up @@ -95,7 +96,8 @@ export function createTokenizer(
lastStartLoc: _initLoc,
lastEndLoc: _initLoc,
braceNest: 0,
inLinked: false
inLinked: false,
text: ''
}

const context = (): TokenizeContext => _context
Expand Down Expand Up @@ -341,32 +343,33 @@ export function createTokenizer(
return ret
}

function isTextStart(scnr: Scanner): boolean {
const fn = (hasSpace = false): boolean => {
function isTextStart(scnr: Scanner, reset = true): boolean {
const fn = (hasSpace = false, prev = '', detectModulo = false): boolean => {
const ch = scnr.currentPeek()
if (
ch === TokenChars.BraceLeft ||
ch === TokenChars.BraceRight ||
ch === TokenChars.Modulo ||
ch === TokenChars.LinkedAlias ||
!ch
) {
return hasSpace
if (ch === TokenChars.BraceLeft) {
return prev === TokenChars.Modulo ? false : hasSpace
} else if (ch === TokenChars.LinkedAlias || !ch) {
return prev === TokenChars.Modulo ? true : hasSpace
} else if (ch === TokenChars.Modulo) {
scnr.peek()
return fn(hasSpace, TokenChars.Modulo, true)
} else if (ch === TokenChars.Pipe) {
return false
return prev === TokenChars.Modulo || detectModulo
? true
: !(prev === SPACE || prev === NEW_LINE)
} else if (ch === SPACE) {
scnr.peek()
return fn(true)
return fn(true, SPACE, detectModulo)
} else if (ch === NEW_LINE) {
scnr.peek()
return fn(true)
return fn(true, NEW_LINE, detectModulo)
} else {
return true
}
}

const ret = fn()
scnr.resetPeek()
reset && scnr.resetPeek()

return ret
}
Expand Down Expand Up @@ -439,13 +442,26 @@ export function createTokenizer(
if (
ch === TokenChars.BraceLeft ||
ch === TokenChars.BraceRight ||
ch === TokenChars.Modulo ||
ch === TokenChars.LinkedAlias ||
ch === EOF
!ch
) {
return buf
} else if (ch === TokenChars.Modulo) {
if (isTextStart(scnr)) {
buf += ch
scnr.next()
return fn(buf)
} else {
return buf
}
} else if (ch === TokenChars.Pipe) {
return buf
} else if (ch === SPACE || ch === NEW_LINE) {
if (isPluralStart(scnr)) {
if (isTextStart(scnr)) {
buf += ch
scnr.next()
return fn(buf)
} else if (isPluralStart(scnr)) {
return buf
} else {
buf += ch
Expand Down Expand Up @@ -920,10 +936,6 @@ export function createTokenizer(
case TokenChars.LinkedAlias:
return readTokenInLinked(scnr, context) || getEndToken(context)

case TokenChars.Modulo:
scnr.next()
return getToken(context, TokenTypes.Modulo, TokenChars.Modulo)

default:
if (isPluralStart(scnr)) {
token = getToken(context, TokenTypes.Pipe, readPlural(scnr))
Expand All @@ -937,6 +949,10 @@ export function createTokenizer(
return getToken(context, TokenTypes.Text, readText(scnr))
}

if (ch === TokenChars.Modulo) {
scnr.next()
return getToken(context, TokenTypes.Modulo, TokenChars.Modulo)
}
break
}

Expand Down
33 changes: 33 additions & 0 deletions test/message/__snapshots__/compiler.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,39 @@ Object {
}
`;

exports[`edge cases %: code 1`] = `
"function __msg__ (ctx) {
const { normalize: _normalize } = ctx
return _normalize([
\\"%\\"
])
}"
`;

exports[`edge cases hi %s !: code 1`] = `
"function __msg__ (ctx) {
const { normalize: _normalize } = ctx
return _normalize([
\\"hi %s !\\"
])
}"
`;

exports[`edge cases no apples %| one apple % | too much apples : code 1`] = `
"function __msg__ (ctx) {
const { normalize: _normalize, pluralIndex: _pluralIndex, pluralRule: _pluralRule, orgPluralRule: _orgPluralRule } = ctx
return [
_normalize([
\\"no apples %\\"
]), _normalize([
\\"one apple %\\"
]), _normalize([
\\"too much apples \\"
])
][_pluralRule(_pluralIndex, 3, _orgPluralRule)]
}"
`;

exports[`warnHtmlMessage default: code 1`] = `
"function __msg__ (ctx) {
const { normalize: _normalize } = ctx
Expand Down
38 changes: 3 additions & 35 deletions test/message/__snapshots__/tokenizer.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2033,38 +2033,6 @@ world",

exports[`token analysis: "hi %name" tokens 1`] = `
Array [
Object {
"loc": Object {
"end": Object {
"column": 4,
"line": 1,
"offset": 3,
},
"start": Object {
"column": 1,
"line": 1,
"offset": 0,
},
},
"type": 0,
"value": "hi ",
},
Object {
"loc": Object {
"end": Object {
"column": 5,
"line": 1,
"offset": 4,
},
"start": Object {
"column": 4,
"line": 1,
"offset": 3,
},
},
"type": 4,
"value": "%",
},
Object {
"loc": Object {
"end": Object {
Expand All @@ -2073,13 +2041,13 @@ Array [
"offset": 8,
},
"start": Object {
"column": 5,
"column": 1,
"line": 1,
"offset": 4,
"offset": 0,
},
},
"type": 0,
"value": "name",
"value": "hi %name",
},
Object {
"loc": Object {
Expand Down
15 changes: 15 additions & 0 deletions test/message/compiler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,21 @@ describe('edge cases', () => {
})
expect(code.toString()).toMatchSnapshot('code')
})

test(`hi %s !`, () => {
const code = compile(`hi %s !`)
expect(code.toString()).toMatchSnapshot('code')
})

test(`%`, () => {
const code = compile(`%`)
expect(code.toString()).toMatchSnapshot('code')
})

test(`no apples %| one apple % | too much apples `, () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be too many :P

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're right, my poor english ... 😓

const code = compile(`no apples %| one apple % | too much apples `)
expect(code.toString()).toMatchSnapshot('code')
})
})

/* eslint-enable @typescript-eslint/no-empty-function, no-irregular-whitespace */
Loading