Skip to content

Fix scientific number rule #83

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

Merged
phax merged 3 commits into from
Jan 18, 2022
Merged

Fix scientific number rule #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66c6e48
Merge remote-tracking branch 'upstream/master'
shagkur Jan 14, 2022
e463771
#82 fix rule to respect '.' in scientific notation
shagkur Jan 18, 2022
72d6b04
#82 also respect regex in parser helper
shagkur Jan 18, 2022
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
4 changes: 2 additions & 2 deletions ph-css/src/main/java/com/helger/css/parser/CSSParseHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ public final class CSSParseHelper

/**
* Order of the rules in brackets is important!<br>
* The part "([eE][+-]?[0-9]+)?" was added for #79
* The parts "([eE][+-]?[0-9]+)?" were added for #79, #82
*/
@RegEx
private static final String SPLIT_NUMBER_REGEX = "^([0-9]*\\.[0-9]+|[0-9]+([eE][+-]?[0-9]+)?).*$";
private static final String SPLIT_NUMBER_REGEX = "^([0-9]*\\.[0-9]+([eE][+-]?[0-9]+)?|[0-9]+([eE][+-]?[0-9]+)?).*$";
private static final Pattern SPLIT_NUMBER_PATTERN = RegExCache.getPattern (SPLIT_NUMBER_REGEX);

@PresentForCodeCoverage
Expand Down
3 changes: 2 additions & 1 deletion ph-css/src/main/jjtree/ParserCSS30.jjt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ TOKEN :
| < #NAME: ( <NMCHAR> )+ >
| < #NUM: ( ["0"-"9"] )+
| ( ["0"-"9"] )* "." ( ["0"-"9"] )+
| ( ["0"-"9"] )+ ["e", "E"] ( ["+", "-"] )? ( ["0"-"9"] )+ >
| ( ["0"-"9"] )+ ["e", "E"] ( ["+", "-"] )? ( ["0"-"9"] )+
| ( ["0"-"9"] )+ "." ( ["0"-"9"] )+ ["e", "E"] ( ["+", "-"] )? ( ["0"-"9"] )+ >
| < #URLCHAR: ["!","#","$","%","&","*"-"[","]"-"~"]
| <NONASCII>
| <ESCAPE> >
Expand Down
10 changes: 10 additions & 0 deletions ph-css/src/test/resources/testfiles/css30/good/issue79.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ div {
padding: 999e-06;
padding: 999e+6;
padding: 999e+06;
padding: 1.5e6;
padding: 1.5e-6;
padding: 1.5e-06;
padding: 1.5e+6;
padding: 1.5e+06;
}

span {
Expand All @@ -22,4 +27,9 @@ span {
padding: 999e-06em;
padding: 999e+6em;
padding: 999e+06em;
padding: 1.5e6em;
padding: 1.5e-6em;
padding: 1.5e-06em;
padding: 1.5e+6em;
padding: 1.5e+06em;
}