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

[mod] update to node lts v22

Browse source
This commit is contained in:
Andy Bunce 2025-10-27 15:54:51 +00:00
parent 0d80764174
commit b102be8db6
6 changed files with 152 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

9
webapp/lsp/ast/ast.xqm
View file

@ -19,14 +19,15 @@ as element(*){
:concrete to abstract: simplify by omitting elements with only one child
:)
declare function ast:flatten($input as element()) as element() {
if (1=count($input/*)) then ast:flatten($input/*)
if (1=count($input/*))
then ast:flatten($input/*)
else element {node-name($input) }
{$input/@*,
for $child in $input/node()
return
if ($child instance of element())
then ast:flatten($child)
else $child
if ($child instance of element())
then ast:flatten($child)
else $child
}
};

90
webapp/static/clients/codemirror/lsp.bundle.js
View file

@ -16684,6 +16684,7 @@ var lsp = (function (exports) {
diagnostics = diagnosticFilter(diagnostics, state);
let sorted = diagnostics.slice().sort((a, b) => a.from - b.from || a.to - b.to);
let deco = new RangeSetBuilder(), active = [], pos = 0;
let scan = state.doc.iter(), scanPos = 0;
for (let i = 0;;) {
let next = i == sorted.length ? null : sorted[i];
if (!next && !active.length)
@ -16711,8 +16712,30 @@ var lsp = (function (exports) {
break;
}
}
let widget = false;
if (active.some(d => d.from == from && d.to == to)) {
widget = from == to;
if (!widget && to - from < 10) {
let behind = from - (scanPos + scan.value.length);
if (behind > 0) {
scan.next(behind);
scanPos = from;
}
for (let check = from;;) {
if (check >= to) {
widget = true;
break;
}
if (!scan.lineBreak && scanPos + scan.value.length > check)
break;
check = scanPos + scan.value.length;
scanPos += scan.value.length;
scan.next();
}
}
}
let sev = maxSeverity(active);
if (active.some(d => d.from == d.to || (d.from == d.to - 1 && state.doc.lineAt(d.from).to == d.from))) {
if (widget) {
deco.add(from, from, Decoration.widget({
widget: new DiagnosticWidget(sev),
diagnostics: active.slice()
@ -19464,7 +19487,7 @@ var lsp = (function (exports) {
combine(a, b) {
let cur, root, take;
while (a || b) {
if (!a || a.depth > b.depth) {
if (!a || b && a.depth >= b.depth) {
take = b;
b = b.next;
}
@ -19472,6 +19495,8 @@ var lsp = (function (exports) {
take = a;
a = a.next;
}
if (cur && cur.mode == take.mode && !take.context && !cur.context)
continue;
let copy = new Rule(take.tags, take.mode, take.context);
if (cur)
cur.next = copy;
@ -24221,7 +24246,7 @@ var lsp = (function (exports) {
}
}
const completionConfig = /*@__PURE__*/Facet.define({
const completionConfig$1 = /*@__PURE__*/Facet.define({
combine(configs) {
return combineConfig(configs, {
activateOnTyping: true,
@ -24363,7 +24388,7 @@ var lsp = (function (exports) {
this.currentClass = "";
let cState = view.state.field(stateField);
let { options, selected } = cState.open;
let config = view.state.facet(completionConfig);
let config = view.state.facet(completionConfig$1);
this.optionContent = optionContent(config);
this.optionClass = config.optionClass;
this.tooltipClass = config.tooltipClass;
@ -24383,7 +24408,7 @@ var lsp = (function (exports) {
});
this.dom.addEventListener("focusout", (e) => {
let state = view.state.field(this.stateField, false);
if (state && state.tooltip && view.state.facet(completionConfig).closeOnBlur &&
if (state && state.tooltip && view.state.facet(completionConfig$1).closeOnBlur &&
e.relatedTarget != view.contentDOM)
view.dispatch({ effects: closeCompletionEffect.of(null) });
});
@ -24407,7 +24432,7 @@ var lsp = (function (exports) {
if (cState != prevState) {
let { options, selected, disabled } = cState.open;
if (!prevState.open || prevState.open.options != options) {
this.range = rangeAroundSelected(options.length, selected, update.state.facet(completionConfig).maxRenderedOptions);
this.range = rangeAroundSelected(options.length, selected, update.state.facet(completionConfig$1).maxRenderedOptions);
this.showOptions(options, cState.id);
}
this.updateSel();
@ -24435,10 +24460,11 @@ var lsp = (function (exports) {
updateSel() {
let cState = this.view.state.field(this.stateField), open = cState.open;
if (open.selected > -1 && open.selected < this.range.from || open.selected >= this.range.to) {
this.range = rangeAroundSelected(open.options.length, open.selected, this.view.state.facet(completionConfig).maxRenderedOptions);
this.range = rangeAroundSelected(open.options.length, open.selected, this.view.state.facet(completionConfig$1).maxRenderedOptions);
this.showOptions(open.options, cState.id);
}
if (this.updateSelectedOption(open.selected)) {
let newSel = this.updateSelectedOption(open.selected);
if (newSel) {
this.destroyInfo();
let { completion } = open.options[open.selected];
let { info } = completion;
@ -24455,6 +24481,7 @@ var lsp = (function (exports) {
}
else {
this.addInfoPane(infoResult, completion);
newSel.setAttribute("aria-describedby", this.info.id);
}
}
}
@ -24462,6 +24489,7 @@ var lsp = (function (exports) {
this.destroyInfo();
let wrap = this.info = document.createElement("div");
wrap.className = "cm-tooltip cm-completionInfo";
wrap.id = "cm-completionInfo-" + Math.floor(Math.random() * 0xffff).toString(16);
if (content.nodeType != null) {
wrap.appendChild(content);
this.infoDestroy = null;
@ -24487,8 +24515,10 @@ var lsp = (function (exports) {
}
}
else {
if (opt.hasAttribute("aria-selected"))
if (opt.hasAttribute("aria-selected")) {
opt.removeAttribute("aria-selected");
opt.removeAttribute("aria-describedby");
}
}
}
if (set)
@ -24510,7 +24540,7 @@ var lsp = (function (exports) {
if (selRect.top > Math.min(space.bottom, listRect.bottom) - 10 ||
selRect.bottom < Math.max(space.top, listRect.top) + 10)
return null;
return this.view.state.facet(completionConfig).positionInfo(this.view, listRect, selRect, infoRect, space, this.dom);
return this.view.state.facet(completionConfig$1).positionInfo(this.view, listRect, selRect, infoRect, space, this.dom);
}
placeInfo(pos) {
if (this.info) {
@ -24614,7 +24644,7 @@ var lsp = (function (exports) {
sections.push(typeof section == "string" ? { name } : section);
}
};
let conf = state.facet(completionConfig);
let conf = state.facet(completionConfig$1);
for (let a of active)
if (a.hasResult()) {
let getMatch = a.result.getMatch;
@ -24690,7 +24720,7 @@ var lsp = (function (exports) {
let options = sortOptions(active, state);
if (!options.length)
return prev && active.some(a => a.isPending) ? prev.setDisabled() : null;
let selected = state.facet(completionConfig).selectOnOpen ? 0 : -1;
let selected = state.facet(completionConfig$1).selectOnOpen ? 0 : -1;
if (prev && prev.selected != selected && prev.selected != -1) {
let selectedValue = prev.options[prev.selected].completion;
for (let i = 0; i < options.length; i++)
@ -24722,7 +24752,7 @@ var lsp = (function (exports) {
return new CompletionState(none, "cm-ac-" + Math.floor(Math.random() * 2e6).toString(36), null);
}
update(tr) {
let { state } = tr, conf = state.facet(completionConfig);
let { state } = tr, conf = state.facet(completionConfig$1);
let sources = conf.override ||
state.languageDataAt("autocomplete", cur(state)).map(asSource);
let active = sources.map(source => {
@ -24909,7 +24939,7 @@ var lsp = (function (exports) {
return (view) => {
let cState = view.state.field(completionState, false);
if (!cState || !cState.open || cState.open.disabled ||
Date.now() - cState.open.timestamp < view.state.facet(completionConfig).interactionDelay)
Date.now() - cState.open.timestamp < view.state.facet(completionConfig$1).interactionDelay)
return false;
let step = 1, tooltip;
if (by == "page" && (tooltip = getTooltip(view, cState.open.tooltip)))
@ -24931,7 +24961,7 @@ var lsp = (function (exports) {
const acceptCompletion = (view) => {
let cState = view.state.field(completionState, false);
if (view.state.readOnly || !cState || !cState.open || cState.open.selected < 0 || cState.open.disabled ||
Date.now() - cState.open.timestamp < view.state.facet(completionConfig).interactionDelay)
Date.now() - cState.open.timestamp < view.state.facet(completionConfig$1).interactionDelay)
return false;
return applyCompletion(view, cState.open.options[cState.open.selected]);
};
@ -24981,7 +25011,7 @@ var lsp = (function (exports) {
}
update(update) {
let cState = update.state.field(completionState);
let conf = update.state.facet(completionConfig);
let conf = update.state.facet(completionConfig$1);
if (!update.selectionSet && !update.docChanged && update.startState.field(completionState) == cState)
return;
let doesReset = update.transactions.some(tr => {
@ -25032,7 +25062,7 @@ var lsp = (function (exports) {
this.startQuery(active);
}
if (this.running.length && cState.open && cState.open.disabled)
this.debounceAccept = setTimeout(() => this.accept(), this.view.state.facet(completionConfig).updateSyncTime);
this.debounceAccept = setTimeout(() => this.accept(), this.view.state.facet(completionConfig$1).updateSyncTime);
}
startQuery(active) {
let { state } = this.view, pos = cur(state);
@ -25053,7 +25083,7 @@ var lsp = (function (exports) {
if (this.running.every(q => q.done !== undefined))
this.accept();
else if (this.debounceAccept < 0)
this.debounceAccept = setTimeout(() => this.accept(), this.view.state.facet(completionConfig).updateSyncTime);
this.debounceAccept = setTimeout(() => this.accept(), this.view.state.facet(completionConfig$1).updateSyncTime);
}
// For each finished query in this.running, try to create a result
// or, if appropriate, restart the query.
@ -25063,7 +25093,7 @@ var lsp = (function (exports) {
clearTimeout(this.debounceAccept);
this.debounceAccept = -1;
let updated = [];
let conf = this.view.state.facet(completionConfig), cState = this.view.state.field(completionState);
let conf = this.view.state.facet(completionConfig$1), cState = this.view.state.field(completionState);
for (let i = 0; i < this.running.length; i++) {
let query = this.running[i];
if (query.done === undefined)
@ -25106,7 +25136,7 @@ var lsp = (function (exports) {
eventHandlers: {
blur(event) {
let state = this.view.state.field(completionState, false);
if (state && state.tooltip && this.view.state.facet(completionConfig).closeOnBlur) {
if (state && state.tooltip && this.view.state.facet(completionConfig$1).closeOnBlur) {
let dialog = state.open && getTooltip(this.view, state.open.tooltip);
if (!dialog || !dialog.dom.contains(event.relatedTarget))
setTimeout(() => this.view.dispatch({ effects: closeCompletionEffect.of(null) }), 10);
@ -25771,7 +25801,7 @@ var lsp = (function (exports) {
return [
commitCharacters,
completionState,
completionConfig.of(config),
completionConfig$1.of(config),
completionPlugin,
completionKeymapExt,
baseTheme
@ -25799,7 +25829,7 @@ var lsp = (function (exports) {
{ key: "PageUp", run: /*@__PURE__*/moveCompletionSelection(false, "page") },
{ key: "Enter", run: acceptCompletion }
];
const completionKeymapExt = /*@__PURE__*/Prec.highest(/*@__PURE__*/keymap.computeN([completionConfig], state => state.facet(completionConfig).defaultKeymap ? [completionKeymap] : []));
const completionKeymapExt = /*@__PURE__*/Prec.highest(/*@__PURE__*/keymap.computeN([completionConfig$1], state => state.facet(completionConfig$1).defaultKeymap ? [completionKeymap] : []));
/**
* marked v15.0.12 - a markdown parser
@ -28784,14 +28814,21 @@ ${text}</tr>
source.
*/
function serverCompletion(config = {}) {
let result;
if (config.override) {
return autocompletion({ override: [serverCompletionSource] });
result = [autocompletion({ override: [serverCompletionSource] })];
}
else {
let data = [{ autocomplete: serverCompletionSource }];
return [autocompletion(), EditorState.languageData.of(() => data)];
result = [autocompletion(), EditorState.languageData.of(() => data)];
}
if (config.validFor)
result.push(completionConfig.of({ validFor: config.validFor }));
return result;
}
const completionConfig = /*@__PURE__*/Facet.define({
combine: results => results.length ? results[0] : { validFor: null }
});
function getCompletions(plugin, pos, context, abort) {
if (plugin.client.hasCapability("completionProvider") === false)
return Promise.resolve(null);
@ -28842,13 +28879,14 @@ ${text}</tr>
triggerCharacter: triggerChar,
triggerKind: context.explicit ? 1 /* Invoked */ : 2 /* TriggerCharacter */
}, context).then(result => {
var _a;
var _a, _b;
if (!result)
return null;
if (Array.isArray(result))
result = { items: result };
let { from, to } = completionResultRange(context, result);
let defaultCommitChars = (_a = result.itemDefaults) === null || _a === void 0 ? void 0 : _a.commitCharacters;
let config = context.state.facet(completionConfig);
return {
from, to,
options: result.items.map(item => {
@ -28871,7 +28909,7 @@ ${text}</tr>
return option;
}),
commitCharacters: defaultCommitChars,
validFor: prefixRegexp(result.items),
validFor: (_b = config.validFor) !== null && _b !== void 0 ? _b : prefixRegexp(result.items),
map: (result, changes) => ({ ...result, from: changes.mapPos(result.from) }),
};
}, err => {

2
webapp/static/clients/codemirror/lsp.bundle.js.map
View file

File diff suppressed because one or more lines are too long

2
webapp/static/clients/codemirror/lsp.bundle.min.js vendored
View file

File diff suppressed because one or more lines are too long