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

[mod] tidy

Browse source
This commit is contained in:
Andy Bunce 2025-10-30 10:42:59 +00:00
parent c4d2770bae
commit 30f913906d
4 changed files with 46 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
webapp/lsp/jsonrpc.xqm
View file

@ -70,7 +70,8 @@ declare
function rpc:send($msg as map(*)) function rpc:send($msg as map(*))
as empty-sequence() as empty-sequence()
{ {
rpc:admin-log($msg,"⬅️"),ws:send($msg ,ws:id()) rpc:admin-log($msg,"⬅️"),
ws:send($msg ,ws:id())
}; };
(:~ canned initialize response :) (:~ canned initialize response :)

11
webapp/lsp/position.xqm
View file

@ -84,3 +84,14 @@ declare function pos:full-range($text as xs:string)
as lspt:Range{ as lspt:Range{
lspt:Range(pos:toPosition($text,0), pos:toPosition($text, string-length($text))) lspt:Range(pos:toPosition($text,0), pos:toPosition($text, string-length($text)))
}; };
(:~ range for $text from indices:)
declare function pos:range-from-ast(
$text as xs:string,
$ast as element(*))
as lspt:Range{
lspt:Range(
pos:toPosition($text,number($ast/@start)),
pos:toPosition($text, number($ast/@end))
)
};

45
webapp/static/clients/codemirror/grail.html
View file

