types and add cte comment handling

Author: Light2Dark

demo/index.ts

@@ -1,5 +1,5 @@
 import { acceptCompletion } from "@codemirror/autocomplete";
-import { keywordCompletionSource, PostgreSQL, sql } from "@codemirror/lang-sql";
+import { PostgreSQL, sql } from "@codemirror/lang-sql";
 import type { EditorState } from "@codemirror/state";
 import { keymap } from "@codemirror/view";
 import { basicSetup, EditorView } from "codemirror";

src/sql/__tests__/diagnostics.test.ts

@@ -2,7 +2,7 @@ import { Text } from "@codemirror/state";
 import type { EditorView } from "@codemirror/view";
 import { describe, expect, it, vi } from "vitest";
 import { sqlLinter } from "../diagnostics.js";
-import type { SqlParser } from "../parser.js";
+import type { SqlParser } from "../types.js";
 
 // Mock EditorView
 const _createMockView = (content: string) => {

src/sql/__tests__/gutter-diagnostics-integration.test.ts

@@ -1,5 +1,4 @@
 import { EditorState, Text } from "@codemirror/state";
-import { EditorView } from "@codemirror/view";
 import { beforeEach, describe, expect, it } from "vitest";
 import { sqlLinter } from "../diagnostics.js";
 import { NodeSqlParser } from "../parser.js";

src/sql/__tests__/parser/error-positioning.test.ts

@@ -19,10 +19,67 @@ export interface SqlLinterConfig {
 /**
  * Converts a SQL parse error to a CodeMirror diagnostic
  */
-function convertToCodeMirrorDiagnostic(error: SqlParseError, doc: Text): Diagnostic {
-  const lineStart = doc.line(error.line).from;
+export function convertToCodeMirrorDiagnostic(error: SqlParseError, doc: Text): Diagnostic {
+  const line = doc.line(error.line);
+  const lineStart = line.from;
+
+  // Calculate the start position of the error
   const from = lineStart + Math.max(0, error.column - 1);
-  const to = from + 1;
+
+  // For column errors, try to span the entire column name
+  let to = from + 1; // Default to single character
+
+  // If this is a column error, try to find the column name length
+  if (error.message.includes("Column") && error.message.includes("does not exist")) {
+    // Extract column name from error message
+    const columnMatch = error.message.match(/Column '([^']+)' does not exist/);
+    if (columnMatch?.[1]) {
+      const columnName = columnMatch[1];
+      // Find the column name in the line text starting from the error column
+      const lineText = line.text;
+      const startSearchPos = Math.max(0, error.column - 1);
+      const columnIndex = lineText.indexOf(columnName, startSearchPos);
+      if (columnIndex !== -1) {
+        to = lineStart + columnIndex + columnName.length;
+      } else {
+        // If not found from the error column, try to find it anywhere in the line
+        const globalIndex = lineText.indexOf(columnName);
+        if (globalIndex !== -1) {
+          to = lineStart + globalIndex + columnName.length;
+        }
+      }
+    }
+  }
+
+  // Handle the case where the error is reported on a comment line but should be on the SQL line
+  // This happens when the parser reports the wrong line number due to comments
+  if (line.text.trim().startsWith("--")) {
+    // Find the next non-comment line that contains SQL
+    for (let i = error.line; i < doc.lines; i++) {
+      const nextLine = doc.line(i + 1);
+      const nextLineText = nextLine.text.trim();
+      if (nextLineText && !nextLineText.startsWith("--")) {
+        // Found a non-comment line, check if it contains the error
+        if (error.message.includes("Column") && error.message.includes("does not exist")) {
+          const columnMatch = error.message.match(/Column '([^']+)' does not exist/);
+          if (columnMatch?.[1]) {
+            const columnName = columnMatch[1];
+            const columnIndex = nextLineText.indexOf(columnName);
+            if (columnIndex !== -1) {
+              return {
+                from: nextLine.from + columnIndex,
+                to: nextLine.from + columnIndex + columnName.length,
+                severity: error.severity,
+                message: error.message,
+                source: "sql-parser",
+              };
+            }
+          }
+        }
+        break;
+      }
+    }
+  }
 
   return {
     from,

src/sql/diagnostics.ts

@@ -7,7 +7,8 @@ import {
   type ResolvedNamespaceItem,
   resolveNamespaceItem,
 } from "./namespace-utils.js";
-import { NodeSqlParser, type QueryContext } from "./parser.js";
+import type { QueryContext } from "./parser/types.js";
+import { NodeSqlParser } from "./parser.js";
 
 /**
  * SQL schema information for hover tooltips
@@ -87,8 +88,6 @@ export interface SqlHoverConfig {
     table?: (data: NamespaceTooltipData) => string;
     /** Custom renderer for column items */
     column?: (data: NamespaceTooltipData) => string;
-    /** Custom renderer for non-existent columns */
-    nonExistentColumn?: (data: NonExistentColumnData) => string;
   };
 }
 
@@ -308,27 +307,6 @@ function createColumnTooltipWithContext(params: {
   console.log("Hover debug - primaryTable:", primaryTable);
   console.log("Hover debug - resolvedSchema:", resolvedSchema);
 
-  // Create a parser instance to use its schema validation methods
-  const parser = new NodeSqlParser();
-
-  // Check if column exists in current table
-  const columnExistsInCurrentTable =
-    primaryTable && parser.columnExists(resolvedSchema, primaryTable, word);
-
-  console.log("Hover debug - columnExistsInCurrentTable:", columnExistsInCurrentTable);
-
-  if (!columnExistsInCurrentTable) {
-    // Column doesn't exist in current table - show error
-    const nonExistentData: NonExistentColumnData = {
-      columnName: word,
-      currentTable: primaryTable,
-    };
-
-    return tooltipRenderers?.nonExistentColumn
-      ? tooltipRenderers.nonExistentColumn(nonExistentData)
-      : createNonExistentColumnTooltip(nonExistentData);
-  }
-
   // Column exists in current table - use normal column renderer
   return tooltipRenderers?.column
     ? tooltipRenderers.column(namespaceData)
@@ -360,25 +338,6 @@ function createGenericNamespaceTooltip(params: {
   return createNamespaceTooltip(namespaceData.item);
 }
 
-/**
- * Creates HTML content for non-existent columns
- */
-function createNonExistentColumnTooltip(data: NonExistentColumnData): string {
-  const { columnName, currentTable } = data;
-
-  let html = `<div class="sql-hover-column-error">`;
-  html += `<div class="sql-hover-header"><strong>${columnName}</strong> <span class="sql-hover-type">column</span></div>`;
-  html += `<div class="sql-hover-description">❌ Column not found`;
-  if (currentTable) {
-    html += ` in table <code>${currentTable}</code>`;
-  }
-  html += `</div>`;
-  html += `<div class="sql-hover-suggestion">Check column name spelling or verify table schema</div>`;
-  html += `</div>`;
-
-  return html;
-}
-
 /**
  * Creates HTML content for namespace-resolved items
  */