diff --git a/webapp/lsp/position.xqm b/webapp/lsp/position.xqm index 3fd4e94..2f43549 100644 --- a/webapp/lsp/position.xqm +++ b/webapp/lsp/position.xqm @@ -91,7 +91,7 @@ declare function pos:range-from-ast( $text as xs:string) as lspt:Range{ lspt:Range( - pos:toPosition($text,number($ast/@start)), + pos:toPosition($text,number($ast/@start)-1), pos:toPosition($text, number($ast/@end)) ) }; diff --git a/webapp/static/clients/codemirror/grail.css b/webapp/static/clients/codemirror/grail.css index aa7a296..34ec940 100644 --- a/webapp/static/clients/codemirror/grail.css +++ b/webapp/static/clients/codemirror/grail.css @@ -2,18 +2,26 @@ :root { color-scheme: light dark; + --quiet-primary-seed: #e98d61; + --quiet-content-spacing: 0.75rem; } * { box-sizing: border-box; } +html { + height: 100%; +} + body { background: #e4e4e4; padding: 0; height: 100vh; + min-height: 100vh; margin: 0; } + form header { background-color: burlywood; } @@ -26,27 +34,23 @@ form header { display: grid; grid-template-columns: minmax(10px, 1fr) minmax(10px, 4fr); grid-template-rows: min-content min-content 1fr min-content; - gap: 1px; .navbar * { box-sizing: content-box; } - details { - padding:2px; - padding-left: 3px; - } + details { + + } details[open] { flex-grow: 1; - overflow:hidden; + overflow: hidden; } summary { - /* class: bg-info; */ - --bs-bg-opacity: 1; - background-color: rgba(var(--bs-light-rgb),var(--bs-bg-opacity)) !important; + background-color: var(--quiet-neutral-fill-softer); } /* Set editor dimensions */ @@ -63,15 +67,15 @@ form header { overflow: auto; } -details[open]::details-content { - padding: 0.1em; - border: thin solid grey; - overflow:auto; -} + details[open]::details-content { + padding: 0.1em; + border: thin solid grey; + overflow: auto; + } -::backdrop { + ::backdrop { backdrop-filter: blur(2px); -} + } @media (max-width: 600px) { grid-template-columns: 100%; @@ -83,15 +87,16 @@ details[open]::details-content { } } } - #tConnect:state(unchecked) { - outline: dashed 4px deeppink; - outline-offset: 4px; - } + +#tConnect:state(unchecked) { + outline: dashed 4px deeppink; + outline-offset: 4px; +} .page-header { grid-column: 1 / -1; - display:flex; - justify-content:space-between; + display: flex; + justify-content: space-between; } .page-sidebar { @@ -99,10 +104,11 @@ details[open]::details-content { grid-row: 2 / 4; display: flex; flex-direction: column; + details { display: flex; flex-direction: column; - + } } diff --git a/webapp/static/clients/codemirror/grail.html b/webapp/static/clients/codemirror/grail.html index dc8458f..6527a65 100644 --- a/webapp/static/clients/codemirror/grail.html +++ b/webapp/static/clients/codemirror/grail.html @@ -1,5 +1,5 @@ - + @@ -11,9 +11,9 @@ - - --> + @@ -26,8 +26,8 @@
+ @@ -38,10 +38,10 @@ Editor - LSP Manager + LSP Manager - Dba + Dba @@ -75,7 +75,7 @@ -
+
@@ -133,7 +133,7 @@