Further fixes for $Variables without {} (closes #11)

kinglozzer · Mar 19, 2021 · e234f97 · e234f97
1 parent 5560083
commit e234f97
Show file tree

Hide file tree

Showing 5 changed files with 144 additions and 156 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,9 @@
 # Changelog
 
 ## [Unreleased]
-### Added
-
-### Changed
-
-### Deprecated
-
-### Removed
-
 ### Fixed
+- Further issues with how $Variables without {} braces were handled
+
 ## [0.2.2]
 ### Fixed
 - Regression in how $Variables without {} braces were handled

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
@@ -276,10 +276,10 @@ SS_TEXT= (([^<${\\]+) | (\\.) | (<[^%]) | (\$[^A-Za-z_]) | (\{[^\$]) | (\{\$[^A-
 
 <SS_INJECTION> {
     {SS_LOOKUP}                         { yypushstate(SS_LOOKUP); return SilverstripeTokenTypes.SS_LOOKUP; }
+    "$"                                 { return SilverstripeTokenTypes.SS_TEXT; }
     "{"                                 { return SilverstripeTokenTypes.SS_LEFT_BRACE; }
     "}"                                 { yycleanstates(); return SilverstripeTokenTypes.SS_RIGHT_BRACE; }
-    {WHITE_SPACE}+                      { yycleanstates(); return TokenType.WHITE_SPACE; }
-    .                                   { yycleanstates(); return SilverstripeTokenTypes.SS_TEXT; }
+    .                                   { yypushback(yylength()); yycleanstates(); return SilverstripeTokenTypes.SS_TEXT; }
 }
 
 <SS_LOOKUP> {

diff --git a/src/test/testData/parser/Issue11.ss b/src/test/testData/parser/Issue11.ss
@@ -1,5 +1,3 @@
 <% if $ElementControllers %>
-    <% loop $ElementControllers %>
-        $Me
-    <% end_loop %>
+    <% loop $ElementControllers %>$Me<% end_loop %>
 <% end_if %>
diff --git a/src/test/testData/parser/Issue11.txt b/src/test/testData/parser/Issue11.txt
@@ -24,13 +24,10 @@ FILE
                 PsiElement([Ss] SS_LOOKUP)('$ElementControllers')
             PsiWhiteSpace(' ')
             PsiElement(SS_BLOCK_END)('%>')
-          PsiWhiteSpace('\n        ')
           SilverstripePsiElementImpl([Ss] SS_STATEMENTS)
             SilverstripePsiElementImpl([Ss] SS_LOOKUP)
               SilverstripeLookupStepImpl([Ss] SS_LOOKUP_STEP)
                 PsiElement([Ss] SS_LOOKUP)('$Me')
-          PsiWhiteSpace('\n')
-          PsiWhiteSpace('    ')
           SilverstripePsiElementImpl([Ss] SS_BLOCK_END_STATEMENT)
             PsiElement(SS_BLOCK_START)('<%')
             PsiWhiteSpace(' ')