diff --git a/package-lock.json b/package-lock.json index 06b1131..fdddabe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,6 @@ "@codemirror/search": "^6.5.11", "@codemirror/theme-one-dark": "^6.1.3", "@codemirror/view": "^6.38.6", - "@quietui/quiet-browser": "^1.6.1", "@replit/codemirror-minimap": "^0.5.2", "@zenfs/core": "^2.4.2", "@zenfs/dom": "^1.2.5", @@ -697,16 +696,6 @@ "integrity": "sha512-0FCeqG6WvK4/Cc06F/xXMd/pv4FeisI0c1tUpBbfhA2n9Y8eZEv4Karjbmf2ZqQCPUWMrGp8A571tCjizxoTiQ==", "license": "Apache-2.0" }, - "node_modules/@quietui/quiet-browser": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@quietui/quiet-browser/-/quiet-browser-1.6.1.tgz", - "integrity": "sha512-t398SI83bVmIuM6rQZTfQkMop8lMGdPmcSPhd6AUg2tpBVorQXUNTTQnFotevAHKU5kXch9amTKNnW44GBcUaw==", - "license": "MIT", - "funding": { - "type": "individual", - "url": "https://github.com/sponsors/quietui" - } - }, "node_modules/@replit/codemirror-minimap": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/@replit/codemirror-minimap/-/codemirror-minimap-0.5.2.tgz", @@ -1115,9 +1104,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "24.9.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.2.tgz", - "integrity": "sha512-uWN8YqxXxqFMX2RqGOrumsKeti4LlmIMIyV0lgut4jx7KQBcBiW6vkDtIBvHnHIquwNfJhk8v2OtmO8zXWHfPA==", + "version": "24.9.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.1.tgz", + "integrity": "sha512-QoiaXANRkSXK6p0Duvt56W208du4P9Uye9hWLWgGMDTEoKPhuenzNcC4vGUmrNkiOKTlIrBoyNQYNpSwfEZXSg==", "license": "MIT", "dependencies": { "undici-types": "~7.16.0" @@ -1560,9 +1549,9 @@ "license": "MIT" }, "node_modules/kerium": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/kerium/-/kerium-1.3.8.tgz", - "integrity": "sha512-tOtOOsTZ85Wt4h8TwV4ItgTi6paj2U1buOC/v9Rdon0ndtqASm5fn/rBRfEsif1czW4+u73T7XPbQAIBUF4tzg==", + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/kerium/-/kerium-1.3.7.tgz", + "integrity": "sha512-3pFGohBrDeGkxBvRJ1FKrkN6HpiLAvHRZ4rk5zZUExzslgDZm/iijDRKXTHHJpyHQaBlOFxVnpqYp76u5qmQSg==", "license": "MIT", "dependencies": { "utilium": "^2.0.0" @@ -1633,9 +1622,9 @@ } }, "node_modules/memium": { - "version": "0.3.11", - "resolved": "https://registry.npmjs.org/memium/-/memium-0.3.11.tgz", - "integrity": "sha512-CwmIpLVSG7UToDj2sYAZFDkpco30OPsXpaCnt+7Z7JQaulCjH5UvwJIctTIHmgQdFqk8pliBsPLnH5OZcDLZyQ==", + "version": "0.3.10", + "resolved": "https://registry.npmjs.org/memium/-/memium-0.3.10.tgz", + "integrity": "sha512-7LdicWe1tGBLrstNXdcH1Wh2iiAC4u8eU/iGuBvoVAkG20qU2d8bQk3/y40FIrM6mk5N+hpiqFI7PmOlR1hNOg==", "license": "LGPL-3.0-or-later", "dependencies": { "kerium": "^1.3.2", @@ -2058,9 +2047,9 @@ "license": "MIT" }, "node_modules/utilium": { - "version": "2.5.8", - "resolved": "https://registry.npmjs.org/utilium/-/utilium-2.5.8.tgz", - "integrity": "sha512-RNXAYoYH7hefayCW/2LU3SYCwDGQlDc8f4gPCRbMO6dJsYGGlzAhyHqYQGp73ox41JtPKjdqzddAbDhWQ9MrXQ==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/utilium/-/utilium-2.5.7.tgz", + "integrity": "sha512-8F/HW+6g4v6k3yYR1bhSG+OVnoxjbuZeelLa4IyyNdwFaqGj8HpxKdOQf07xmB2jWIuUs1sq2wXcsqiERRWvEA==", "license": "LGPL-3.0-or-later", "dependencies": { "eventemitter3": "^5.0.1" diff --git a/package.json b/package.json index 3e6b727..6de37d8 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,6 @@ "@codemirror/search": "^6.5.11", "@codemirror/theme-one-dark": "^6.1.3", "@codemirror/view": "^6.38.6", - "@quietui/quiet-browser": "^1.6.1", "@replit/codemirror-minimap": "^0.5.2", "@zenfs/core": "^2.4.2", "@zenfs/dom": "^1.2.5", diff --git a/test/ast.xq b/test/ast.xq index 35035d0..2a27a27 100644 --- a/test/ast.xq +++ b/test/ast.xq @@ -3,18 +3,18 @@ import module namespace ast="lsp/ast" at "../webapp/lsp/ast/ast.xqm"; (: declare variable $file:="sample.docs/pdfbox.xqm"; :) declare variable $file:="sample.docs/simple.xq"; -declare variable $A:="sample.docs/pdfbox.xqm"; +declare variable $A:=doc("sample.docs/parse-pdfbox.xml"); -unparsed-text($A) +unparsed-text($file) -=>ast:build({"flatten":true(),"position":true()}) +=>ast:build() -(: update{ +update{ for $e in descendant-or-self::element() let $len:=string-length($e) let $before:=$e/preceding-sibling::node()/string-length()=>sum() return (insert node attribute len { $len } into $e, insert node attribute before { $before } into $e ) -} :) +} diff --git a/test/symbols.xq b/test/symbols.xq index ccaa79d..d82ffde 100644 --- a/test/symbols.xq +++ b/test/symbols.xq @@ -4,4 +4,3 @@ declare variable $parse:=doc($src)/*; syms:list($parse,string($parse )) - diff --git a/webapp/static/clients/codemirror/grail.css b/webapp/static/clients/codemirror/grail.css index c60d9f3..34ec940 100644 --- a/webapp/static/clients/codemirror/grail.css +++ b/webapp/static/clients/codemirror/grail.css @@ -4,7 +4,6 @@ color-scheme: light dark; --quiet-primary-seed: #e98d61; --quiet-content-spacing: 0.75rem; - --quiet-form-control-height-md:0.9rem; } * { @@ -30,7 +29,7 @@ form header { .page-wrap { background: white; height: calc(100vh - 10px); - + box-shadow: 0 0 3px rgba(black, 0.33); display: grid; grid-template-columns: minmax(10px, 1fr) minmax(10px, 4fr); @@ -98,7 +97,6 @@ form header { grid-column: 1 / -1; display: flex; justify-content: space-between; - background: #ffecb3; } .page-sidebar { diff --git a/webapp/static/clients/codemirror/grail.html b/webapp/static/clients/codemirror/grail.html index 199c393..6527a65 100644 --- a/webapp/static/clients/codemirror/grail.html +++ b/webapp/static/clients/codemirror/grail.html @@ -33,52 +33,41 @@ - - - New + + + Editor - - - Open + + LSP Manager - - - Web + + Dba - URL + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - LSP Manager - - - Dba - + + + + + - - - - - - - + + + - - - @@ -204,28 +199,9 @@ - -
- - - - - - - - Fetch - Cancel - -
- - - - -
Connect to LSP diff --git a/webapp/static/clients/codemirror/script.js b/webapp/static/clients/codemirror/script.js index feaf037..823a7ae 100644 --- a/webapp/static/clients/codemirror/script.js +++ b/webapp/static/clients/codemirror/script.js @@ -39,13 +39,9 @@ window.addEventListener('beforeunload', () => { $("connect").onclick = e => { e.preventDefault(); connect() }; -$("symTrigger").onclick = e => { e.preventDefault(); }; -$("symOptions").onclick = e => { e.preventDefault(); }; -$("bnNew").onclick = e => { - let name = prompt("New file name?"); - if (name === null) return; - alert("TODO") -}; +$("symTrigger").onclick = e => { e.preventDefault(); }; +$("symOptions").onclick = e => { e.preventDefault(); }; +$("bnNew").onclick = e => { alert("TODO"); }; $("search").onclick = e => lsp.openSearchPanel(view); @@ -80,13 +76,13 @@ $("cmdList").onclick = e => { }; $("symList").addEventListener("itemSelected", e => { - const plugin = lsp.LSPPlugin.get(view) - if (!plugin) return; + const plugin=lsp.LSPPlugin.get(view) + if(!plugin) return; const sel = e.detail.range // or selectionRange; console.log("SYM selection range", sel); const an = plugin.fromPosition(sel.start) const hd = plugin.fromPosition(sel.end) - view.dispatch({ selection: { anchor: an, head: hd }, scrollIntoView: true }); + view.dispatch({ selection: { anchor: an, head: hd}, scrollIntoView: true }); }); $("lint").onclick = async e => { @@ -133,7 +129,7 @@ $("load").onchange = e => { $("tConnect").addEventListener('quiet-change', e => { e.preventDefault(); $("popConnect").showPopover() -}); + }); $("msgIcon").onclick = e => { e.preventDefault(); alert("NOT YET") @@ -162,13 +158,13 @@ function connect() { const file = $("iFile").value; lsp.simpleWebSocketTransport(server) .then(transport => { - transport.socket.onclose = (event) => $("tConnect").checked = false; + transport.socket.onclose = (event) => $("tConnect").checked=false; transport.socket.oneror = (event) => $("msg").innerText = "sock error!"; transport.subscribe(incoming); client = new lsp.LSPClient({ extensions: lsp.languageServerExtensions() }); client.connect(transport); $("popConnect").hidePopover(); - $("tConnect").checked = true; + $("tConnect").checked=true; const extLsp = client.plugin(file, "xquery"); view.dispatch({ @@ -179,7 +175,7 @@ function connect() { }) .catch(e => { console.log(e); - $("tConnect").checked = false; + $("tConnect").checked=false; alert("connection failed: " + server) }); diff --git a/webapp/static/clients/codemirror/wc-qd-list.js b/webapp/static/clients/codemirror/wc-qd-list.js index 69e34b8..403b12a 100644 --- a/webapp/static/clients/codemirror/wc-qd-list.js +++ b/webapp/static/clients/codemirror/wc-qd-list.js @@ -183,7 +183,7 @@ class PanelComponent extends HTMLElement { style.textContent = ` @import url("../codicon@0.0.40/codicon.css"); ul { list-style-type: none; padding:0;margin:0; - background-color: #e3e4e4ff;font-size: 80%; scrollbar-color: #000077 #bada55;} + background-color: #f8f9fa;font-size: 80%;} li { padding: 0 0 0 2px; border-bottom: 1px solid #ccc; cursor: pointer; width:100%; } li:not(.selected) :hover { background-color: #ccc; } .selected { background-color: #0d6efd;color: #ffff;}