Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,18 @@ describe('char-class-classranges-merge', () => {
expect(re.toString()).toBe('/[\\ud83d\\ude88-\\ud83d\\ude8a]/u');
});

it('does not combine unicode property chars with \\w chars', () => {
const re = transform('/[\\w\\p{L}]/u', [
charClassClassrangesMerge,
]);
expect(re.toString()).toBe('/[\\w\\p{L}]/u');
});

it('does not combine sequential chars that are nor \\w chars nor char codes', () => {
const re = transform(/[<=>?]/, [
charClassClassrangesMerge,
]);
expect(re.toString()).toBe('/[<=>?]/');
});

});
});
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = {

const metas = [];
// Extract metas
expressions.forEach(expression => {
expressions.forEach((expression) => {
if (isMeta(expression)) {
metas.push(expression.value);
}
Expand Down Expand Up @@ -89,7 +89,7 @@ function sortCharClass(a, b) {
}

/**
* @param {Object} expression - Char or ClassRange node
* @param {Object} expression - Char, ClassRange or UnicodeProperty node
* @returns {number}
*/
function getSortValue(expression) {
Expand All @@ -105,6 +105,11 @@ function getSortValue(expression) {
}
return expression.codePoint;
}

if (expression.type === 'UnicodeProperty') {
return -1;
}

// ClassRange
return expression.from.codePoint;
}
Expand Down