Skip to content

DBA: language selection and result-view improvements - #2741

Merged
ChristianGruen merged 2 commits into
BaseXdb:mainfrom
GuntherRademacher:cm6
Aug 12, 2026
Merged

DBA: language selection and result-view improvements#2741
ChristianGruen merged 2 commits into
BaseXdb:mainfrom
GuntherRademacher:cm6

Conversation

@GuntherRademacher

Copy link
Copy Markdown
Member

This is a follow-up to the CodeMirror 6 editor in the DBA.

Editor

  • language follows the file extension: XQuery (default and .xq*), XML, JSON, otherwise plain text
  • no syntax-error marker on an empty editor

Result view (read-only)

  • highlighting follows the result content (XML / JSON / text)
  • code folding

Bundle

  • rebuilt static/cm6.js: adds JSON and a runtime language switch
  • refreshed XQuery function signatures and documentation links
  • backward-compatible

The read-only Jobs result viewer gains the same folding, other pages are unchanged.

@ChristianGruen

Copy link
Copy Markdown
Member

I’m afraid this one will need to be rebased, if possible at all: js.js has been split into many single files, and there is one central place now where xquery suffixes are checked.

@GuntherRademacher

Copy link
Copy Markdown
Member Author

Merged branch 'main' into 'cm6', adapting editor/result language selection to the restructured DBA ('files.js').

@ChristianGruen
ChristianGruen merged commit f75fd7f into BaseXdb:main Aug 12, 2026
1 check passed
@ChristianGruen
ChristianGruen deleted the cm6 branch August 12, 2026 07:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants