aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmaury Levé2018-07-25 15:30:05 +0200
committerGitHub2018-07-25 15:30:05 +0200
commit58bf03075e9f3e5c153a392b8221f85741ee94e9 (patch)
tree9b10435f27d0dbaff21e627c47ba83008a81f4f4
parent58937179bf180daf93d4cf67d00d3d09fd3c1c3f (diff)
downloadsonar-css-58bf03075e9f3e5c153a392b8221f85741ee94e9.tar.bz2
Fix regression on number handling introduce by the last fix (#111)
-rw-r--r--sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssLexer.java2
-rw-r--r--sonar-css-plugin/src/test/java/org/sonar/css/plugin/TokenizerTest.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssLexer.java b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssLexer.java
index 7aa1200..2fbb0af 100644
--- a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssLexer.java
+++ b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssLexer.java
@@ -45,7 +45,7 @@ public final class CssLexer {
private static final String MULTI_LINE_COMMENT = "(?s)/\\*.*?\\*/";
private static final String INLINE_COMMENT = "//[^\n\r\f]*+";
- private static final String NUMBER = "[+|-]?+(?:\\d++(?:.\\d++)?+|\\.\\d++)(?:[a-z]++|%)?+";
+ private static final String NUMBER = "[+|-]?+(?:\\d++(?:\\.\\d++)?+|\\.\\d++)(?:[a-z]++|%)?+";
private static final String NAME_CHAR = "[a-zA-Z0-9_-]|" + NON_ASCII + "|" + ESCAPE;
private static final String NAME_START = "[a-zA-Z_]|" + NON_ASCII + "|" + ESCAPE;
diff --git a/sonar-css-plugin/src/test/java/org/sonar/css/plugin/TokenizerTest.java b/sonar-css-plugin/src/test/java/org/sonar/css/plugin/TokenizerTest.java
index a9b5e36..acf173a 100644
--- a/sonar-css-plugin/src/test/java/org/sonar/css/plugin/TokenizerTest.java
+++ b/sonar-css-plugin/src/test/java/org/sonar/css/plugin/TokenizerTest.java
@@ -82,6 +82,7 @@ public class TokenizerTest {
assertToken("1.15%", 0, "1.15%", CssTokenType.NUMBER);
assertToken("1px", 0, "1px", CssTokenType.NUMBER);
assertToken("1em/150%", 0, "1em", CssTokenType.NUMBER);
+ assertToken("1T1", 0, "1", CssTokenType.NUMBER);
}
@Test