Skip to content
This repository has been archived by the owner on Nov 5, 2021. It is now read-only.

[JS/TS] Add support for the nullish-coalesce operator #74

Merged
merged 1 commit into from Dec 16, 2019
Merged

[JS/TS] Add support for the nullish-coalesce operator #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/javascript/javascript.test.ts
View file
Open in desktop
Expand Up @@ -725,6 +725,33 @@ testTokenization('javascript', [
}],


[{
line: 'test ? 1 : 2',
tokens: [
{ startIndex: 0, type: 'identifier.js' },
{ startIndex: 4, type: '' },
{ startIndex: 5, type: 'delimiter.js' },
{ startIndex: 6, type: '' },
{ startIndex: 7, type: 'number.js' },
{ startIndex: 8, type: '' },
{ startIndex: 9, type: 'delimiter.js' },
{ startIndex: 10, type: '' },
{ startIndex: 11, type: 'number.js' },
]
}],

[{
line: 'couldBeNullish ?? 1',
tokens: [
{ startIndex: 0, type: 'identifier.js' },
{ startIndex: 14, type: '' },
{ startIndex: 15, type: 'delimiter.js' },
{ startIndex: 17, type: '' },
{ startIndex: 18, type: 'number.js' }
]
}],


[{
line: '`${5 + \'x\' + 3}a${4}`',
tokens: [
Expand Down
27 changes: 27 additions & 0 deletions src/typescript/typescript.test.ts
View file
Open in desktop
Expand Up @@ -745,6 +745,33 @@ testTokenization('typescript', [
}],


[{
line: 'test ? 1 : 2',
tokens: [
{ startIndex: 0, type: 'identifier.ts' },
{ startIndex: 4, type: '' },
{ startIndex: 5, type: 'delimiter.ts' },
{ startIndex: 6, type: '' },
{ startIndex: 7, type: 'number.ts' },
{ startIndex: 8, type: '' },
{ startIndex: 9, type: 'delimiter.ts' },
{ startIndex: 10, type: '' },
{ startIndex: 11, type: 'number.ts' },
]
}],

[{
line: 'couldBeNullish ?? 1',
tokens: [
{ startIndex: 0, type: 'identifier.ts' },
{ startIndex: 14, type: '' },
{ startIndex: 15, type: 'delimiter.ts' },
{ startIndex: 17, type: '' },
{ startIndex: 18, type: 'number.ts' }
]
}],


[{
line: '`${5 + \'x\' + (<any>)3}a${4}`',
tokens: [
Expand Down
2 changes: 1 addition & 1 deletion src/typescript/typescript.ts
View file
Open in desktop
Expand Up @@ -91,7 +91,7 @@ export const language = {
operators: [
'<=', '>=', '==', '!=', '===', '!==', '=>', '+', '-', '**',
'*', '/', '%', '++', '--', '<<', '</', '>>', '>>>', '&',
'|', '^', '!', '~', '&&', '||', '?', ':', '=', '+=', '-=',
'|', '^', '!', '~', '&&', '||', '??', '?', ':', '=', '+=', '-=',
'*=', '**=', '/=', '%=', '<<=', '>>=', '>>>=', '&=', '|=',
'^=', '@',
],
Expand Down