@jbearak/sight 0.14.1 → 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.1",
+    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 */);
           }
@@ -17334,6 +17342,9 @@ function inline_embedded_statement_end(tokens, opener_index) {
   const end_index = my_i < tokens.length && tokens[my_i].type === "STATEMENT_TERMINATOR" ? my_i : my_last_content_index;
   return { end_index, end_line };
 }
+function is_logical_statement_boundary(my_token) {
+  return LOGICAL_BOUNDARY_TYPES.has(my_token.type);
+}
 function logical_statement_start(tokens, position, min_line = 0) {
   if (tokens === undefined || tokens.length === 0) {
     return;
@@ -17358,7 +17369,7 @@ function logical_statement_start(tokens, position, min_line = 0) {
     if (is_swallowed_continuation_terminator(my_token, my_i > 0 && tokens[my_i - 1].type === "CONTINUATION")) {
       continue;
     }
-    if (LOGICAL_BOUNDARY_TYPES.has(my_token.type)) {
+    if (is_logical_statement_boundary(my_token)) {
       boundary_index = my_i;
       break;
     }
@@ -28281,6 +28292,236 @@ var init_diagnostic_token_stream = __esm(() => {
 function is_invalid_operator_sequence_pair(first_value, second_value) {
   return INVALID_PAIRS.has(`${first_value} ${second_value}`);
 }
+function resolve_mixed_effects_command_head(the_significant, statement_start, statement_end) {
+  let my_i = statement_start;
+  while (my_i < statement_end) {
+    const my_prefix = the_significant[my_i];
+    if (my_prefix.type !== "WORD") {
+      break;
+    }
+    if (MIXED_COLON_OPTIONAL_PREFIX_COMMANDS.has(my_prefix.value)) {
+      my_i++;
+      if (my_i < statement_end && the_significant[my_i].type === "COLON") {
+        my_i++;
+      }
+      continue;
+    }
+    if (MIXED_COLON_REQUIRED_PREFIX_COMMANDS.has(my_prefix.value) && my_i + 1 < statement_end && the_significant[my_i + 1].type === "COLON") {
+      my_i += 2;
+      continue;
+    }
+    break;
+  }
+  const my_command = the_significant[my_i];
+  if (my_i >= statement_end || my_command?.type !== "WORD") {
+    return;
+  }
+  const my_continuation = the_significant[my_i + 1];
+  if (my_i + 1 < statement_end && is_name_continuation_fragment(my_continuation) && is_adjacent(my_command, my_continuation)) {
+    return;
+  }
+  return { token: my_command, index: my_i };
+}
+function is_matching_group_close(my_opener, close_type) {
+  return my_opener === "LPAREN" && close_type === "RPAREN" || my_opener === "LBRACKET" && close_type === "RBRACKET";
+}
+function is_name_fragment(my_token) {
+  return my_token !== undefined && NAME_FRAGMENT_TOKEN_TYPES.has(my_token.type);
+}
+function is_name_continuation_fragment(my_token) {
+  return my_token !== undefined && NAME_CONTINUATION_TOKEN_TYPES.has(my_token.type);
+}
+function is_plausible_model_head(the_significant, model_head_index, statement_end) {
+  const my_head = the_significant[model_head_index];
+  if (is_mixed_varlist_wildcard(my_head)) {
+    return true;
+  }
+  if (!is_name_fragment(my_head)) {
+    return false;
+  }
+  if (my_head.type !== "WORD" || my_head.value !== "if" && my_head.value !== "in") {
+    return true;
+  }
+  const my_continuation = the_significant[model_head_index + 1];
+  return model_head_index + 1 < statement_end && is_name_continuation_fragment(my_continuation) && is_adjacent(my_head, my_continuation);
+}
+function is_mixed_varlist_wildcard(my_token) {
+  return my_token?.type === "OPERATOR" && my_token.value === "*" || (my_token?.type === "OPERATOR" || my_token?.type === "WORD") && my_token.value === "?";
+}
+function is_mixed_constructed_name_fragment(my_token) {
+  return is_name_continuation_fragment(my_token) || is_mixed_varlist_wildcard(my_token);
+}
+function is_standalone_mixed_qualifier(the_significant, token_index) {
+  const my_token = the_significant[token_index];
+  if (my_token.type !== "WORD" || my_token.value !== "if" && my_token.value !== "in") {
+    return false;
+  }
+  const my_previous = the_significant[token_index - 1];
+  const my_next = the_significant[token_index + 1];
+  return !(is_mixed_constructed_name_fragment(my_previous) && is_adjacent(my_previous, my_token) || is_mixed_constructed_name_fragment(my_next) && is_adjacent(my_token, my_next));
+}
+function is_plausible_mixed_varlist_range_dash(the_significant, dash_index) {
+  const my_dash = the_significant[dash_index];
+  const my_right_fragment = the_significant[dash_index + 1];
+  if (my_dash.type !== "OPERATOR" || my_dash.value !== "-" || !is_name_fragment(my_right_fragment) || !is_adjacent(my_dash, my_right_fragment)) {
+    return false;
+  }
+  let my_right_boundary = my_dash;
+  for (let my_i = dash_index - 1;my_i >= 0; my_i--) {
+    const my_left_fragment = the_significant[my_i];
+    if (!is_name_continuation_fragment(my_left_fragment) || !is_adjacent(my_left_fragment, my_right_boundary)) {
+      return false;
+    }
+    if (is_name_fragment(my_left_fragment)) {
+      return true;
+    }
+    my_right_boundary = my_left_fragment;
+  }
+  return false;
+}
+function has_dangling_operator_before_mixed_separator(the_significant, first_bar_index, mixed_varlist_is_open) {
+  const my_previous = the_significant[first_bar_index - 1];
+  if (!is_mixed_varlist_wildcard(my_previous)) {
+    return my_previous?.type === "OPERATOR";
+  }
+  if (!mixed_varlist_is_open) {
+    return true;
+  }
+  let my_i = first_bar_index - 2;
+  while (is_mixed_varlist_wildcard(the_significant[my_i])) {
+    my_i--;
+  }
+  return the_significant[my_i]?.type === "OPERATOR";
+}
+function plausible_levelvar_colon_index(the_significant, first_bar_index, statement_end) {
+  const my_first_fragment_index = first_bar_index + 2;
+  const my_first_fragment = the_significant[my_first_fragment_index];
+  if (!is_name_fragment(my_first_fragment)) {
+    return;
+  }
+  let my_fragment_count = 1;
+  let my_last_fragment_index = my_first_fragment_index;
+  while (my_last_fragment_index + 1 < statement_end) {
+    const my_last_fragment = the_significant[my_last_fragment_index];
+    const my_next_fragment = the_significant[my_last_fragment_index + 1];
+    if (!is_name_continuation_fragment(my_next_fragment) || !is_adjacent(my_last_fragment, my_next_fragment)) {
+      break;
+    }
+    my_fragment_count++;
+    my_last_fragment_index++;
+  }
+  const my_colon_index = my_last_fragment_index + 1;
+  const my_colon = the_significant[my_colon_index];
+  if (my_colon?.type !== "COLON") {
+    return;
+  }
+  if (my_fragment_count === 1 && my_first_fragment.type === "WORD" && (my_first_fragment.value === "if" || my_first_fragment.value === "in")) {
+    return;
+  }
+  return my_colon_index;
+}
+function mark_mixed_effects_separators_in_statement(the_significant, statement_start, statement_end, the_separator_starts) {
+  const my_command_head = resolve_mixed_effects_command_head(the_significant, statement_start, statement_end);
+  if (my_command_head === undefined || !MIXED_EFFECTS_SEPARATOR_COMMANDS.has(my_command_head.token.value)) {
+    return;
+  }
+  const my_group_stack = [];
+  const my_has_required_model_content = OMITTED_MODEL_HEAD_COMMANDS.has(my_command_head.token.value) || is_plausible_model_head(the_significant, my_command_head.index + 1, statement_end);
+  let my_saw_top_level_options_comma = false;
+  let my_saw_top_level_double_bar = false;
+  let my_has_marked_separator = false;
+  let my_separators_are_valid = true;
+  let my_mixed_varlist_is_open = true;
+  for (let my_i = my_command_head.index + 1;my_i < statement_end; my_i++) {
+    const my_token = the_significant[my_i];
+    if (my_token.type === "LPAREN" || my_token.type === "LBRACKET") {
+      my_group_stack.push(my_token.type);
+      continue;
+    }
+    if (my_token.type === "RPAREN" || my_token.type === "RBRACKET") {
+      if (!is_matching_group_close(my_group_stack[my_group_stack.length - 1], my_token.type)) {
+        break;
+      }
+      my_group_stack.pop();
+      continue;
+    }
+    if (my_group_stack.length !== 0) {
+      continue;
+    }
+    if (my_token.type === "COMMA") {
+      if (!my_has_marked_separator) {
+        my_saw_top_level_options_comma = true;
+      }
+      my_mixed_varlist_is_open = false;
+      continue;
+    }
+    if (is_standalone_mixed_qualifier(the_significant, my_i)) {
+      my_mixed_varlist_is_open = false;
+    }
+    const my_second_bar = the_significant[my_i + 1];
+    if (my_token.type !== "OPERATOR" || my_token.value !== "|" || my_second_bar?.type !== "OPERATOR" || my_second_bar.value !== "|" || !is_adjacent(my_token, my_second_bar)) {
+      if (my_token.type === "OPERATOR" && !is_mixed_varlist_wildcard(my_token) && !(my_mixed_varlist_is_open && is_plausible_mixed_varlist_range_dash(the_significant, my_i))) {
+        my_mixed_varlist_is_open = false;
+      }
+      continue;
+    }
+    if (!my_saw_top_level_double_bar) {
+      my_saw_top_level_double_bar = true;
+      if (!my_has_required_model_content) {
+        my_separators_are_valid = false;
+      }
+    }
+    const my_levelvar_colon_index = plausible_levelvar_colon_index(the_significant, my_i, statement_end);
+    if (!my_separators_are_valid || !my_has_marked_separator && my_saw_top_level_options_comma || has_dangling_operator_before_mixed_separator(the_significant, my_i, my_mixed_varlist_is_open) || my_levelvar_colon_index === undefined) {
+      my_mixed_varlist_is_open = false;
+      continue;
+    }
+    the_separator_starts.add(my_token);
+    my_has_marked_separator = true;
+    my_mixed_varlist_is_open = true;
+    my_i = my_levelvar_colon_index;
+  }
+}
+function file_mentions_mixed_effects_command(tokens) {
+  for (const my_token of tokens) {
+    if (my_token.type === "WORD" && MIXED_EFFECTS_SEPARATOR_COMMANDS.has(my_token.value)) {
+      return true;
+    }
+  }
+  return false;
+}
+function collect_mixed_effects_separator_starts(tokens) {
+  const my_memoized = mixed_effects_separator_starts_memo.get(tokens);
+  if (my_memoized !== undefined) {
+    return my_memoized;
+  }
+  const the_separator_starts = compute_mixed_effects_separator_starts(tokens);
+  mixed_effects_separator_starts_memo.set(tokens, the_separator_starts);
+  return the_separator_starts;
+}
+function compute_mixed_effects_separator_starts(tokens) {
+  if (!file_mentions_mixed_effects_command(tokens)) {
+    return new Set;
+  }
+  const the_significant = collect_significant_tokens(tokens);
+  const the_separator_starts = new Set;
+  let statement_start = 0;
+  for (let my_i = 0;my_i <= the_significant.length; my_i++) {
+    const my_token = the_significant[my_i];
+    const at_end = my_token === undefined || my_token.type === "EOF";
+    if (!at_end && !is_logical_statement_boundary(my_token)) {
+      continue;
+    }
+    if (statement_start < my_i) {
+      mark_mixed_effects_separators_in_statement(the_significant, statement_start, my_i, the_separator_starts);
+    }
+    if (at_end) {
+      break;
+    }
+    statement_start = my_i + 1;
+  }
+  return the_separator_starts;
+}
 
 class OperatorSequenceAnalyzer {
   analyze(document, config) {
@@ -28297,6 +28538,7 @@ class OperatorSequenceAnalyzer {
     }
     const ignored_lines = document.ignored_lines ?? new Set;
     const ast = document.ast;
+    const the_mixed_effects_separator_starts = collect_mixed_effects_separator_starts(the_tokens);
     const the_diagnostics = [];
     let i = 0;
     while (i < the_tokens.length) {
@@ -28311,6 +28553,10 @@ class OperatorSequenceAnalyzer {
         continue;
       }
       const { second_token, next_index } = adjacency_result;
+      if (the_mixed_effects_separator_starts.has(first_token)) {
+        i = next_index;
+        continue;
+      }
       const pair_result = this.classify_pair(first_token, second_token, ast ?? undefined);
       if (!pair_result) {
         i++;
@@ -28559,11 +28805,12 @@ class OperatorSequenceAnalyzer {
     return resolve_diagnostic_severity(config_severity, default_severity);
   }
 }
-var import_node3, SPACED_COMPOUND_PAIRS, MALFORMED_OPERATOR_PAIRS, INVALID_PAIRS, CSTYLE_LOGICAL_PAIRS, SPECIAL_MESSAGES, CSTYLE_QUALIFIER_MESSAGES, CSTYLE_CONTROL_FLOW_MESSAGES, ARITHMETIC_OPS, COMPARISON_OPS, NEGATION_OPS, TRIVIA_TYPES, ADJACENCY_BREAKERS;
+var import_node3, SPACED_COMPOUND_PAIRS, MALFORMED_OPERATOR_PAIRS, INVALID_PAIRS, CSTYLE_LOGICAL_PAIRS, SPECIAL_MESSAGES, CSTYLE_QUALIFIER_MESSAGES, CSTYLE_CONTROL_FLOW_MESSAGES, ARITHMETIC_OPS, COMPARISON_OPS, NEGATION_OPS, TRIVIA_TYPES, ADJACENCY_BREAKERS, MIXED_EFFECTS_SEPARATOR_COMMANDS, OMITTED_MODEL_HEAD_COMMANDS, MIXED_COLON_OPTIONAL_PREFIX_COMMANDS, MIXED_COLON_REQUIRED_PREFIX_COMMANDS, NAME_FRAGMENT_TOKEN_TYPES, NAME_CONTINUATION_TOKEN_TYPES, mixed_effects_separator_starts_memo;
 var init_operator_sequence_diagnostics = __esm(() => {
   init_types();
   init_diagnostic_code_description();
   init_diagnostic_severity();
+  init_statement_span();
   init_diagnostic_token_stream();
   import_node3 = __toESM(require_main4(), 1);
   SPACED_COMPOUND_PAIRS = new Map([
@@ -28619,6 +28866,58 @@ var init_operator_sequence_diagnostics = __esm(() => {
   ADJACENCY_BREAKERS = new Set([
     "STATEMENT_TERMINATOR"
   ]);
+  MIXED_EFFECTS_SEPARATOR_COMMANDS = new Set([
+    "mixed",
+    "mecloglog",
+    "meglm",
+    "meintreg",
+    "melogit",
+    "menbreg",
+    "meologit",
+    "meoprobit",
+    "mepoisson",
+    "meprobit",
+    "meqrlogit",
+    "meqrpoisson",
+    "mestreg",
+    "metobit",
+    "xtmixed",
+    "xtmelogit",
+    "xtmepoisson"
+  ]);
+  OMITTED_MODEL_HEAD_COMMANDS = new Set([
+    "mestreg"
+  ]);
+  MIXED_COLON_OPTIONAL_PREFIX_COMMANDS = new Set([
+    "cap",
+    "capt",
+    "captu",
+    "captur",
+    "capture",
+    "qui",
+    "quie",
+    "quiet",
+    "quietl",
+    "quietly",
+    "noi",
+    "nois",
+    "noisi",
+    "noisil",
+    "noisily"
+  ]);
+  MIXED_COLON_REQUIRED_PREFIX_COMMANDS = new Set([
+    "xi"
+  ]);
+  NAME_FRAGMENT_TOKEN_TYPES = new Set([
+    "WORD",
+    "MACRO_REF_LOCAL",
+    "MACRO_REF_GLOBAL"
+  ]);
+  NAME_CONTINUATION_TOKEN_TYPES = new Set([
+    ...NAME_FRAGMENT_TOKEN_TYPES,
+    "NUMBER"
+  ]);
+  mixed_effects_separator_starts_memo = new WeakMap;
 });
 
 // src/providers/mixed-logical-diagnostics.ts
@@ -28641,6 +28940,7 @@ class MixedLogicalOperatorAnalyzer {
     }
     const my_ignored_lines = document.ignored_lines ?? new Set;
     const my_severity = resolve_diagnostic_severity(my_config_severity);
+    const the_mixed_effects_separator_starts = collect_mixed_effects_separator_starts(the_tokens);
     const my_diagnostics = [];
     let my_state = this.fresh_state();
     let my_in_continuation = false;
@@ -28650,6 +28950,13 @@ class MixedLogicalOperatorAnalyzer {
         my_in_continuation = false;
         continue;
       }
+      if (the_mixed_effects_separator_starts.has(my_token)) {
+        my_in_continuation = false;
+        this.flush(my_state, my_diagnostics, my_severity, my_ignored_lines);
+        my_state = this.fresh_state();
+        i++;
+        continue;
+      }
       if (this.is_qualifier_breaker(my_token, my_state)) {
         my_in_continuation = false;
         this.flush(my_state, my_diagnostics, my_severity, my_ignored_lines);
@@ -28674,7 +28981,7 @@ class MixedLogicalOperatorAnalyzer {
         }
         continue;
       }
-      if (my_token.type === "WHITESPACE") {
+      if (my_token.type === "WHITESPACE" || my_token.type === "COMMENT_LINE") {
         continue;
       }
       if (my_token.type === "CONTINUATION") {
@@ -28740,11 +29047,10 @@ class MixedLogicalOperatorAnalyzer {
     let my_in_continuation = false;
     for (let my_i = start_index + 1;my_i < the_tokens.length; my_i++) {
       const my_next_token = the_tokens[my_i];
-      if (my_next_token.type === "WHITESPACE") {
-        continue;
-      }
-      if (my_next_token.type === "CONTINUATION") {
-        my_in_continuation = true;
+      if (COMPOUND_LOGICAL_TRIVIA_TYPES.has(my_next_token.type)) {
+        if (my_next_token.type === "CONTINUATION") {
+          my_in_continuation = true;
+        }
         continue;
       }
       if (is_swallowed_continuation_terminator(my_next_token, my_in_continuation)) {
@@ -28787,21 +29093,27 @@ class MixedLogicalOperatorAnalyzer {
     }
   }
 }
-var import_node4, LOGICAL_OPS, QUALIFIER_BREAKERS, EXPRESSION_BREAKERS;
+var import_node4, LOGICAL_OPS, QUALIFIER_BREAKERS, EXPRESSION_BREAKERS, COMPOUND_LOGICAL_TRIVIA_TYPES;
 var init_mixed_logical_diagnostics = __esm(() => {
   init_types();
   init_diagnostic_code_description();
   init_diagnostic_severity();
   init_diagnostic_token_stream();
+  init_operator_sequence_diagnostics();
   import_node4 = __toESM(require_main4(), 1);
   LOGICAL_OPS = new Set(["&", "|"]);
   QUALIFIER_BREAKERS = new Set(["if", "in"]);
   EXPRESSION_BREAKERS = new Set([
     "STATEMENT_TERMINATOR",
-    "COMMENT_LINE",
     "LBRACE",
     "RBRACE"
   ]);
+  COMPOUND_LOGICAL_TRIVIA_TYPES = new Set([
+    "WHITESPACE",
+    "CONTINUATION",
+    "COMMENT_BLOCK",
+    "COMMENT_LINE"
+  ]);
 });
 
 // src/providers/chained-comparison-diagnostics.ts
@@ -31362,7 +31674,7 @@ function extract_command_name(text) {
     const text_before_colon = text.substring(0, colon_pos).trim();
     const text_after_colon = text.substring(colon_pos + 1).trim();
     const words_before = text_before_colon.split(/\s+/);
-    if (words_before.length >= 2 && ["by", "bysort"].includes(words_before[0].toLowerCase()) && text_after_colon.length > 0) {
+    if (words_before.length >= 2 && ["by", "bysort"].includes(words_before[0]) && text_after_colon.length > 0) {
       working_text = text_after_colon;
     }
   }
@@ -31371,8 +31683,7 @@ function extract_command_name(text) {
     if (my_word === ":") {
       continue;
     }
-    const lower_word = my_word.toLowerCase();
-    if (!PREFIX_COMMANDS2.includes(lower_word)) {
+    if (!PREFIX_COMMANDS2.includes(my_word)) {
       return my_word;
     }
   }
@@ -31426,40 +31737,52 @@ function detect_subcommand_context(text_before_cursor, command_db) {
     return null;
   }
   const trimmed = text_before_cursor.trim();
-  const the_words = trimmed.split(/\s+/).filter((w) => w.length > 0);
-  if (the_words.length === 0) {
+  const the_parts = trimmed.match(/:|[^\s:]+/g) ?? [];
+  if (the_parts.length === 0) {
     return null;
   }
-  const STANDARD_PREFIXES = ["by", "bysort", "quietly", "qui", "capture", "cap", "noisily", "noi"];
+  const STANDARD_PREFIXES = [
+    "by",
+    "bysort",
+    "quietly",
+    "qui",
+    "capture",
+    "cap",
+    "noisily",
+    "noi"
+  ];
+  const BY_PREFIXES = ["by", "bysort"];
   let command_index = 0;
-  while (command_index < the_words.length && STANDARD_PREFIXES.includes(the_words[command_index].toLowerCase())) {
+  while (command_index < the_parts.length && STANDARD_PREFIXES.includes(the_parts[command_index])) {
+    const my_prefix = the_parts[command_index];
     command_index++;
-  }
-  if (trimmed.includes(":")) {
-    const after_colon = trimmed.split(":").pop()?.trim() || "";
-    const words_after_colon = after_colon.split(/\s+/).filter((w) => w.length > 0);
-    if (words_after_colon.length > 0) {
-      const potential_prefix2 = words_after_colon[0].toLowerCase();
-      if (command_db && command_db.has_subcommands(potential_prefix2)) {
-        const words_after_prefix2 = words_after_colon.length - 1;
-        if (words_after_prefix2 === 0 && text_before_cursor.endsWith(" ")) {
-          return { type: "subcommand", prefix_command: potential_prefix2 };
-        }
-        if (words_after_prefix2 === 1 && !text_before_cursor.endsWith(" ")) {
-          return { type: "subcommand", prefix_command: potential_prefix2 };
-        }
+    if (BY_PREFIXES.includes(my_prefix)) {
+      const varlist_start = command_index;
+      while (command_index < the_parts.length && the_parts[command_index] !== ":") {
+        command_index++;
       }
+      if (command_index === varlist_start || command_index >= the_parts.length) {
+        return null;
+      }
+      command_index++;
+      continue;
+    }
+    if (the_parts[command_index] === ":") {
+      command_index++;
     }
-    return null;
   }
-  if (command_index >= the_words.length) {
+  if (command_index >= the_parts.length) {
     return null;
   }
-  const potential_prefix = the_words[command_index].toLowerCase();
+  const potential_prefix = the_parts[command_index].toLowerCase();
   if (!command_db || !command_db.has_subcommands(potential_prefix)) {
     return null;
   }
-  const words_after_prefix = the_words.length - command_index - 1;
+  const the_remaining_parts = the_parts.slice(command_index + 1);
+  if (the_remaining_parts.includes(":")) {
+    return null;
+  }
+  const words_after_prefix = the_remaining_parts.length;
   if (words_after_prefix === 0 && text_before_cursor.endsWith(" ")) {
     return { type: "subcommand", prefix_command: potential_prefix };
   }
@@ -31479,7 +31802,7 @@ function is_command_context(text_before_cursor) {
     const parts = trimmed.split(":");
     const before_colon = parts[0].trim();
     const after_colon = parts.slice(1).join(":").trim();
-    const first_word = before_colon.split(/\s+/)[0].toLowerCase();
+    const first_word = before_colon.split(/\s+/)[0];
     if (PREFIX_COMMANDS2.includes(first_word)) {
       if (after_colon === "" || !after_colon.includes(" ")) {
         return true;
@@ -31488,8 +31811,8 @@ function is_command_context(text_before_cursor) {
   }
   let all_prefixes = true;
   for (const my_word of the_words) {
-    const lower_word = my_word.toLowerCase().replace(/:$/, "");
-    if (!PREFIX_COMMANDS2.includes(lower_word)) {
+    const prefix_word = my_word.replace(/:$/, "");
+    if (!PREFIX_COMMANDS2.includes(prefix_word)) {
       all_prefixes = false;
       break;
     }
@@ -31498,9 +31821,9 @@ function is_command_context(text_before_cursor) {
     return true;
   }
   if (the_words.length === 1 && !text_before_cursor.endsWith(" ")) {
-    const lower_word = the_words[0].toLowerCase();
+    const prefix_fragment = the_words[0];
     for (const prefix of PREFIX_COMMANDS2) {
-      if (prefix.startsWith(lower_word)) {
+      if (prefix.startsWith(prefix_fragment)) {
         return true;
       }
     }
@@ -73489,4 +73812,4 @@ export {
   is_cli_entry_point
 };
 
-//# debugId=B7C3CCA891DAB36764756E2164756E21
+//# debugId=26F6D7391A01C62064756E2164756E21

package/dist/sight-server.js.sha256

@@ -1 +1 @@
-485a12b31b0af8576f9d9b0abe4d3ee35d6ce7a01780df284071c47cc3f08565  sight-server.js
+29571e2adbaf388e86c862f9563a283a28569601d9fe0563b3df58e8b12a6c37  sight-server.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbearak/sight",
-  "version": "0.14.1",
+  "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",