[mod]

compose.yaml

@@ -18,7 +18,7 @@ services:
 #      - ./jars:/srv/basex/lib/custom
 #      - ./repo:/srv/basex/repo
     environment:
-      - "SERVER_OPTS= -d"
+      - "SERVER_OPTS= "
 
 volumes:
     basex-lsp: 

package.json

@@ -24,6 +24,7 @@
     "build-cm": "rollup bundles/src/lsp.js -m true -f iife -o webapp/static/clients/codemirror/lsp.bundle.js -p node-resolve,tla --output.name lsp",
     "min-cm": "cd webapp/static/clients/codemirror && npx minify lsp.bundle.js > lsp.bundle.min.js ",
     "min": "cd dist && npx minify cm6.bundle.js > cm6.bundle.min.js && npx minify lsp.bundle.js > lsp.bundle.min.js",
+    
     "javac":"cd bundles/grammar && javac -cp %BASEX12%\\BaseX.jar -d build xq4.java && cd build && jar cf ../xq4.jar . "
   }
 }

webapp/lsp/jsonrpc.xqm

@@ -82,3 +82,14 @@ as map(*)
      "params":{"type":1, "message": $msg}
     }
 };
+
+(:~ rpc response to $json msg :)
+declare function rpc:response($result,$json  as map(*))
+as map(*)
+{
+map{
+    "jsonrpc": "2.0",
+    "id": $json?id,
+    "result": $result
+}
+};

webapp/lsp/lsp-diags.xqm

@@ -33,7 +33,7 @@ declare function lsp-diags:publish(
 as map(*){
  let $diagnostics:=if($xml/self::ERROR)
                    then array{lsp-diags:parse-error($text, $xml)}
-                   else array{lsp-diags:parse-xquery($text,$xml)}
+                   else array{ lsp-diags:parse-xquery($text,$xml)}
 
  return {"jsonrpc": "2.0",
      "method":"textDocument/publishDiagnostics",
@@ -55,21 +55,22 @@ lsp-diags:nostic(pos:Range(pos:toPosition($text, $xml/@b),
 lsp-diags:nostic(pos:Range(pos:toPosition($text, $xml/@e +1 ), 
                           pos:toPosition($text, string-length($text)-1)),
                  $lsp-diags:severities('warning'),
-                 "Previous parse error")
+                 "Unparsed due to previous parser error.")
 };
 
 (: test data :)
 declare function lsp-diags:parse-xquery($text as xs:string, $xml as element(Module))
 as map(*)*{
- lsp-diags:nostic(pos:Range(pos:Position(0,0),  pos:Position(0, 5)),
-                $lsp-diags:severities('error'),"111"),
+(:  lsp-diags:nostic(pos:Range(pos:Position(0,0),  pos:Position(0, 5)),
+                $lsp-diags:severities('error'),"error"),
 
 lsp-diags:nostic(pos:Range(pos:Position(1,0),  pos:Position(1,5)),
-               $lsp-diags:severities('warning'),"2222"),
+               $lsp-diags:severities('warning'),"warning"),
 
 lsp-diags:nostic(pos:Range(pos:Position(2,0),  pos:Position(2, 5)),
-               $lsp-diags:severities('info'),"333"),
+               $lsp-diags:severities('info'),"info"),
+
+lsp-diags:nostic(pos:Range(pos:Position(3,0),  pos:Position(3, 6)),
+               $lsp-diags:severities('hint'), "hint") :)
 
-lsp-diags:nostic(pos:Range(pos:Position(3,0),  pos:Position(3, 12)),
-               $lsp-diags:severities('hint'), "44")
 };

webapp/lsp/lsp-text.xqm

@@ -2,8 +2,10 @@
  : @author andy bunce
  :)
 module namespace lsp-text = 'lsp-text';
+
 import module namespace docs="lsp/docs" at "docs.xqm";
 import module namespace rpc = 'rpc' at 'jsonrpc.xqm';
+import module namespace pos="lsp/position" at "position.xqm";
 
 declare variable $lsp-text:methods:=map{
   "textDocument/didOpen": lsp-text:didOpen#1,
@@ -21,24 +23,21 @@ declare
 function lsp-text:hover($json as map(*)) 
 as map(*)
 {
- map{
-    "jsonrpc": "2.0",
-    "id": $json?id,
-    "result":{
-  "contents": [
+
+  let $r:= [
 `markdown here, this is **bold**.
 
 A [link](http://google.com)
 
 The last line.`
     ,
-     `A hover at \\n\\n{ json:serialize($json?params?position) } 
+`A hover at { pos:ln-col($json?params?position) } 
 uri: {$json?params?textDocument?uri} `
     ]
-}
-  }
+return rpc:response($r,$json)
 };
 
+
 declare
 function lsp-text:completion($json as map(*)) 
 as map(*)?

webapp/lsp/position.xqm

@@ -23,12 +23,14 @@ declare record pos:Range(
 	end as pos:Position
 );
 
+(:~ update $text with changes $chs from didChange 
+:)
 declare function pos:apply-changes($text as xs:string, $chs as array(*))
 as xs:string{
 array:fold-left($chs,$text,pos:apply-change#2)
 }; 
 
-(:~ text updated with $ch changes from didChange :)
+(:~ text updated single change :)
 declare function pos:apply-change($text as xs:string, $ch as map(*))
 as xs:string{
  if(exists($ch?range))
@@ -84,3 +86,7 @@ as xs:integer
           )
            return $s?max
 };
+
+declare function pos:ln-col($pos as pos:Position){
+  `Ln { $pos?line}, Col { $pos?character}`
+}; 

webapp/static/clients/codemirror/script.js

@@ -77,7 +77,7 @@ function connect() {
 
 function incoming(msg) {
     const rpc=JSON.parse(msg);
-    log(rpc.method);
+    log(rpc);
     switch (rpc.method) {
         case "textDocument/publishDiagnostics":
             diags(rpc.params);
@@ -88,10 +88,13 @@ function incoming(msg) {
     }
     
 };
-function log(msg){
+
+function log(rpc){
+    if(rpc.id) return
+    const text=rpc.method;
     const li = document.createElement("li");
     
-    li.appendChild(document.createTextNode(msg));
+    li.appendChild(document.createTextNode(text));
     const ol=document.getElementById("msg");
     ol.insertBefore(li,ol.firstChild)
 };