Improve VR syntax highlighting

smikitky · Jul 7, 2018 · 09e69e2 · 09e69e2
1 parent 0c66d08
commit 09e69e2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/hoverProvider.ts b/src/hoverProvider.ts
@@ -12,16 +12,21 @@ export default class DicomHoverProvider implements vscode.HoverProvider {
     // Since we cannot directly get the scope from here,
     // we need to reanalyze the line.
     const line = document.lineAt(position.line).text;
-    const match = line.match(/\s*(\([0-9A-F]{4}\,[0-9A-F]{4}\)) ([A-Z]{2})/);
+    const match = line.match(
+      /\s*(\([0-9A-F]{4}\,[0-9A-F]{4}\)) ([A-Z]{2}(\|[A-Z])*)/
+    );
     if (!match) return;
-    const vrPos = match[0].length - 2;
-    const vr = match[2];
+    const vrPos = match[0].length - match[2].length;
 
     // Make sure the cursor is hovering on the VR part
-    if (position.character < vrPos || vrPos + 1 < position.character) {
+    if (
+      position.character < vrPos ||
+      vrPos + match[2].length < position.character
+    ) {
       return null;
     }
 
+    const vr = document.getText(document.getWordRangeAtPosition(position));
     const hover = vrDict[vr] || 'Unknown VR';
     return new vscode.Hover(hover);
   }

diff --git a/syntaxes/dicom-dump.tmLanguage.json b/syntaxes/dicom-dump.tmLanguage.json
@@ -12,12 +12,12 @@
       "patterns": [
         {
           "match":
-            "^\\s*(\\([0-9A-F]{4}\\,[0-9A-F]{4}\\)) (..) (\\w+|\\?) ?= ?(.*)",
+            "^\\s*(\\([0-9A-F]{4}\\,[0-9A-F]{4}\\)) (..(\\|..)*) (\\w+|\\?) ?= ?(.*)",
           "captures": {
             "1": { "patterns": [{ "include": "#tag" }] },
             "2": { "patterns": [{ "include": "#vr" }] },
-            "3": { "patterns": [{ "include": "#name" }] },
-            "4": { "patterns": [{ "include": "#val" }] }
+            "4": { "patterns": [{ "include": "#name" }] },
+            "5": { "patterns": [{ "include": "#val" }] }
           }
         }
       ]