More permissive lexing of translation entities (closes #20)

kinglozzer · Jul 5, 2021 · cd80657 · cd80657
1 parent 86b390f
commit cd80657
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 ### Removed
 
 ### Fixed
+- Slightly more permissive lexing of translation entities (#20)
 
 ## [1.0.0]
 Initial stable release

diff --git a/src/main/gen/com/kinglozzer/silverstripe/parser/_SilverstripeLexer.java b/src/main/gen/com/kinglozzer/silverstripe/parser/_SilverstripeLexer.java
diff --git a/src/main/java/com/kinglozzer/silverstripe/parser/Silverstripe.flex b/src/main/java/com/kinglozzer/silverstripe/parser/Silverstripe.flex
@@ -68,7 +68,7 @@ SS_COMMENT_START= <%--
 SS_COMMENT_END= --%>
 SS_TRANSLATION_START= <%t
 SS_STRING_NO_QUOTES=[^\"\'\)]+
-SS_TRANSLATION_IDENTIFIER= [a-zA-Z_\\]+([a-zA-Z0-9_\\])*\.([a-zA-Z0-9_\\])+
+SS_TRANSLATION_IDENTIFIER= [a-zA-Z_\\]+([a-zA-Z0-9_\\])*(\.([a-zA-Z0-9_\\])+)+
 
 SS_TEXT= (([^<${\\]+) | (\\.) | (<[^%]) | (\$[^A-Za-z_]) | (\{[^\$]) | (\{\$[^A-Za-z_]))+