quodatum/basex-lsp
1
0
Fork 0
Code Issues 7 Activity Actions

[fix] server diags

Browse source
This commit is contained in:
Andy Bunce 2025-08-28 16:44:48 +01:00
parent 776d5013d0
commit 18f3f309c7
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/lsp/lsp-diags.xqm
View file

@ -52,7 +52,7 @@ declare function lsp-diags:parse-error($text as xs:string, $xml as element(ERROR
as map(*)*{ as map(*)*{
if(string-length($text) gt 0) if(string-length($text) gt 0)
then let $last:= string-length($text) then let $last:= string-length($text)-1
let $dmesg:=$xml/string()=>trace("parse-error") let $dmesg:=$xml/string()=>trace("parse-error")
let $dmesg:=translate($dmesg,"
",";") let $dmesg:=translate($dmesg,"
",";")
let $b:=number($xml/@b)-1 let $b:=number($xml/@b)-1
@ -60,7 +60,7 @@ as map(*)*{
return ( return (
(: mark error :) (: mark error :)
lsp-diags:nostic(pos:Range(pos:toPosition($text, $b), lsp-diags:nostic(pos:Range(pos:toPosition($text, $b),
pos:toPosition($text, min(($e,$last)))), pos:toPosition($text, $e)),
1, 1,
$dmesg,'XPST0003'), $dmesg,'XPST0003'),

21
webapp/static/clients/codemirror/script.js
View file

@ -64,13 +64,20 @@ function connect() {
.then(transport => { .then(transport => {
transport.socket.onclose = (event) => connectStatus(false); transport.socket.onclose = (event) => connectStatus(false);
transport.socket.oneror = (event) => $("msg").innerText = "sock error!"; transport.socket.oneror = (event) => $("msg").innerText = "sock error!";
transport.subscribe(incoming);
client = new lsp.LSPClient({extensions: lsp.languageServerExtensions()}); client = new lsp.LSPClient({extensions: lsp.languageServerExtensions()});
client.connect(transport); client.connect(transport);
$("popConnect").hidePopover(); $("popConnect").hidePopover();
connectStatus(true); connectStatus(true);
let extLsp =client.plugin( file, "xquery"); let extLsp =client.plugin( file, "xquery");
view.dispatch({ effects: lsp.StateEffect.appendConfig.of(extLsp) }) let up=lsp.debouncedChangeListener({
delay: 750,
onChange: (content, state) => {
console.log('Debounced change detected:'+content);
client.sync();
}})
view.dispatch({ effects: lsp.StateEffect.appendConfig.of([...extLsp,up]) })
}) })
.catch(r => { connectStatus(false); alert("connection failed: " + server) }); .catch(r => { connectStatus(false); alert("connection failed: " + server) });
@ -86,12 +93,20 @@ function connectStatus(bool) {
} }
}; };
function incoming(msg) {
const rpc = JSON.parse(msg);
log(rpc);
};
function log(rpc) { function log(rpc) {
console.log("<-",rpc)
if (rpc.id) return if (rpc.id) return
const text = rpc.method; const text = rpc.method;
const li = document.createElement("li"); const li = document.createElement("li");
li.appendChild(document.createTextNode(text)); const n=$("traffic").childElementCount + " ";
li.appendChild(document.createTextNode(n + text));
$("traffic").insertBefore(li, $("traffic").firstChild) $("traffic").insertBefore(li, $("traffic").firstChild)
}; };