Fix wrong line number for first column errors

Also add --query to eval a query and @path to read a file in tests

Author: wader

lsp/lsp.go

@@ -64,6 +64,8 @@ func queryErrorPosition(v error) int {
 }
 
 func Run(env Env) error {
+	query := ""
+
 	if len(env.Args) >= 2 && env.Args[1] == "--version" {
 		fmt.Fprintf(env.Stdout, "%s\n", env.Version)
 		return nil
@@ -72,10 +74,13 @@ func Run(env Env) error {
 jq-lsp - jq language server
 For details see https://github.com/wader/jq-lsp
 Usage: %s [OPTIONS]
---help     Show help
---version  Show version
+--help         Show help
+--version      Show version
+--query QUERY  Eval query
 `[1:], env.Args[0])
 		return nil
+	} else if len(env.Args) >= 3 && env.Args[1] == "--query" {
+		query = env.Args[2]
 	}
 
 	i := &interp{
@@ -88,7 +93,12 @@ Usage: %s [OPTIONS]
 	// https://github.com/itchyny/gojq/issues/86 has been resolved
 	// TODO: could probably reuse *gojq.Code instance
 	for {
-		iter, err := i.Eval("serve", state)
+		s := "serve"
+		if query != "" {
+			s = query
+		}
+
+		iter, err := i.Eval(s, state)
 		if err != nil {
 			return err
 		}
@@ -112,9 +122,19 @@ Usage: %s [OPTIONS]
 			case [2]interface{}:
 				fmt.Fprintln(env.Stderr, v[:]...)
 			default:
-				state = v
+				if query != "" {
+					jd := json.NewEncoder(env.Stdout)
+					jd.SetIndent("", "  ")
+					jd.Encode(v)
+				} else {
+					state = v
+				}
 			}
 		}
+
+		if query != "" {
+			return nil
+		}
 	}
 }
 

lsp/lsp.jq

@@ -9,12 +9,11 @@ def _cond(cond; f):
   end;
 
 def debug(f):
-  _cond(
-    env.DEBUG != null;
-    ( (["DEBUG", (. | f)] | tojson)
+  ( ( (["DEBUG", (. | f)] | tojson)
     , "\n"
     | stderr
     )
+  , .
   );
 def debug: debug(.);
 
@@ -76,7 +75,7 @@ def byte_pos_to_lc($pos):
   | . as $lens
   | [ {i: 0, p: $pos}
     | while(
-        .p > 0;
+        .p >= 0;
         ( .p -= $lens[.i]
         | .i += 1
         )
@@ -798,13 +797,13 @@ def handle($state):
 def serve:
   ( . as $state
   | jsonrpc_read as $request
-  | debug({$request})
+  #| debug({$request})
   | $request
   | try handle($state)
     catch
       if (type != "object" or .response or .state | not) then error end
   | ( .response[]?
-    | debug({response: .})
+    #| debug({response: .})
     | jsonrpc_write
     )
   , .state // $state

lsp/lsp_test.go

@@ -17,6 +17,35 @@ import (
 
 var update = flag.Bool("update", false, "Update tests")
 
+// replace "@path" with content of file
+func replaceTextFile(t *testing.T, v any, readFile func(s string) ([]byte, error)) any {
+	switch v := v.(type) {
+	case []any:
+		a := make([]any, len(v))
+		for i, ve := range v {
+			a[i] = replaceTextFile(t, ve, readFile)
+		}
+		return a
+	case map[string]any:
+		a := make(map[string]any, len(v))
+		for k, ve := range v {
+			a[k] = replaceTextFile(t, ve, readFile)
+		}
+		return a
+	case string:
+		if _, path, found := strings.Cut(v, "@"); found {
+			if b, err := readFile(path); err == nil {
+				return string(b)
+			} else {
+				t.Fatal(err)
+			}
+		}
+		return v
+	default:
+		return v
+	}
+}
+
 func TestLSP(t *testing.T) {
 	difftest.TestWithOptions(t, difftest.Options{
 		Path:        "testdata",
@@ -53,7 +82,8 @@ func TestLSP(t *testing.T) {
 
 			stdinBuf := &bytes.Buffer{}
 			for _, r := range requests {
-				reqB, err := json.Marshal(&r.Request)
+				rr := replaceTextFile(t, r.Request, readFile)
+				reqB, err := json.Marshal(&rr)
 				if err != nil {
 					t.Fatal(err)
 				}

lsp/testdata/did_change_not_found.json

@@ -32,7 +32,7 @@
             "params": {
                 "contentChanges": [
                     {
-                        "text": "def fn: abc;"
+                        "text": "@not_found.jq"
                     }
                 ],
                 "textDocument": {

lsp/testdata/did_change_syntax_error.json

@@ -32,7 +32,7 @@
             "params": {
                 "contentChanges": [
                     {
-                        "text": "def fn 123;"
+                        "text": "@syntax_error.jq"
                     }
                 ],
                 "textDocument": {

lsp/testdata/did_change_valid.json

@@ -32,7 +32,7 @@
             "params": {
                 "contentChanges": [
                     {
-                        "text": "def fn: 123;"
+                        "text": "@valid.jq"
                     }
                 ],
                 "textDocument": {

lsp/testdata/did_open_not_found.json

@@ -32,7 +32,7 @@
             "params": {
                 "textDocument": {
                     "languageId": "plaintext",
-                    "text": "def fn: abc;",
+                    "text": "@not_found.jq",
                     "uri": "file:///not_found.jq",
                     "version": 1
                 }

lsp/testdata/did_open_syntax_error.json

@@ -32,7 +32,7 @@
             "params": {
                 "textDocument": {
                     "languageId": "plaintext",
-                    "text": "def fn 123;",
+                    "text": "@syntax_error.jq",
                     "uri": "file:///syntax_error.jq",
                     "version": 1
                 }

lsp/testdata/did_open_valid.json

@@ -32,7 +32,7 @@
             "params": {
                 "textDocument": {
                     "languageId": "plaintext",
-                    "text": "def fn: 123;",
+                    "text": "@valid.jq",
                     "uri": "file:///valid.jq",
                     "version": 1
                 }

lsp/testdata/first_column_error_lc.jq

@@ -0,0 +1,2 @@
+
+aaa