diff --git a/bundles/cm6/lsp.js b/bundles/cm6/lsp.js index 52d3407..a16a71c 100644 --- a/bundles/cm6/lsp.js +++ b/bundles/cm6/lsp.js @@ -4,7 +4,7 @@ import { EditorState, StateEffect, Compartment } from '@codemirror/state'; import { lineNumbers, highlightActiveLineGutter, highlightWhitespace, drawSelection, rectangularSelection, crosshairCursor, highlightActiveLine, - keymap, dropCursor, EditorView,tooltips + keymap, dropCursor, EditorView } from '@codemirror/view'; import { openSearchPanel, highlightSelectionMatches, searchKeymap } from '@codemirror/search'; @@ -90,7 +90,7 @@ const baseExts = [ drawSelection(), dropCursor(), EditorState.allowMultipleSelections.of(true), - tooltips({ }), // clipped + keymap.of([indentWithTab]), indentOnInput(), syntaxHighlighting(defaultHighlightStyle, { fallback: true }), diff --git a/package-lock.json b/package-lock.json index 5b54055..f33f2c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,8 +17,6 @@ "@codemirror/theme-one-dark": "^6.1.0", "@codemirror/view": "^6.38.1", "@replit/codemirror-minimap": "^0.5.2", - "@zenfs/core": "^2.4.2", - "@zenfs/dom": "^1.1.7", "ace-builds": "^1.43.2", "ace-linters": "^1.8.3", "beercss": "^3.12.3" @@ -1089,15 +1087,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/node": { - "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" - } - }, "node_modules/@types/resolve": { "version": "1.20.2", "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", @@ -1105,70 +1094,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@xterm/xterm": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz", - "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==", - "license": "MIT", - "optional": true - }, - "node_modules/@zenfs/core": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@zenfs/core/-/core-2.4.2.tgz", - "integrity": "sha512-vqSX3Og0vz92uUkC2/FTZTp8zoP+5A0ZRyUKpdxBmpBASJsaM/2xEeYtT+OTfv5RVxgAGFnaK4g2EzBST6KOYA==", - "license": "LGPL-3.0-or-later", - "dependencies": { - "@types/node": "^24.1.0", - "buffer": "^6.0.3", - "eventemitter3": "^5.0.1", - "kerium": "^1.3.4", - "memium": "^0.3.10", - "readable-stream": "^4.5.2", - "utilium": "^2.5.0" - }, - "bin": { - "make-index": "scripts/make-index.js", - "zci": "scripts/ci-cli.js", - "zenfs-test": "scripts/test.js" - }, - "engines": { - "node": ">= 18" - }, - "funding": { - "type": "individual", - "url": "https://github.com/sponsors/james-pre" - } - }, - "node_modules/@zenfs/dom": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/@zenfs/dom/-/dom-1.1.7.tgz", - "integrity": "sha512-16FlIIBCeWEGr/As+1eRLZw0w2IDQAbXiVzFQqrfw7R2yd60jUpeiT6JYzsyzX2jChDcNg3sQ5cvnj2hPZgs8w==", - "license": "MIT", - "engines": { - "node": ">= 18" - }, - "funding": { - "type": "individual", - "url": "https://github.com/sponsors/james-pre" - }, - "peerDependencies": { - "@zenfs/core": "^2.1.0", - "kerium": "^1.3.4", - "utilium": "^2.0.0" - } - }, - "node_modules/abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "license": "MIT", - "dependencies": { - "event-target-shim": "^5.0.0" - }, - "engines": { - "node": ">=6.5" - } - }, "node_modules/ace-builds": { "version": "1.43.4", "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.43.4.tgz", @@ -1212,59 +1137,15 @@ "node": ">=0.4.0" } }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "node_modules/beercss": { - "version": "3.12.13", - "resolved": "https://registry.npmjs.org/beercss/-/beercss-3.12.13.tgz", - "integrity": "sha512-zsg15us8pSLTupIOzFFJqpJ7eJDLV6whsxT6GcRYGnYaF0ka45+HQ/u3+ldSUkCeyA5J24g6csEuMW8tqrI/0w==", + "version": "3.12.12", + "resolved": "https://registry.npmjs.org/beercss/-/beercss-3.12.12.tgz", + "integrity": "sha512-xjlBAaKQljk0BI1ld9D4U6yf1lIqNrRwKJQKAXXw2BQLSTctZeBdTfPQQjffkty+QpC2PYeVxT6DtJVwqfVasw==", "license": "MIT", "dependencies": { "material-dynamic-colors": "^1.1.2" } }, - "node_modules/buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -1383,30 +1264,6 @@ "dev": true, "license": "MIT" }, - "node_modules/event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/eventemitter3": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", - "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", - "license": "MIT" - }, - "node_modules/events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "license": "MIT", - "engines": { - "node": ">=0.8.x" - } - }, "node_modules/find-up": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", @@ -1484,26 +1341,6 @@ "node": "^14.13.1 || >=16.0.0" } }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "BSD-3-Clause" - }, "node_modules/is-core-module": { "version": "2.16.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", @@ -1534,19 +1371,6 @@ "dev": true, "license": "MIT" }, - "node_modules/kerium": { - "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" - }, - "funding": { - "type": "individual", - "url": "https://github.com/sponsors/james-pre" - } - }, "node_modules/locate-path": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", @@ -1607,20 +1431,6 @@ "material-dynamic-colors": "cli.js" } }, - "node_modules/memium": { - "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", - "utilium": "^2.0.0" - }, - "funding": { - "type": "individual", - "url": "https://github.com/sponsors/james-pre" - } - }, "node_modules/minify": { "version": "9.2.0", "resolved": "https://registry.npmjs.org/minify/-/minify-9.2.0.tgz", @@ -1748,31 +1558,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", - "license": "MIT", - "engines": { - "node": ">= 0.6.0" - } - }, - "node_modules/readable-stream": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", - "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", - "license": "MIT", - "dependencies": { - "abort-controller": "^3.0.0", - "buffer": "^6.0.3", - "events": "^3.3.0", - "process": "^0.11.10", - "string_decoder": "^1.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, "node_modules/readjson": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/readjson/-/readjson-2.2.2.tgz", @@ -1798,13 +1583,13 @@ } }, "node_modules/resolve": { - "version": "1.22.11", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz", - "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==", + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", "dev": true, "license": "MIT", "dependencies": { - "is-core-module": "^2.16.1", + "is-core-module": "^2.16.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -1875,26 +1660,6 @@ "pnpm": ">=6" } }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "node_modules/simport": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/simport/-/simport-1.2.0.tgz", @@ -1930,15 +1695,6 @@ "source-map": "^0.6.0" } }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, "node_modules/style-mod": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz", @@ -2026,31 +1782,6 @@ "node": ">=14.17" } }, - "node_modules/undici-types": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", - "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", - "license": "MIT" - }, - "node_modules/utilium": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/utilium/-/utilium-2.5.3.tgz", - "integrity": "sha512-iJ4JVfjNGKJEcYYv5deZ/4cOQtBFZEzfpgA6BX0Qva2ax73Uy2LBbbDKVQQorZxUtq3EHdX01p94oc78/8SEew==", - "license": "LGPL-3.0-or-later", - "dependencies": { - "eventemitter3": "^5.0.1" - }, - "bin": { - "lice": "scripts/lice.js" - }, - "funding": { - "type": "individual", - "url": "https://github.com/sponsors/james-pre" - }, - "optionalDependencies": { - "@xterm/xterm": "^5.5.0" - } - }, "node_modules/vscode-jsonrpc": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", diff --git a/package.json b/package.json index 0f833c1..941a5ac 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,6 @@ "@codemirror/theme-one-dark": "^6.1.0", "@codemirror/view": "^6.38.1", "@replit/codemirror-minimap": "^0.5.2", - "@zenfs/core": "^2.4.2", - "@zenfs/dom": "^1.1.7", "ace-builds": "^1.43.2", "ace-linters": "^1.8.3", "beercss": "^3.12.3" diff --git a/webapp/lsp/context.xqm b/webapp/lsp/context.xqm index 63490e4..6c1dcd8 100644 --- a/webapp/lsp/context.xqm +++ b/webapp/lsp/context.xqm @@ -18,7 +18,7 @@ declare function ctx:map($fn as element(fos:function)) { $fn!map{ "label":string(@name), - "kind": $lspt:CompletionItemKindMap("Function"), + "kind": 3, "detail":string($fn/fos:summary/*), "documentation":`{ ctx:summary(.) } Spec` !lspt:MarkupContent("markdown",.) diff --git a/webapp/static/clients/codemirror/grail.html b/webapp/static/clients/codemirror/grail.html index 88ca5ca..0d3b1de 100644 --- a/webapp/static/clients/codemirror/grail.html +++ b/webapp/static/clients/codemirror/grail.html @@ -64,10 +64,7 @@ - - -
-