Blobs are hex and can have dots between bytes

Author: J-Fields

src/vimscript/expression/parser.ts

@@ -36,18 +36,22 @@ import {
   VariableExpression,
 } from './types';
 
-// TODO: Support dots between bytes
 const blobParser: Parser<BlobValue> = regexp(/0[z]/i).then(
-  regexp(/[0-1a-z]*/i).map<BlobValue>((hexData) => {
-    if (hexData.length % 2 !== 0) {
-      throw VimError.fromCode(ErrorCode.BlobLiteralShouldHaveAnEvenNumberOfHexCharacters);
-    }
-    const data = new Uint8Array(new ArrayBuffer(hexData.length / 2));
-    for (let i = 0; i < hexData.length; i += 2) {
-      data[i / 2] = Number.parseInt(hexData.substring(i, i + 2), 16);
-    }
-    return blob(data);
-  }),
+  regexp(/[0-1a-f]{1,2}/i)
+    .sepBy(string('.').fallback(undefined))
+    .map<BlobValue>((bytes) => {
+      const lastByte = bytes.at(-1);
+      if (lastByte && lastByte.length !== 2) {
+        throw VimError.fromCode(ErrorCode.BlobLiteralShouldHaveAnEvenNumberOfHexCharacters);
+      }
+      const data = new Uint8Array(new ArrayBuffer(bytes.length));
+      let i = 0;
+      for (const byte of bytes) {
+        data[i] = Number.parseInt(byte, 16);
+        ++i;
+      }
+      return blob(data);
+    }),
 );
 
 const binaryNumberParser: Parser<NumberValue> = regexp(/0[b]/i).then(

test/vimscript/expression.test.ts

@@ -111,6 +111,12 @@ suite('Vimscript expressions', () => {
     });
 
     suite('Blobs', () => {
+      exprTest('0z', {
+        expr: {
+          type: 'blob',
+          data: new Uint8Array([]),
+        },
+      });
       exprTest('0zabcd', {
         expr: {
           type: 'blob',
@@ -123,6 +129,12 @@ suite('Vimscript expressions', () => {
           data: new Uint8Array([171, 205]),
         },
       });
+      exprTest('0zAB.CD', {
+        expr: {
+          type: 'blob',
+          data: new Uint8Array([171, 205]),
+        },
+      });
       exprTest('0zabc', {
         error: ErrorCode.BlobLiteralShouldHaveAnEvenNumberOfHexCharacters,
       });