@ -1,5 +1,5 @@
<!doctype html> <!doctype html>
<html lang="en" class="quiet-cloak"> <html lang="en" class="quiet-cloak "> <!-- also quiet-dark -->
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
@ -8,8 +8,14 @@
<link rel="icon" type="image/png" href="../favicon.png" /> <link rel="icon" type="image/png" href="../favicon.png" />
<!-- Quiet theme + autoloader --> <!-- Quiet theme + autoloader -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@quietui/quiet-browser@1.4.0/dist/themes/quiet.css"> <!-- Default theme (if not already installed) -->
<script type="module" src="https://cdn.jsdelivr.net/npm/@quietui/quiet-browser@1.4.0/dist/quiet.loader.js"></script> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@quietui/quiet-browser@1.6.1/dist/themes/quiet.css">
<!-- Quiet Restyle
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@quietui/quiet-browser@1.6.1/dist/themes/restyle.css">
-->
<script type="module" src="https://cdn.jsdelivr.net/npm/@quietui/quiet-browser@1.6.1/dist/quiet.loader.js"></script>
<link rel="stylesheet" href="grail.css" /> <link rel="stylesheet" href="grail.css" />
@ -27,7 +33,7 @@
<quiet-icon slot="checked" name="network" family="outline"></quiet-icon> <quiet-icon slot="checked" name="network" family="outline"></quiet-icon>
</quiet-toggle-icon> </quiet-toggle-icon>
<quiet-button-group label="Links"> <quiet-toolbar label="Links">
<quiet-button href="#" variant="primary" aria-current="page" size="sm"> <quiet-button href="#" variant="primary" aria-current="page" size="sm">
Editor Editor
</quiet-button> </quiet-button>
@ -37,8 +43,8 @@
<quiet-button href="/dba/logs" target="dba" rel="noreferrer noopener" size="sm"> <quiet-button href="/dba/logs" target="dba" rel="noreferrer noopener" size="sm">
Dba Dba
</quiet-button> </quiet-button>
</quiet-button-group> </quiet-toolbar>
<select id="load"> <quiet-select id="load" style="width:20em;">
<option selected value="">load..</option> <option selected value="">load..</option>
<optgroup label="XQuery3"> <optgroup label="XQuery3">
<option <option
@ -61,7 +67,7 @@
value="https://raw.githubusercontent.com/dnovatchev/Articles/refs/heads/main/Generators/Code/generator.xq"> value="https://raw.githubusercontent.com/dnovatchev/Articles/refs/heads/main/Generators/Code/generator.xq">
generator.xquery</option> generator.xquery</option>
</optgroup> </optgroup>
</select> </quiet-select>
<button popovertarget="popAbout" type="button"> <button popovertarget="popAbout" type="button">
<i class="codicon codicon-info"></i> <i class="codicon codicon-info"></i>
@ -71,12 +77,7 @@
<main class="page-main" style="overflow: auto;"> <main class="page-main" style="overflow: auto;">
<quiet-toolbar> <quiet-toolbar>
<quiet-button-group>
<label for="file">File:</label>
<input id="iFile" type="url" value="file:///some/file.xqm" />
<label for="symbols">Symbols:</label><select id="symbols" disabled="disabled"></select>
</quiet-button-group>
<quiet-button-group> <quiet-button-group>
<button id="search" title="Search" type="button" class="btn btn-light"><i <button id="search" title="Search" type="button" class="btn btn-light"><i
@ -155,25 +156,31 @@
</aside> </aside>
<footer class="page-footer"> <footer class="page-footer">
<div style="display:flex;">
<select id="language"> <select id="language" style="width:10em;display:inline-block;">
<option selected>Language</option> <option selected>Language</option>
<option value="plaintext">plaintext</option> <option value="plaintext">plaintext</option>
<option value="xquery">xquery</option> <option value="xquery">xquery</option>
<option value="xml">xml</option> <option value="xml">xml</option>
</select> </select>
<div>
<label for="iFile">File:</label>
<input id="iFile" type="url" value="file:///some/file.xqm" style="width:10em;display:inline-block;" />
<label for="symbols">Symbols:</label>
<select id="symbols" disabled="disabled" style="width:10em;display:inline-block;"></select>
</div>
</div>
<quiet-relative-time live id="relative-time__live" style="width:10em;"></quiet-relative-time> <quiet-relative-time live id="relative-time__live" style="width:10em;"></quiet-relative-time>
<quiet-dropdown id="dropdown__checkboxes"> <quiet-dropdown id="dropdown__checkboxes">
<quiet-button slot="trigger"><i class='codicon codicon-kebab-vertical'></i></quiet-button> <quiet-button slot="trigger"><i class='codicon codicon-kebab-vertical'></i></quiet-button>
<quiet-dropdown-item type="checkbox" value="canvas" checked>Follow cursor</quiet-dropdown-item> <quiet-dropdown-item type="checkbox" value="canvas" checked>Follow cursor</quiet-dropdown-item>
<quiet-divider></quiet-divider> <quiet-divider></quiet-divider>
<quiet-radio orientation="vertical" name="sortBy"> <quiet-dropdown-item type="checkbox" value="position" checked>sort by: Position</quiet-dropdown-item>
<quiet-radio-item value="position">sort by: position</quiet-radio-item> <quiet-dropdown-item type="checkbox" value="name">sort by: Name</quiet-dropdown-item>
<quiet-radio-item value="name">sort by: name</quiet-radio-item> <quiet-dropdown-item type="checkbox" value="category">sort by: Category</quiet-dropdown-item>
<quiet-radio-item value="category">sort by: category</quiet-radio-item>
</quiet-radio>
</quiet-dropdown> </quiet-dropdown>

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

@ -151,7 +151,7 @@ function connect() {
const file = $("iFile").value; const file = $("iFile").value;
lsp.simpleWebSocketTransport(server) lsp.simpleWebSocketTransport(server)
.then(transport => { .then(transport => {
transport.socket.onclose = (event) => connectStatus(false); transport.socket.onclose = (event) => $("tConnect").checked=false;
transport.socket.oneror = (event) => $("msg").innerText = "sock error!"; transport.socket.oneror = (event) => $("msg").innerText = "sock error!";
transport.subscribe(incoming); transport.subscribe(incoming);
client = new lsp.LSPClient({ extensions: lsp.languageServerExtensions() }); client = new lsp.LSPClient({ extensions: lsp.languageServerExtensions() });
@ -169,7 +169,6 @@ function connect() {
.catch(e => { .catch(e => {
console.log(e); console.log(e);
$("tConnect").checked=false; $("tConnect").checked=false;
connectStatus(false);
alert("connection failed: " + server) alert("connection failed: " + server)
}); });