@puruslang/prettier-plugin-purus 0.7.1 → 0.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@puruslang/prettier-plugin-purus",
-  "version": "0.7.1",
+  "version": "0.8.1",
   "description": "Prettier plugin for the Purus language",
   "license": "Apache-2.0",
   "main": "src/index.js",

package/src/index.js

@@ -4,25 +4,28 @@ const KEYWORDS = new Set([
   "const", "let", "var", "be",
   "fn", "async", "return", "to", "gives",
   "if", "elif", "else", "unless", "then",
-  "while", "until", "for", "in", "range",
-  "match", "when", "witch", "case",
+  "while", "until", "do", "for", "in", "range",
+  "match", "when", "switch", "case",
   "try", "catch", "finally", "throw",
   "import", "from", "export", "default", "require", "use", "namespace", "public", "all", "with",
-  "add", "sub", "mul", "div", "mod", "neg", "pow",
+  "add", "sub", "mul", "div", "fdiv", "mod", "neg", "pow",
   "eq", "neq", "lt", "gt", "le", "ge",
   "and", "or", "not", "pipe", "coal",
-  "is", "as", "of", "typeof", "instanceof", "type",
-  "new", "delete", "this", "await",
-  "class", "extends", "super", "static", "private", "get", "set",
-  "true", "false", "null", "nil", "undefined", "nan",
+  "band", "bor", "bxor", "bnot", "shl", "shr", "ushr",
+  "as", "of", "typeof", "instanceof", "type",
+  "new", "delete", "this", "await", "yield", "void",
+  "class", "extends", "super", "static", "private", "protected", "get", "set",
+  "true", "false", "null", "nil", "undefined", "nan", "infinity",
   "break", "continue",
   "list", "object",
+  "function",
 ]);
 
 const BLOCK_STARTERS = new Set([
   "fn", "if", "elif", "else", "unless",
-  "while", "until", "for",
-  "match", "when", "witch", "case",
+  "while", "until", "do", "for",
+  "match", "when", "switch", "case",
+  "try", "catch", "finally", "class",
 ]);
 
 function tokenize(source) {
@@ -136,13 +139,25 @@ function tokenize(source) {
       continue;
     }
 
-    // Number
+    // Number (decimal, 0b binary, 0x hex, BigInt n-suffix)
     if (/[0-9]/.test(source[i])) {
       let start = i;
-      while (i < len && /[0-9]/.test(source[i])) i++;
-      if (i < len && source[i] === "." && i + 1 < len && /[0-9]/.test(source[i + 1])) {
-        i++;
+      if (source[i] === "0" && i + 1 < len && (source[i + 1] === "b" || source[i + 1] === "B")) {
+        i += 2;
+        while (i < len && /[01]/.test(source[i])) i++;
+      } else if (source[i] === "0" && i + 1 < len && (source[i + 1] === "x" || source[i + 1] === "X")) {
+        i += 2;
+        while (i < len && /[0-9a-fA-F]/.test(source[i])) i++;
+      } else {
         while (i < len && /[0-9]/.test(source[i])) i++;
+        if (i < len && source[i] === "." && i + 1 < len && /[0-9]/.test(source[i + 1])) {
+          i++;
+          while (i < len && /[0-9]/.test(source[i])) i++;
+        }
+      }
+      // BigInt suffix: n
+      if (i < len && source[i] === "n" && (i + 1 >= len || !/[a-zA-Z0-9_]/.test(source[i + 1]))) {
+        i++;
       }
       tokens.push({ type: "number", value: source.slice(start, i) });
       continue;
@@ -213,6 +228,32 @@ function isEmptyLine(lineTokens) {
   return lineTokens.every(t => t.type === "whitespace");
 }
 
+/**
+ * Returns "postfix", "prefix", or null for the backslash token at content[ti].
+ * Postfix: (ident | ] | number) \ (add|sub keyword)  → x\add, x\sub
+ * Prefix:  (add|sub keyword) \ ident                 → add\x, sub\x
+ */
+function isIncrDecrSlash(content, ti) {
+  if (content[ti].value !== "\\") return null;
+  let ni = ti + 1;
+  while (ni < content.length && content[ni].type === "whitespace") ni++;
+  let pi = ti - 1;
+  while (pi >= 0 && content[pi].type === "whitespace") pi--;
+  const nextTok = ni < content.length ? content[ni] : null;
+  const prevTok = pi >= 0 ? content[pi] : null;
+  if (nextTok && nextTok.type === "keyword" && (nextTok.value === "add" || nextTok.value === "sub")) {
+    if (prevTok && (prevTok.type === "ident" || prevTok.value === "]" || prevTok.type === "number")) {
+      return "postfix";
+    }
+  }
+  if (prevTok && prevTok.type === "keyword" && (prevTok.value === "add" || prevTok.value === "sub")) {
+    if (nextTok && nextTok.type === "ident") {
+      return "prefix";
+    }
+  }
+  return null;
+}
+
 function formatPurus(source, options = {}) {
   const indent = options.tabWidth || 2;
   const useTabs = options.useTabs || false;
@@ -258,22 +299,37 @@ function formatPurus(source, options = {}) {
         // Normalize to single space between tokens, but not before [ or after [, or before ]
         const next = content[ti + 1];
         const prevChar = lineStr.length > 0 ? lineStr[lineStr.length - 1] : "";
-        if (lineStr.length > 0 && next && next.value !== "]" && next.value !== "[" && prevChar !== "[") {
+        // Suppress space before an incr/decr backslash
+        const nextIsIncrDecrSlash = next && next.value === "\\" && isIncrDecrSlash(content, ti + 1) !== null;
+        // Suppress space after an incr/decr backslash
+        let prevIsIncrDecrSlash = false;
+        { let pi = ti - 1; while (pi >= 0 && content[pi].type === "whitespace") pi--;
+          prevIsIncrDecrSlash = pi >= 0 && content[pi].value === "\\" && isIncrDecrSlash(content, pi) !== null; }
+        if (lineStr.length > 0 && next && next.value !== "]" && next.value !== "[" && prevChar !== "[" && !nextIsIncrDecrSlash && !prevIsIncrDecrSlash) {
           lineStr += " ";
         }
       } else {
         if (ti > 0 && content[ti - 1].type !== "whitespace" && lineStr.length > 0) {
           // Adjacent non-whitespace tokens - check if space needed
           const prev = lineStr[lineStr.length - 1];
+          let suppressSpace = false;
           if (tok.value === "." || prev === ".") {
-            // No space around dots
+            suppressSpace = true; // No space around dots
           } else if (tok.value === "," || tok.value === ";") {
-            // No space before comma/semicolon
+            suppressSpace = true; // No space before comma/semicolon
           } else if (tok.value === "[" || tok.value === "]" || prev === "[") {
-            // No space around brackets (function call syntax)
+            suppressSpace = true; // No space around brackets
+          } else if (tok.value === "\\" && isIncrDecrSlash(content, ti) !== null) {
+            suppressSpace = true; // No space before incr/decr backslash
           } else {
-            lineStr += " ";
+            // No space after incr/decr backslash
+            let pi = ti - 1;
+            while (pi >= 0 && content[pi].type === "whitespace") pi--;
+            if (pi >= 0 && content[pi].value === "\\" && isIncrDecrSlash(content, pi) !== null) {
+              suppressSpace = true;
+            }
           }
+          if (!suppressSpace) lineStr += " ";
         }
         lineStr += tok.value;
       }