Merge pull request SJrX#53 from SJrX/issue-51

SJrX · web-flow · commit d81ec1de0967 · 2018-12-30T08:34:18.000-08:00
Resolves SJrX#51 - Tab character not permitted to be in value
diff --git a/src/main/gen/net/sjrx/intellij/plugins/systemdunitfiles/generated/UnitFileLexer.java b/src/main/gen/net/sjrx/intellij/plugins/systemdunitfiles/generated/UnitFileLexer.java
diff --git a/src/main/resources/net/sjrx/intellij/plugins/systemdunitfiles/lexer/SystemdUnitFile.flex b/src/main/resources/net/sjrx/intellij/plugins/systemdunitfiles/lexer/SystemdUnitFile.flex
@@ -35,8 +35,7 @@ import net.sjrx.intellij.plugins.systemdunitfiles.generated.UnitFileElementTypeH
 %eof}
 %public
 
-
-// New Line Character
+// New Line Character (See JFlex manual)
 CRLF=\R
 
 // White space
@@ -60,7 +59,7 @@ INCOMPLETE_SECTION_HEADER = \[[^\]\n]*
 KEY_CHARACTER=[^=\ \n\t\f\\] | "\\ "
 
 // First value doesn't allow spaces
-VALUE_CHARACTER=[^\n\t\f\\] | "\\"{CRLF} | "\\".
+VALUE_CHARACTER=[^\n\f\\] | "\\"{CRLF} | "\\".
 
 // Comments can start with either ; or a #
 COMMENT=("#"|";")[^\n]*
@@ -89,7 +88,7 @@ SEPARATOR=[=]
 
 <WAITING_FOR_SEPARATOR> {SAME_LINE_WHITESPACE}*{SEPARATOR}{SAME_LINE_WHITESPACE}* { yybegin(WAITING_FOR_VALUE); return UnitFileElementTypeHolder.SEPARATOR; }
 
-// Pull a value character or really any character and mark it as it's value, this is really a hack :(
+// Pull a value character or really any character and mark it as its value, this is really a hack :(
 <WAITING_FOR_VALUE> ({VALUE_CHARACTER}+|[^])   { yybegin(IN_SECTION); return UnitFileElementTypeHolder.VALUE; }
 
 <YYINITIAL, IN_SECTION>({CRLF}|{WHITE_SPACE})+                  { return TokenType.WHITE_SPACE; }
diff --git a/src/test/java/net/sjrx/intellij/plugins/systemdunitfiles/parser/UnitFileParserTest.java b/src/test/java/net/sjrx/intellij/plugins/systemdunitfiles/parser/UnitFileParserTest.java
@@ -157,6 +157,62 @@ public void testLineContinuationSimple() {
     assertSameLines(expectedPsiTree, parseTree);
   }
 
+  public void testLineContinuationWithTabInlineSimple() {
+    /*
+     * Fixture Setup
+     */
+    String sourceCode = "[One]\n"
+                        + "Key=Val\tue \\\n"
+                        + "Hello";
+    
+    String expectedPsiTree = "unit configuration file (systemd)(0,24)\n"
+                             + "  UnitFileSectionGroupsImpl(SECTION_GROUPS)(0,24)\n"
+                             + "    PsiElement(UnitFileTokenType{SECTION})('[One]')(0,5)\n"
+                             + "    PsiWhiteSpace('\\n')(5,6)\n"
+                             + "    UnitFilePropertyImpl(PROPERTY)(6,24)\n"
+                             + "      PsiElement(UnitFileTokenType{KEY})('Key')(6,9)\n"
+                             + "      PsiElement(UnitFileTokenType{SEPARATOR})('=')(9,10)\n"
+                             + "      PsiElement(UnitFileTokenType{VALUE})('Val\\tue \\\\nHello')(10,24)";
+    /*
+     * Exercise SUT
+     */
+    
+    String parseTree = convertSourceToParseTree(sourceCode);
+    
+    /*
+     * Verification
+     */
+    assertSameLines(expectedPsiTree, parseTree);
+  }
+  
+  public void testLineContinuationWithWhitespaceStartingNextLine() {
+    /*
+     * Fixture Setup
+     */
+    String sourceCode = "[One]\n"
+                        + "Key=Value \\\n"
+                        + "\tHello";
+    
+    String expectedPsiTree = "unit configuration file (systemd)(0,24)\n"
+                             + "  UnitFileSectionGroupsImpl(SECTION_GROUPS)(0,24)\n"
+                             + "    PsiElement(UnitFileTokenType{SECTION})('[One]')(0,5)\n"
+                             + "    PsiWhiteSpace('\\n')(5,6)\n"
+                             + "    UnitFilePropertyImpl(PROPERTY)(6,24)\n"
+                             + "      PsiElement(UnitFileTokenType{KEY})('Key')(6,9)\n"
+                             + "      PsiElement(UnitFileTokenType{SEPARATOR})('=')(9,10)\n"
+                             + "      PsiElement(UnitFileTokenType{VALUE})('Value \\\\n\\tHello')(10,24)";
+    /*
+     * Exercise SUT
+     */
+    
+    String parseTree = convertSourceToParseTree(sourceCode);
+    
+    /*
+     * Verification
+     */
+    assertSameLines(expectedPsiTree, parseTree);
+  }
+
 
   public void testLineContinuationWithKeys() {
     /*
