@jbearak/sight 0.14.2 → 0.14.3

package/dist/sight-server.js

@@ -52,7 +52,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@jbearak/sight",
-    version: "0.14.2",
+    version: "0.14.3",
     type: "module",
     workspaces: [
       "client"
@@ -114,7 +114,7 @@ var init_package = __esm(() => {
     author: "Jonathan Marc Bearak",
     license: "GPL-3.0",
     dependencies: {
-      "@jbearak/dta-parser": "^0.3.0",
+      "@jbearak/dta-parser": "^0.6.0",
       picomatch: "^4.0.2",
       "smol-toml": "^1.6.1",
       "vscode-languageserver": "^9.0.1",
@@ -14595,6 +14595,13 @@ var init_parser = __esm(() => {
     isArithmeticOperator(value) {
       return value === "+" || value === "-" || value === "*" || value === "/" || value === "^";
     }
+    isMacroRefToken(token) {
+      return token.type === "MACRO_REF_LOCAL" || token.type === "MACRO_REF_GLOBAL";
+    }
+    isAdjacentOperandFragment(prev_token, token) {
+      const is_operand_like = (t) => t.type === "WORD" || t.type === "NUMBER" || this.isMacroRefToken(t);
+      return is_operand_like(prev_token) && is_operand_like(token) && (this.isMacroRefToken(prev_token) || this.isMacroRefToken(token)) && this.isAdjacentToken(prev_token, token);
+    }
     isValidAfterComparison(token) {
       if (token.type === "RPAREN") {
         return true;
@@ -15309,11 +15316,12 @@ var init_parser = __esm(() => {
           continuation.note_continuation(token);
           continue;
         }
+        const is_operand_fragment = prev_token !== null && this.isAdjacentOperandFragment(prev_token, token);
         if (paren_depth === 0 && bracket_depth === 0) {
           if (token.type === "COMMA") {
             break;
           }
-          if (stop_at_in && token.type === "WORD" && token.value === "in") {
+          if (stop_at_in && token.type === "WORD" && token.value === "in" && !is_operand_fragment) {
             break;
           }
           if (token.type === "LBRACE") {
@@ -15328,7 +15336,7 @@ var init_parser = __esm(() => {
           in_string_context = !in_string_context;
         }
         const current_state = state_stack[state_stack.length - 1];
-        if (current_state === "AFTER_RHS" && token.type !== "LPAREN" && token.type !== "RPAREN" && token.type !== "LBRACKET" && token.type !== "RBRACKET" && bracket_depth === 0 && !in_string_context && !is_delimiter_only) {
+        if (current_state === "AFTER_RHS" && token.type !== "LPAREN" && token.type !== "RPAREN" && token.type !== "LBRACKET" && token.type !== "RBRACKET" && bracket_depth === 0 && !in_string_context && !is_delimiter_only && !is_operand_fragment) {
           if (prev_token && this.detectSplitLiteral(prev_token, token)) {} else if (!this.isValidAfterComparison(token)) {
             this.addError(`Unexpected token '${token.value}' after comparison expression. Did you mean to use '&' or '|'?`, token.range, "STRAY_TOKEN_IN_CONDITION" /* STRAY_TOKEN_IN_CONDITION */);
           }
@@ -73804,4 +73812,4 @@ export {
   is_cli_entry_point
 };
 
-//# debugId=87D5065082C541EF64756E2164756E21
+//# debugId=26F6D7391A01C62064756E2164756E21

package/dist/sight-server.js.sha256

@@ -1 +1 @@
-151dd39330b47c8992ffedf69fa32703ddca0c1f6f1181339fcf58d5880b242f  sight-server.js
+29571e2adbaf388e86c862f9563a283a28569601d9fe0563b3df58e8b12a6c37  sight-server.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbearak/sight",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "type": "module",
   "workspaces": [
     "client"
@@ -62,7 +62,7 @@
   "author": "Jonathan Marc Bearak",
   "license": "GPL-3.0",
   "dependencies": {
-    "@jbearak/dta-parser": "^0.3.0",
+    "@jbearak/dta-parser": "^0.6.0",
     "picomatch": "^4.0.2",
     "smol-toml": "^1.6.1",
     "vscode-languageserver": "^9.0.1",