properly handle () within TXT records

highlightjs · May 25, 2023 · 4be1346 · 4be1346
1 parent 9c21f20
commit 4be1346
Showing 1 changed file with 22 additions and 12 deletions.
diff --git a/src/languages/dns.js b/src/languages/dns.js
@@ -46,6 +46,16 @@ export default function(hljs) {
     "TSIG",
     "TXT"
   ];
+
+  const PUNCTUATION = {
+    scope: 'punctuation',
+    match: /\(|\)/
+  };
+  const STRING = {
+    scope: 'string',
+    begin: '"', end: '"'
+  };
+
   return {
     name: 'DNS Zone',
     aliases: [
@@ -55,24 +65,24 @@ export default function(hljs) {
     keywords: KEYWORDS,
     contains: [
       hljs.COMMENT(';', '$', { relevance: 0 }),
+      STRING,
       {
-        // Character strings
-        scope: 'string',
-        begin: '"', end: '"'
-      },
-      {
-        scope: 'string',
-        begin: /TXT.+/,
-        keywords: KEYWORDS
+        match: /TXT\s+/,
+        keywords: KEYWORDS,
+        contains: [
+          STRING,
+          PUNCTUATION,
+          {
+            match: /\S+/,            
+            scope: "string"
+          }
+        ]
       },
       {
         className: 'meta',
         begin: /^\$(TTL|GENERATE|INCLUDE|ORIGIN)\b/
       },
-      {
-        scope: 'punctuation',
-        match: /\(|\)/
-      },
+      PUNCTUATION,
       {
         scope: 'type',
         match: /IN|CH/