Skip to content

Import CSS parsing pattern from PHP Textile #2

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

Open
zachahn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Import CSS parsing pattern from PHP Textile #2

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ impl BlockHtmlAttributes {
{
lazy_static! {
static ref CSS_CLASS_NAME_RE: Regex = fregex!(
r"(?i)^-?[_a-z][_a-z0-9-]*$");
r"^([-a-zA-Z 0-9_\/\[\].:!#]+)$");
}
let trimmed_name = name.as_ref().trim();
if CSS_CLASS_NAME_RE.is_match(trimmed_name).unwrap_or_default() {
Expand Down Expand Up @@ -110,7 +110,7 @@ impl BlockAttributes {
static ref ATTR_PADDING_LEFT_RE: Regex = fregex!(r"([(]+)");
static ref ATTR_PADDING_RIGHT_RE: Regex = fregex!(r"([)]+)");
static ref ATTR_COL_RE: Regex = fregex!(r"^(?:\\(\d+)\.?)?\s*(\d+)?");
static ref CSS_CLASSES_RE: Regex = fregex!(r"^([-a-zA-Z 0-9_\.\/\[\]]*)$");
static ref CSS_CLASSES_RE: Regex = fregex!(r"^([-a-zA-Z 0-9_\.\/\[\]:!]*)$");
}
let mut style = Vec::<String>::new();

Expand Down Expand Up @@ -460,7 +460,11 @@ mod test {
assert_eq!(atts.to_string(), " class=\"align-left\" id=\"id-value&amp;data\"");
assert!(atts.insert_css_class("otherclass"));
assert_eq!(atts.to_string(), " class=\"align-left otherclass\" id=\"id-value&amp;data\"");
assert!(!atts.insert_css_class("invalid/class/name"));
assert!(!atts.insert_css_class("invalid@class@name"));
assert_eq!(atts.to_string(), " class=\"align-left otherclass\" id=\"id-value&amp;data\"");
assert!(atts.insert_css_class("md:mt-3"));
assert_eq!(atts.to_string(), " class=\"align-left otherclass md:mt-3\" id=\"id-value&amp;data\"");
assert!(atts.insert_css_class("!mt-3"));
assert_eq!(atts.to_string(), " class=\"align-left otherclass md:mt-3 !mt-3\" id=\"id-value&amp;data\"");
}
}
10 changes: 10 additions & 0 deletions tests/fixtures/issue-224.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Support exclamation marks and colons in class names:
input: |
p(md:mt-3). Paragraph

p(!mt-3). Paragraph

expect: |
<p class="md:mt-3">Paragraph</p>

<p class="!mt-3">Paragraph</p>
1 change: 1 addition & 0 deletions tests/test_yaml_fixtures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,5 +184,6 @@ fn test_yaml_fixtures() {
"issue-189",
"issue-198",
"issue-202",
"issue-224",
]);
}