fix: support backslashes

scriptcoded · Oct 16, 2023 · 204a537 · 204a537
1 parent fc002f9
commit 204a537
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/lib/escapeHtml.js b/lib/escapeHtml.js
@@ -34,7 +34,11 @@ const charCodeMap = {
   38: '&amp;', // &
   39: '&#39;', // '
   60: '&lt;', // <
-  62: '&gt;' // >
+  62: '&gt;', // >
+  92: '&#92;', // \\
+  9: '&#92;t', // \t
+  10: '&#92;n', // \n
+  13: '&#92;r' // \r
 }
 
 function escapeHtml (str) {

diff --git a/lib/index.js b/lib/index.js
@@ -97,6 +97,9 @@ function highlight (sqlString, options) {
         const escapedContent = options.htmlEscaper(content)
         return `<span class="${options.classPrefix}${name}">${escapedContent}</span>`
       }
+      if (name === 'string') {
+        content = JSON.stringify(content).slice(1, -1).replaceAll('\\"', '"')
+      }
       return options.colors[name] + content + options.colors.clear
     })
     .join('')

diff --git a/test/debug.js b/test/debug.js
@@ -21,6 +21,7 @@ console.log(highlight('SELECT id FROM listings WHERE status = "not available"'))
 
 console.log(highlight('SELECT \'{"json_index":"json_value"}\' AS test;'))
 console.log(highlight('SELECT "This is a \\"text\\" test" AS text;'))
+console.log(highlight('SELECT \'\\\r\t\n\' AS text;'))
 
 console.log(highlight('DROP PROCEDURE IF EXISTS `some-database`.`some-table`;'))
 

diff --git a/test/index.test.js b/test/index.test.js
@@ -38,7 +38,12 @@ describe('unicode', () => {
 
   it('strings (scaping quotes)', () => {
     expect(hlUni('\'\\\'\' "\\"" `\\``'))
-      .toBe('[string]\'\\\'\'[clear] [string]"\\""[clear] [string]`\\``[clear]')
+      .toBe('[string]\'\\\\\'\'[clear] [string]"\\\\""[clear] [string]`\\\\``[clear]')
+  })
+
+  it('strings (line breaks)', () => {
+    expect(hlUni('\'\\\r\n\t\''))
+      .toBe('[string]\'\\\\\\r\\n\\t\'[clear]')
   })
 
   it('integers', () => {
@@ -155,7 +160,12 @@ describe('html', () => {
 
   it('strings (scaping quotes)', () => {
     expect(hlHtml('\'\\\'\' "\\"" `\\``'))
-      .toBe('<span class="sql-hl-string">&#39;\\&#39;&#39;</span> <span class="sql-hl-string">&quot;\\&quot;&quot;</span> <span class="sql-hl-string">`\\``</span>')
+      .toBe('<span class="sql-hl-string">&#39;&#92;&#39;&#39;</span> <span class="sql-hl-string">&quot;&#92;&quot;&quot;</span> <span class="sql-hl-string">`&#92;``</span>')
+  })
+
+  it('strings (line breaks)', () => {
+    expect(hlHtml('\'\\\r\n\t\''))
+      .toBe('<span class="sql-hl-string">&#39;&#92;&#92;r&#92;n&#92;t&#39;</span>')
   })
 
   it('integers', () => {