Skip to content
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

Properly extract classes with arbitrary values in arrays and classes followed by escaped quotes #6590

Merged
merged 23 commits into from
Dec 17, 2021
Merged

Properly extract classes with arbitrary values in arrays and classes followed by escaped quotes #6590

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
47e3d09
Pull default extractor into separate file
thecrypticace Dec 15, 2021
ccbc642
Add unit tests for the extractor
thecrypticace Dec 15, 2021
f165f7a
default extractor
thecrypticace Dec 15, 2021
ac4e634
Add test
thecrypticace Dec 15, 2021
aa1be6b
Work on stuff
thecrypticace Dec 16, 2021
b6cf319
Update extractor test
thecrypticace Dec 16, 2021
618aee3
WIP
RobinMalfait Dec 16, 2021
5c8596b
Remove unused file
thecrypticace Dec 16, 2021
529434b
Collect all capture groups
thecrypticace Dec 16, 2021
ad5f846
Capture classes inside quotes
thecrypticace Dec 16, 2021
6a60da9
Update log
thecrypticace Dec 16, 2021
a91b0e7
Undo update to arbitrary values file
thecrypticace Dec 16, 2021
b701438
fix code style
thecrypticace Dec 16, 2021
0bc6325
Add moee extraction tests
thecrypticace Dec 16, 2021
c246679
Don't generate incomplete variant classes in quotes
thecrypticace Dec 16, 2021
41e730f
Cleanup
thecrypticace Dec 16, 2021
af7a291
Tweak expressions
thecrypticace Dec 16, 2021
a7c8c58
Fix code style
thecrypticace Dec 16, 2021
b37ffb3
Tweak regex
thecrypticace Dec 17, 2021
34cbcb0
Update
thecrypticace Dec 17, 2021
fef0aa5
Fix cs
thecrypticace Dec 17, 2021
cfa03ae
Update changelog
thecrypticace Dec 17, 2021
a72fdf8
Fix error
thecrypticace Dec 17, 2021
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
Prev Previous commit
Next Next commit
fix code style
  • Loading branch information
@thecrypticace
thecrypticace committed Dec 17, 2021
commit b70143807cec73841d6dcce1e5bca5a20538fc2c
2 changes: 1 addition & 1 deletion src/lib/defaultExtractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const INNER_MATCH_GLOBAL_REGEXP = /[^<>"'`\s.(){}[\]#=%]*[^<>"'`\s.(){}[\]#=%:]/
export function defaultExtractor(content) {
let broadMatches = content.matchAll(BROAD_MATCH_GLOBAL_REGEXP)
let innerMatches = content.match(INNER_MATCH_GLOBAL_REGEXP) || []
let results = [...broadMatches, ...innerMatches].flat().filter(v => v !== undefined)
let results = [...broadMatches, ...innerMatches].flat().filter((v) => v !== undefined)

return results
}