Merge pull request #653 from pulsar-edit/fix-style-manager-regex

[core]: Transforming Deprecated Math Usage - Support for Variables
This commit is contained in:
confused_techie 2023-08-01 17:14:38 -07:00 committed by GitHub
commit f90d9bfdf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions

View File

@ -225,6 +225,26 @@ describe('StyleManager', () => {
);
});
it('recognizes valid less variables: right side', () => {
let upgradedSheet = mathStyleManager.upgradeDeprecatedMathUsageForStyleSheet(
"p { padding: @size + 12px; }",
{}
);
expect(upgradedSheet.source).toEqual(
"p { padding: calc(@size + 12px); }"
);
});
it('recognizes valid less variables: left side', () => {
let upgradedSheet = mathStyleManager.upgradeDeprecatedMathUsageForStyleSheet(
"p { padding: 12px + @size; }",
{}
);
expect(upgradedSheet.source).toEqual(
"p { padding: calc(12px + @size); }"
);
});
});
describe('when a sourcePath parameter is specified', () => {

View File

@ -437,7 +437,7 @@ function transformDeprecatedMathUsage(css, context) {
const cssValueIgnoreList = /hsl|abs|acos|asin|atan|atan2|cos|mod|rem|sign|sin|tan|url/g;
const mathExpressionRegex =
/-*(\d(\.\d)?)+(cm|mm|Q|in|pc|pt|px|em|ex|ch|rem|lh|rlh|vw|vh|vmin|vmax|vb|vi|svw|svh|lvw|lvh|dvw|dvh|%)?(\s*([\/\+\*]|(\-\s+))\s*(\d(\.\d)*)+(cm|mm|Q|in|pc|pt|px|em|ex|ch|rem|lh|rlh|vw|vh|vmin|vmax|vb|vi|svw|svh|lvw|lvh|dvw|dvh|%)?)+/g;
/(-*(\d(\.\d)?)+(cm|mm|Q|in|pc|pt|px|em|ex|ch|rem|lh|rlh|vw|vh|vmin|vmax|vb|vi|svw|svh|lvw|lvh|dvw|dvh|%)?|@?[\w-]+)(\s*([\/\+\*]|(\-\s+))\s*((\d(\.\d)*)+(cm|mm|Q|in|pc|pt|px|em|ex|ch|rem|lh|rlh|vw|vh|vmin|vmax|vb|vi|svw|svh|lvw|lvh|dvw|dvh|%)?|@?[\w-]+))+/g;
try {
transformedSource = postcss.parse(css);