fix: Fix lexer to correctly handle national character literals (#181)

felipebz · Feb 28, 2024 · 56b0a67 · 56b0a67
1 parent 9fedad2
commit 56b0a67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/zpa-core/src/main/kotlin/org/sonar/plsqlopen/lexer/PlSqlLexer.kt b/zpa-core/src/main/kotlin/org/sonar/plsqlopen/lexer/PlSqlLexer.kt
@@ -44,7 +44,7 @@ object PlSqlLexer {
     private const val CUSTOM_DELIMITER_END = "\\1" // same as the start
 
     private val STRING_LITERAL = ("(?is)(?:"
-        + or("?:'(?:[^']|'')*+'", // simple text literal
+        + or("?:n?'(?:[^']|'')*+'", // simple text literal
         "n?q?'" + or("?:" + g("?:" + g(CUSTOM_DELIMITER_START) + ".*?(?:" + CUSTOM_DELIMITER_END + "')"),
             g("?:\\(.*?\\)'"),
             g("?:\\[.*?\\]'"),

diff --git a/zpa-core/src/test/kotlin/org/sonar/plsqlopen/lexer/PlSqlLexerTest.kt b/zpa-core/src/test/kotlin/org/sonar/plsqlopen/lexer/PlSqlLexerTest.kt
@@ -61,7 +61,7 @@ class PlSqlLexerTest {
 
     @Test
     fun simpleNationalCharsetStringLiteral() {
-        assertThatIsToken("n'Test'", PlSqlTokenType.STRING_LITERAL)
+        assertThatIsToken("n'Test string'", PlSqlTokenType.STRING_LITERAL)
     }
 
     @Test
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,7 +61,7 @@ class PlSqlLexerTest { @@
         @Test
         fun simpleNationalCharsetStringLiteral() {
-            assertThatIsToken("n'Test'", PlSqlTokenType.STRING_LITERAL)
+            assertThatIsToken("n'Test string'", PlSqlTokenType.STRING_LITERAL)
         }
         @Test
@@ Expand Down @@