Merge pull request #120 from teyc/fix/case_stmt_trailing_whitespace

#117 Case Expression trailing whitespace
bruce-dunwiddie · Feb 5, 2023 · 9339005 · 9339005
2 parents 2a2f729 + a461656
commit 9339005
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/TSQL_Parser/TSQL_Parser/Expressions/Parsers/TSQLCaseExpressionParser.cs b/TSQL_Parser/TSQL_Parser/Expressions/Parsers/TSQLCaseExpressionParser.cs
@@ -39,6 +39,10 @@ public TSQLCaseExpression Parse(ITSQLTokenizer tokenizer)
 
 			tokenizer.MoveNext();
 
+			TSQLTokenParserHelper.ReadCommentsAndWhitespace(
+				tokenizer,
+				caseExpression.Tokens);
+
 			return caseExpression;
 		}
 	}

diff --git a/TSQL_Parser/Tests/Expressions/CaseExpressionTests.cs b/TSQL_Parser/Tests/Expressions/CaseExpressionTests.cs
@@ -8,6 +8,7 @@
 using TSQL.Tokens;
 
 using Tests.Tokens;
+using TSQL.Expressions.Parsers;
 
 namespace Tests.Expressions
 {
@@ -81,5 +82,25 @@ public void CaseExpression_Regression_Duplicated_Case()
 					},
 				tokens);
 		}
+
+		[TestCase(false, 30)]
+		[TestCase(true, 31)]
+		public void CaseExpression_Should_Include_TrailingWhitespace_If_Flag_Is_True(bool includeWhiteSpace, int expectedEndPosition)
+		{
+			//                  0123456789012345678901234567890123456789
+			const string sql = "CASE 1 WHEN 2 THEN 2 ELSE 3 END ";
+
+			TSQLTokenizer tokenizer = new TSQLTokenizer(sql)
+			{
+				IncludeWhitespace = includeWhiteSpace
+			};
+
+			Assert.IsTrue(tokenizer.MoveNext());
+
+			var expression = new TSQLCaseExpressionParser().Parse(tokenizer);
+			Assert.AreEqual(0, expression.BeginPosition);
+			Assert.AreEqual(expectedEndPosition, expression.EndPosition);
+
+		}
 	}
 }