svelte-highlight 7.16.1 → 7.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/HighlightEditable.svelte +13 -6
- package/HighlightStream.svelte +236 -13
- package/HighlightStream.svelte.d.ts +25 -0
- package/HighlightVirtual.svelte +13 -20
- package/LICENSE.highlight.txt +1 -1
- package/README.md +19 -10
- package/editable-dom-paint.js +216 -0
- package/incremental-tokenize.js +42 -11
- package/languages/1c.js +1 -1
- package/languages/abnf.js +1 -1
- package/languages/accesslog.js +1 -1
- package/languages/actionscript.js +1 -1
- package/languages/ada.js +7 -6
- package/languages/all.js +8 -0
- package/languages/angelscript.js +1 -1
- package/languages/apache.js +1 -1
- package/languages/applescript.js +1 -1
- package/languages/arcade.js +1 -1
- package/languages/arduino.js +91 -67
- package/languages/armasm.js +1 -1
- package/languages/asciidoc.js +1 -1
- package/languages/aspectj.js +1 -1
- package/languages/autohotkey.js +1 -1
- package/languages/autoit.js +1 -1
- package/languages/avrasm.js +1 -1
- package/languages/awk.js +1 -1
- package/languages/axapta.js +1 -1
- package/languages/bash.js +1 -1
- package/languages/basic.js +1 -1
- package/languages/bnf.js +1 -1
- package/languages/brainfuck.js +1 -1
- package/languages/c.js +91 -66
- package/languages/cal.js +1 -1
- package/languages/capnproto.js +1 -1
- package/languages/ceylon.js +1 -1
- package/languages/clean.js +1 -1
- package/languages/clojure-repl.js +1 -1
- package/languages/clojure.js +1 -1
- package/languages/cmake.js +4 -2
- package/languages/coffeescript.js +1 -1
- package/languages/coq.js +1 -1
- package/languages/cos.js +1 -1
- package/languages/cpp.js +90 -65
- package/languages/cql.d.ts +2 -0
- package/languages/cql.js +203 -0
- package/languages/crmsh.js +1 -1
- package/languages/crystal.js +27 -34
- package/languages/csharp.js +4 -4
- package/languages/csp.js +8 -1
- package/languages/css.js +20 -13
- package/languages/d.js +1 -1
- package/languages/dart.js +18 -3
- package/languages/delphi.js +1 -1
- package/languages/diff.js +2 -2
- package/languages/django.js +1 -1
- package/languages/dns.js +71 -43
- package/languages/dockerfile.js +1 -1
- package/languages/dos.js +3 -3
- package/languages/dsconfig.js +1 -1
- package/languages/dts.js +1 -1
- package/languages/dust.js +1 -1
- package/languages/ebnf.js +1 -1
- package/languages/elixir.js +59 -50
- package/languages/elm.js +1 -1
- package/languages/erb.js +1 -1
- package/languages/erlang-repl.js +1 -1
- package/languages/erlang.js +1 -1
- package/languages/excel.js +1 -1
- package/languages/fix.js +1 -1
- package/languages/flix.js +1 -1
- package/languages/flux.d.ts +2 -0
- package/languages/flux.js +272 -0
- package/languages/fortran.js +1 -1
- package/languages/freedesktop.d.ts +2 -0
- package/languages/freedesktop.js +45 -0
- package/languages/fsharp.js +1 -1
- package/languages/gams.js +1 -1
- package/languages/gauss.js +1 -1
- package/languages/gcode.js +1 -1
- package/languages/gherkin.js +36 -38
- package/languages/glsl.js +1 -1
- package/languages/gml.js +1 -1
- package/languages/go.js +10 -3
- package/languages/golo.js +1 -1
- package/languages/gradle.js +1 -1
- package/languages/graphql.js +1 -1
- package/languages/groovy.js +60 -5
- package/languages/haml.js +1 -1
- package/languages/handlebars.js +1 -1
- package/languages/haskell.js +2 -1
- package/languages/haxe.js +1 -1
- package/languages/hsp.js +1 -1
- package/languages/http.js +1 -1
- package/languages/hy.js +1 -1
- package/languages/index.d.ts +8 -0
- package/languages/index.js +4 -0
- package/languages/inform7.js +1 -1
- package/languages/ini.js +1 -1
- package/languages/irpf90.js +1 -1
- package/languages/isbl.js +1 -1
- package/languages/java.js +28 -25
- package/languages/javascript.js +9 -3
- package/languages/jboss-cli.js +1 -1
- package/languages/json.js +12 -9
- package/languages/julia-repl.js +1 -1
- package/languages/julia.js +1 -1
- package/languages/kotlin.js +3 -3
- package/languages/lasso.js +1 -1
- package/languages/latex.js +1 -1
- package/languages/ldif.js +1 -1
- package/languages/leaf.js +7 -2
- package/languages/less.js +60 -45
- package/languages/lisp.js +7 -2
- package/languages/livecodeserver.js +1 -1
- package/languages/livescript.js +1 -1
- package/languages/llvm.js +18 -3
- package/languages/lsl.js +1 -1
- package/languages/lua.js +2 -1
- package/languages/makefile.js +1 -1
- package/languages/markdown.js +8 -4
- package/languages/mathematica.js +1 -1
- package/languages/matlab.js +1 -1
- package/languages/maxima.js +1 -1
- package/languages/mel.js +1 -1
- package/languages/mercury.js +1 -1
- package/languages/mipsasm.js +1 -1
- package/languages/mizar.js +1 -1
- package/languages/mojolicious.js +1 -1
- package/languages/monkey.js +1 -1
- package/languages/moonscript.js +1 -1
- package/languages/n1ql.js +1 -1
- package/languages/nestedtext.js +1 -1
- package/languages/nginx.js +1 -1
- package/languages/nim.js +1 -1
- package/languages/nix.js +1 -1
- package/languages/node-repl.js +1 -1
- package/languages/nsis.js +20 -5
- package/languages/objectivec.js +1 -1
- package/languages/ocaml.js +1 -1
- package/languages/openscad.js +1 -1
- package/languages/oxygene.js +1 -1
- package/languages/parser3.js +1 -1
- package/languages/perl.js +1 -1
- package/languages/pf.js +1 -1
- package/languages/pgsql.js +1 -1
- package/languages/php-template.js +1 -1
- package/languages/php.js +150 -24
- package/languages/plaintext.js +1 -1
- package/languages/pony.js +1 -1
- package/languages/powershell.js +1 -1
- package/languages/processing.js +1 -1
- package/languages/profile.js +1 -1
- package/languages/prolog.js +1 -1
- package/languages/properties.js +1 -1
- package/languages/protobuf.js +1 -1
- package/languages/prql.d.ts +2 -0
- package/languages/prql.js +160 -0
- package/languages/puppet.js +1 -1
- package/languages/purebasic.js +1 -1
- package/languages/python-repl.js +1 -1
- package/languages/python.js +31 -11
- package/languages/q.js +1 -1
- package/languages/qml.js +1 -1
- package/languages/r.js +1 -1
- package/languages/reasonml.js +1 -1
- package/languages/rib.js +1 -1
- package/languages/roboconf.js +1 -1
- package/languages/routeros.js +1 -1
- package/languages/rsl.js +1 -1
- package/languages/ruby.js +2 -2
- package/languages/ruleslanguage.js +1 -1
- package/languages/rust.js +23 -11
- package/languages/sas.js +1 -1
- package/languages/scala.js +1 -1
- package/languages/scheme.js +1 -1
- package/languages/scilab.js +1 -1
- package/languages/scss.js +16 -9
- package/languages/shell.js +2 -2
- package/languages/smali.js +1 -1
- package/languages/smalltalk.js +1 -1
- package/languages/sml.js +1 -1
- package/languages/sqf.js +175 -10
- package/languages/sql.js +1 -1
- package/languages/stan.js +1 -1
- package/languages/stata.js +1 -1
- package/languages/step21.js +1 -1
- package/languages/stylus.js +18 -11
- package/languages/subunit.js +1 -1
- package/languages/swift.js +1 -1
- package/languages/taggerscript.js +1 -1
- package/languages/tap.js +1 -1
- package/languages/tcl.js +1 -1
- package/languages/thrift.js +1 -1
- package/languages/tp.js +1 -1
- package/languages/twig.js +1 -1
- package/languages/typescript.js +9 -3
- package/languages/vala.js +1 -1
- package/languages/vbnet.js +1 -1
- package/languages/vbscript-html.js +1 -1
- package/languages/vbscript.js +1 -1
- package/languages/verilog.js +1 -1
- package/languages/vhdl.js +1 -1
- package/languages/vim.js +1 -1
- package/languages/wasm.js +1 -1
- package/languages/wren.js +1 -1
- package/languages/x86asm.js +1 -1
- package/languages/xl.js +1 -1
- package/languages/xml.js +3 -3
- package/languages/xquery.js +1 -1
- package/languages/yaml.js +1 -1
- package/languages/zephir.js +1 -1
- package/package.json +1 -1
- package/stream-highlighted.js +41 -0
- package/styles/a11y-dark.css +1 -1
- package/styles/a11y-dark.js +1 -1
- package/styles/a11y-light.css +1 -1
- package/styles/a11y-light.js +1 -1
- package/styles/an-old-hope.css +1 -1
- package/styles/an-old-hope.js +1 -1
- package/styles/arduino-light.css +1 -1
- package/styles/arduino-light.js +1 -1
- package/styles/arta.css +1 -1
- package/styles/arta.js +1 -1
- package/styles/brown-paper.css +1 -1
- package/styles/brown-paper.js +1 -1
- package/styles/codepen-embed.css +1 -1
- package/styles/codepen-embed.js +1 -1
- package/styles/cybertopia-cherry.css +10 -9
- package/styles/cybertopia-cherry.js +10 -9
- package/styles/cybertopia-dimmer.css +10 -9
- package/styles/cybertopia-dimmer.js +10 -9
- package/styles/cybertopia-icecap.css +10 -9
- package/styles/cybertopia-icecap.js +10 -9
- package/styles/cybertopia-saturated.css +10 -9
- package/styles/cybertopia-saturated.js +10 -9
- package/styles/dark.css +1 -1
- package/styles/dark.js +1 -1
- package/styles/docco.css +1 -1
- package/styles/docco.js +1 -1
- package/styles/equinox.css +25 -0
- package/styles/equinox.d.ts +1 -0
- package/styles/equinox.js +27 -0
- package/styles/far.css +1 -1
- package/styles/far.js +1 -1
- package/styles/gml.css +1 -1
- package/styles/gml.js +1 -1
- package/styles/googlecode.css +1 -1
- package/styles/googlecode.js +1 -1
- package/styles/hybrid.css +1 -1
- package/styles/hybrid.js +1 -1
- package/styles/index.d.ts +2 -0
- package/styles/index.js +2 -0
- package/styles/intellij-light.css +1 -1
- package/styles/intellij-light.js +1 -1
- package/styles/ir-black.css +1 -1
- package/styles/ir-black.js +1 -1
- package/styles/isbl-editor-dark.css +1 -1
- package/styles/isbl-editor-dark.js +1 -1
- package/styles/isbl-editor-light.css +1 -1
- package/styles/isbl-editor-light.js +1 -1
- package/styles/magula.css +1 -1
- package/styles/magula.js +1 -1
- package/styles/mono-blue.css +1 -1
- package/styles/mono-blue.js +1 -1
- package/styles/monokai-sublime.css +1 -1
- package/styles/monokai-sublime.js +1 -1
- package/styles/monokai.css +1 -1
- package/styles/monokai.js +1 -1
- package/styles/nnfx-dark.css +1 -1
- package/styles/nnfx-dark.js +1 -1
- package/styles/nnfx-light.css +1 -1
- package/styles/nnfx-light.js +1 -1
- package/styles/obsidian.css +1 -1
- package/styles/obsidian.js +1 -1
- package/styles/paraiso-dark.css +1 -1
- package/styles/paraiso-dark.js +1 -1
- package/styles/paraiso-light.css +1 -1
- package/styles/paraiso-light.js +1 -1
- package/styles/pojoaque.css +1 -1
- package/styles/pojoaque.js +1 -1
- package/styles/purebasic.css +1 -1
- package/styles/purebasic.js +1 -1
- package/styles/qtcreator-dark.css +1 -1
- package/styles/qtcreator-dark.js +1 -1
- package/styles/qtcreator-light.css +1 -1
- package/styles/qtcreator-light.js +1 -1
- package/styles/rainbow.css +1 -1
- package/styles/rainbow.js +1 -1
- package/styles/routeros.css +1 -1
- package/styles/routeros.js +1 -1
- package/styles/school-book.css +1 -1
- package/styles/school-book.js +1 -1
- package/styles/shades-of-purple.css +1 -1
- package/styles/shades-of-purple.js +1 -1
- package/styles/srcery.css +1 -1
- package/styles/srcery.js +1 -1
- package/styles/stackoverflow-dark.css +1 -1
- package/styles/stackoverflow-dark.js +1 -1
- package/styles/stackoverflow-light.css +1 -1
- package/styles/stackoverflow-light.js +1 -1
- package/styles/tomorrow-night-blue.css +1 -1
- package/styles/tomorrow-night-blue.js +1 -1
- package/styles/tomorrow-night-bright.css +1 -1
- package/styles/tomorrow-night-bright.js +1 -1
- package/styles/vs-dark.css +21 -0
- package/styles/vs-dark.d.ts +1 -0
- package/styles/vs-dark.js +23 -0
- package/styles/vs.css +1 -1
- package/styles/vs.js +1 -1
- package/styles/xcode.css +1 -1
- package/styles/xcode.js +1 -1
- package/styles/xt256.css +1 -1
- package/styles/xt256.js +1 -1
- package/themes/a11y-dark.css +1 -1
- package/themes/a11y-dark.js +1 -1
- package/themes/a11y-light.css +1 -1
- package/themes/a11y-light.js +1 -1
- package/themes/an-old-hope.css +1 -1
- package/themes/an-old-hope.js +1 -1
- package/themes/arta.css +1 -1
- package/themes/arta.js +1 -1
- package/themes/brown-paper.css +1 -1
- package/themes/brown-paper.js +1 -1
- package/themes/codepen-embed.css +1 -1
- package/themes/codepen-embed.js +1 -1
- package/themes/cybertopia-cherry.css +1 -1
- package/themes/cybertopia-cherry.js +49 -48
- package/themes/cybertopia-dimmer.css +1 -1
- package/themes/cybertopia-dimmer.js +49 -48
- package/themes/cybertopia-icecap.css +1 -1
- package/themes/cybertopia-icecap.js +49 -48
- package/themes/cybertopia-saturated.css +1 -1
- package/themes/cybertopia-saturated.js +49 -48
- package/themes/dark.css +1 -1
- package/themes/dark.js +1 -1
- package/themes/docco.css +1 -1
- package/themes/docco.js +1 -1
- package/themes/equinox.css +1 -0
- package/themes/equinox.d.ts +1 -0
- package/themes/equinox.js +51 -0
- package/themes/far.css +1 -1
- package/themes/far.js +1 -1
- package/themes/googlecode.css +1 -1
- package/themes/googlecode.js +1 -1
- package/themes/index.d.ts +2 -0
- package/themes/index.js +2 -0
- package/themes/ir-black.css +1 -1
- package/themes/ir-black.js +1 -1
- package/themes/paraiso-dark.css +1 -1
- package/themes/paraiso-dark.js +1 -1
- package/themes/paraiso-light.css +1 -1
- package/themes/paraiso-light.js +1 -1
- package/themes/pojoaque.css +1 -1
- package/themes/pojoaque.js +1 -1
- package/themes/rainbow.css +1 -1
- package/themes/rainbow.js +1 -1
- package/themes/school-book.css +1 -1
- package/themes/school-book.js +1 -1
- package/themes/tomorrow-night-blue.css +1 -1
- package/themes/tomorrow-night-blue.js +1 -1
- package/themes/tomorrow-night-bright.css +1 -1
- package/themes/tomorrow-night-bright.js +1 -1
- package/themes/vs-dark.css +1 -0
- package/themes/vs-dark.d.ts +1 -0
- package/themes/vs-dark.js +45 -0
- package/themes/vs.css +1 -1
- package/themes/vs.js +1 -1
- package/virtual-window.js +67 -0
package/HighlightEditable.svelte
CHANGED
|
@@ -39,7 +39,8 @@
|
|
|
39
39
|
export let theme = undefined;
|
|
40
40
|
|
|
41
41
|
import { createEventDispatcher, onMount } from "svelte";
|
|
42
|
-
import {
|
|
42
|
+
import { createDomLinePainter } from "./editable-dom-paint.js";
|
|
43
|
+
import { toRanges } from "./engine.js";
|
|
43
44
|
import {
|
|
44
45
|
highlightRules,
|
|
45
46
|
highlightRulesFromPalette,
|
|
@@ -49,7 +50,6 @@
|
|
|
49
50
|
reparseIncremental,
|
|
50
51
|
} from "./incremental-tokenize.js";
|
|
51
52
|
import { ensureRegistered, registry } from "./registry.js";
|
|
52
|
-
import { splitLines } from "./split-lines.js";
|
|
53
53
|
import { diffText } from "./text-diff.js";
|
|
54
54
|
|
|
55
55
|
const dispatch = createEventDispatcher();
|
|
@@ -80,6 +80,10 @@
|
|
|
80
80
|
/** @type {import("./incremental-tokenize.js").IncrementalParse | undefined} */
|
|
81
81
|
let incrementalParse;
|
|
82
82
|
|
|
83
|
+
// DOM-engine line HTML: pure appends feed a stream session so renderHtml is
|
|
84
|
+
// not re-run over the whole document on every keystroke.
|
|
85
|
+
const domLinePainter = createDomLinePainter({ registry });
|
|
86
|
+
|
|
83
87
|
function getEvents() {
|
|
84
88
|
incrementalParse = incrementalParse
|
|
85
89
|
? reparseIncremental(registry, language.name, incrementalParse, code)
|
|
@@ -455,10 +459,11 @@
|
|
|
455
459
|
|
|
456
460
|
function paint() {
|
|
457
461
|
if (resolvedEngineValue === "css-highlights") return paintCssHighlights();
|
|
458
|
-
const
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
+
const events = getEvents();
|
|
463
|
+
return renderLines(
|
|
464
|
+
domLinePainter.paint(events, code, language.name),
|
|
465
|
+
setHtml,
|
|
466
|
+
);
|
|
462
467
|
}
|
|
463
468
|
|
|
464
469
|
function renderAt(start, end) {
|
|
@@ -485,6 +490,8 @@
|
|
|
485
490
|
}
|
|
486
491
|
|
|
487
492
|
function repaintForLanguageChange() {
|
|
493
|
+
incrementalParse = undefined;
|
|
494
|
+
domLinePainter.reset();
|
|
488
495
|
const caret = document.activeElement === editor ? getCaretOffset() : null;
|
|
489
496
|
if (caret == null) paint();
|
|
490
497
|
else renderAt(caret, caret);
|
package/HighlightStream.svelte
CHANGED
|
@@ -28,9 +28,39 @@
|
|
|
28
28
|
*/
|
|
29
29
|
export let autoScroll = false;
|
|
30
30
|
|
|
31
|
+
/**
|
|
32
|
+
* Render only the lines within the scrolled viewport (plus `overscan`)
|
|
33
|
+
* instead of the whole growing buffer, so a long-running stream costs a
|
|
34
|
+
* bounded number of DOM nodes instead of one per line. Backed by
|
|
35
|
+
* `createTokenizedDocument` rather than the default sealed-chunk session,
|
|
36
|
+
* so output always reflects the streaming (non-canonicalized) parse, even
|
|
37
|
+
* once `done` - the same tradeoff `HighlightVirtual` makes. `on:highlight`
|
|
38
|
+
* is not dispatched in this mode, since materializing the full HTML on
|
|
39
|
+
* every repaint would defeat the point of windowing.
|
|
40
|
+
* @type {boolean}
|
|
41
|
+
*/
|
|
42
|
+
export let virtualize = false;
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* Extra lines rendered above and below the viewport when `virtualize` is
|
|
46
|
+
* set.
|
|
47
|
+
* @type {number}
|
|
48
|
+
*/
|
|
49
|
+
export let overscan = 12;
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* Lines between engine checkpoints when `virtualize` is set (forwarded to
|
|
53
|
+
* `createTokenizedDocument`).
|
|
54
|
+
* @type {number}
|
|
55
|
+
*/
|
|
56
|
+
export let checkpointInterval = 100;
|
|
57
|
+
|
|
31
58
|
import { createEventDispatcher, onMount, tick } from "svelte";
|
|
32
59
|
import { extendLines } from "./engine.js";
|
|
33
60
|
import { ensureRegistered, registry } from "./registry.js";
|
|
61
|
+
import { createCompletedHtmlBuffer } from "./stream-highlighted.js";
|
|
62
|
+
import { createTokenizedDocument } from "./tokenized-document.js";
|
|
63
|
+
import { watchLineHeight, windowRange } from "./virtual-window.js";
|
|
34
64
|
|
|
35
65
|
// Lines between sealed chunks. Once a chunk fills, its line spans are
|
|
36
66
|
// joined into one immutable HTML string and never touched again - keyed
|
|
@@ -59,6 +89,28 @@
|
|
|
59
89
|
// Stick to bottom until the user scrolls away from it.
|
|
60
90
|
let stickToBottom = true;
|
|
61
91
|
|
|
92
|
+
// `virtualize` state: a random-access tokenized document (rather than the
|
|
93
|
+
// sealed-chunk session above) windowed the same way `HighlightVirtual`
|
|
94
|
+
// windows a static document.
|
|
95
|
+
/** @type {HTMLElement} */
|
|
96
|
+
let probe;
|
|
97
|
+
let vLineHeight = 16;
|
|
98
|
+
let vScrollTop = 0;
|
|
99
|
+
let vClientHeight = 0;
|
|
100
|
+
/** @type {ReturnType<typeof requestAnimationFrame> | undefined} */
|
|
101
|
+
let vFrame;
|
|
102
|
+
/** @type {ResizeObserver | undefined} */
|
|
103
|
+
let resizeObserver;
|
|
104
|
+
/** @type {ReturnType<typeof createTokenizedDocument> | undefined} */
|
|
105
|
+
let vdoc;
|
|
106
|
+
let vdocLanguageName = "";
|
|
107
|
+
let vdocCheckpointInterval;
|
|
108
|
+
let vLineCount = 0;
|
|
109
|
+
let vStart = 0;
|
|
110
|
+
let vEnd = 0;
|
|
111
|
+
/** @type {string[]} */
|
|
112
|
+
let vVisibleLines = [];
|
|
113
|
+
|
|
62
114
|
/** @type {ReturnType<typeof registry.createSession> | undefined} */
|
|
63
115
|
let session;
|
|
64
116
|
let sessionLanguageName = "";
|
|
@@ -75,13 +127,15 @@
|
|
|
75
127
|
// Sealed (finished, immutable) chunks of `SEAL_CHUNK_LINES` line spans
|
|
76
128
|
// each, pre-joined into one HTML string apiece - `sealedChunks` is never
|
|
77
129
|
// mutated in place, only appended to, and past entries are never rebuilt.
|
|
78
|
-
// `sealedHtml` mirrors the same sealed prefix as plain (wrapper-free) HTML,
|
|
79
|
-
// appended once per sealed chunk, so `highlighted` below is O(tail) per
|
|
80
|
-
// repaint instead of rejoining every line streamed so far.
|
|
81
130
|
/** @type {string[]} */
|
|
82
131
|
let sealedChunks = [];
|
|
83
|
-
let sealedHtml = "";
|
|
84
132
|
let sealedLineCount = 0;
|
|
133
|
+
// Append-only completed line HTML for the `highlight` event payload.
|
|
134
|
+
// Completed lines are concatenated once as they finalize (O(n) over the
|
|
135
|
+
// stream). Each repaint still assembles `highlighted = completed + preview`
|
|
136
|
+
// so `on:highlight` stays live mid-line; that concat copies the completed
|
|
137
|
+
// string but avoids rebuilding it from sealed DOM chunks.
|
|
138
|
+
const completedHtml = createCompletedHtmlBuffer();
|
|
85
139
|
// Completed lines not yet folded into a sealed chunk - bounded by
|
|
86
140
|
// `SEAL_CHUNK_LINES`, so touching it every repaint stays O(1).
|
|
87
141
|
/** @type {string[]} */
|
|
@@ -106,8 +160,8 @@
|
|
|
106
160
|
finalizedOpenScopes = [];
|
|
107
161
|
renderedCommittedCount = 0;
|
|
108
162
|
sealedChunks = [];
|
|
109
|
-
sealedHtml = "";
|
|
110
163
|
sealedLineCount = 0;
|
|
164
|
+
completedHtml.reset();
|
|
111
165
|
unsealedLines = [];
|
|
112
166
|
tailLines = [];
|
|
113
167
|
}
|
|
@@ -119,15 +173,13 @@
|
|
|
119
173
|
function sealChunk() {
|
|
120
174
|
const chunkLines = unsealedLines.slice(0, SEAL_CHUNK_LINES);
|
|
121
175
|
let domHtml = "";
|
|
122
|
-
let plainHtml = "";
|
|
123
176
|
for (let li = 0; li < chunkLines.length; li++) {
|
|
124
177
|
const i = sealedLineCount + li;
|
|
125
178
|
const sep = i > 0 ? "\n" : "";
|
|
126
179
|
domHtml += `${sep}<span class="highlight-stream-line" data-line="${i}">${chunkLines[li]}</span>`;
|
|
127
|
-
plainHtml += sep + chunkLines[li];
|
|
128
180
|
}
|
|
129
|
-
sealedChunks
|
|
130
|
-
|
|
181
|
+
sealedChunks.push(domHtml);
|
|
182
|
+
sealedChunks = sealedChunks;
|
|
131
183
|
sealedLineCount += chunkLines.length;
|
|
132
184
|
unsealedLines = unsealedLines.slice(SEAL_CHUNK_LINES);
|
|
133
185
|
}
|
|
@@ -152,6 +204,7 @@
|
|
|
152
204
|
finalizedPendingHtml,
|
|
153
205
|
);
|
|
154
206
|
if (result.completedLines.length > 0) {
|
|
207
|
+
completedHtml.appendLines(result.completedLines);
|
|
155
208
|
unsealedLines = unsealedLines.concat(result.completedLines);
|
|
156
209
|
while (unsealedLines.length >= SEAL_CHUNK_LINES) sealChunk();
|
|
157
210
|
}
|
|
@@ -174,8 +227,14 @@
|
|
|
174
227
|
}
|
|
175
228
|
|
|
176
229
|
tailLines = [...unsealedLines, ...previewLines];
|
|
230
|
+
|
|
231
|
+
// Always assemble a live event payload (including mid-line preview).
|
|
232
|
+
// Trailing empty preview keeps a final `\n` when the stream ends a line.
|
|
233
|
+
const completed = completedHtml.toString();
|
|
177
234
|
highlighted =
|
|
178
|
-
|
|
235
|
+
completedHtml.lineCount === 0
|
|
236
|
+
? previewLines.join("\n")
|
|
237
|
+
: `${completed}\n${previewLines.join("\n")}`;
|
|
179
238
|
}
|
|
180
239
|
|
|
181
240
|
dispatch("highlight", { highlighted });
|
|
@@ -196,6 +255,7 @@
|
|
|
196
255
|
const gap =
|
|
197
256
|
container.scrollHeight - container.scrollTop - container.clientHeight;
|
|
198
257
|
stickToBottom = gap <= 4;
|
|
258
|
+
if (virtualize) scheduleVirtualRepaint();
|
|
199
259
|
}
|
|
200
260
|
|
|
201
261
|
function cancelFrame() {
|
|
@@ -214,10 +274,94 @@
|
|
|
214
274
|
});
|
|
215
275
|
}
|
|
216
276
|
|
|
277
|
+
function ensureVirtualDoc() {
|
|
278
|
+
if (
|
|
279
|
+
vdoc &&
|
|
280
|
+
vdocLanguageName === language.name &&
|
|
281
|
+
vdocCheckpointInterval === checkpointInterval
|
|
282
|
+
) {
|
|
283
|
+
return;
|
|
284
|
+
}
|
|
285
|
+
vdoc = createTokenizedDocument({ language, checkpointInterval });
|
|
286
|
+
vdocLanguageName = language.name;
|
|
287
|
+
vdocCheckpointInterval = checkpointInterval;
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
function computeVirtualWindow() {
|
|
291
|
+
if (!vdoc) return;
|
|
292
|
+
const total = vdoc.lineCount();
|
|
293
|
+
vLineCount = total;
|
|
294
|
+
({ start: vStart, end: vEnd } = windowRange({
|
|
295
|
+
scrollTop: vScrollTop,
|
|
296
|
+
clientHeight: vClientHeight,
|
|
297
|
+
lineHeight: vLineHeight,
|
|
298
|
+
overscan,
|
|
299
|
+
total,
|
|
300
|
+
}));
|
|
301
|
+
vVisibleLines = vdoc.lineRange(vStart, vEnd);
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
// Mirrors `scrollToBottom`/the shrink-clamp in `HighlightVirtual`, merged:
|
|
305
|
+
// while streaming with `autoScroll`, stick to the (growing) bottom; once
|
|
306
|
+
// the user scrolls away, just keep the scroll position in bounds.
|
|
307
|
+
async function syncVirtualFromContainer() {
|
|
308
|
+
await tick();
|
|
309
|
+
if (!container) return;
|
|
310
|
+
if (autoScroll && stickToBottom) {
|
|
311
|
+
container.scrollTop = container.scrollHeight;
|
|
312
|
+
} else {
|
|
313
|
+
const maxScrollTop = Math.max(
|
|
314
|
+
0,
|
|
315
|
+
container.scrollHeight - container.clientHeight,
|
|
316
|
+
);
|
|
317
|
+
if (container.scrollTop > maxScrollTop) {
|
|
318
|
+
container.scrollTop = maxScrollTop;
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
vScrollTop = container.scrollTop;
|
|
322
|
+
vClientHeight = container.clientHeight;
|
|
323
|
+
}
|
|
324
|
+
|
|
325
|
+
function cancelVirtualFrame() {
|
|
326
|
+
if (vFrame != null) {
|
|
327
|
+
cancelAnimationFrame(vFrame);
|
|
328
|
+
vFrame = undefined;
|
|
329
|
+
}
|
|
330
|
+
}
|
|
331
|
+
|
|
332
|
+
// Coalesce scroll bursts into one window recompute per frame.
|
|
333
|
+
function scheduleVirtualRepaint() {
|
|
334
|
+
if (vFrame != null) return;
|
|
335
|
+
vFrame = requestAnimationFrame(() => {
|
|
336
|
+
vFrame = undefined;
|
|
337
|
+
if (container) vScrollTop = container.scrollTop;
|
|
338
|
+
});
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
function measureVirtualLineHeight() {
|
|
342
|
+
return watchLineHeight(
|
|
343
|
+
() => probe,
|
|
344
|
+
() => vLineHeight,
|
|
345
|
+
(height) => (vLineHeight = height),
|
|
346
|
+
);
|
|
347
|
+
}
|
|
348
|
+
|
|
217
349
|
$: {
|
|
218
350
|
void code;
|
|
219
351
|
void language;
|
|
220
|
-
if (
|
|
352
|
+
if (virtualize) {
|
|
353
|
+
// Content/window updates are handled by the virtualize-specific
|
|
354
|
+
// reactive blocks below; this block only tracks `done` dispatch so
|
|
355
|
+
// both modes share the same guard/reset semantics.
|
|
356
|
+
if (mounted && done) {
|
|
357
|
+
if (!doneDispatched) {
|
|
358
|
+
doneDispatched = true;
|
|
359
|
+
dispatch("done");
|
|
360
|
+
}
|
|
361
|
+
} else {
|
|
362
|
+
doneDispatched = false;
|
|
363
|
+
}
|
|
364
|
+
} else if (mounted && !done) {
|
|
221
365
|
doneDispatched = false;
|
|
222
366
|
scheduleRepaint();
|
|
223
367
|
} else {
|
|
@@ -231,20 +375,99 @@
|
|
|
231
375
|
}
|
|
232
376
|
}
|
|
233
377
|
|
|
378
|
+
// Rebuilds/updates the virtualized document whenever its content or shape
|
|
379
|
+
// changes. Deliberately separate from the scroll-driven block below, same
|
|
380
|
+
// reasoning as `HighlightVirtual`.
|
|
381
|
+
$: if (virtualize && mounted) {
|
|
382
|
+
void code;
|
|
383
|
+
void language;
|
|
384
|
+
void checkpointInterval;
|
|
385
|
+
ensureVirtualDoc();
|
|
386
|
+
vdoc.setCode(code);
|
|
387
|
+
vLineCount = vdoc.lineCount();
|
|
388
|
+
computeVirtualWindow();
|
|
389
|
+
syncVirtualFromContainer();
|
|
390
|
+
}
|
|
391
|
+
|
|
392
|
+
// Scroll/resize/overscan/lineHeight-driven window recompute.
|
|
393
|
+
$: if (virtualize && mounted) {
|
|
394
|
+
void overscan;
|
|
395
|
+
void vLineHeight;
|
|
396
|
+
void vScrollTop;
|
|
397
|
+
void vClientHeight;
|
|
398
|
+
void vLineCount;
|
|
399
|
+
computeVirtualWindow();
|
|
400
|
+
}
|
|
401
|
+
|
|
234
402
|
$: useSplitRendering = mounted && !done;
|
|
235
403
|
$: showCaret = useSplitRendering && caret;
|
|
236
404
|
|
|
237
405
|
onMount(() => {
|
|
238
406
|
mounted = true;
|
|
239
|
-
|
|
407
|
+
if (virtualize) {
|
|
408
|
+
measureVirtualLineHeight();
|
|
409
|
+
syncVirtualFromContainer();
|
|
410
|
+
if (typeof ResizeObserver !== "undefined" && container) {
|
|
411
|
+
resizeObserver = new ResizeObserver(() => {
|
|
412
|
+
if (container) vClientHeight = container.clientHeight;
|
|
413
|
+
});
|
|
414
|
+
resizeObserver.observe(container);
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
return () => {
|
|
418
|
+
cancelFrame();
|
|
419
|
+
cancelVirtualFrame();
|
|
420
|
+
resizeObserver?.disconnect();
|
|
421
|
+
};
|
|
240
422
|
});
|
|
241
423
|
</script>
|
|
242
424
|
|
|
243
|
-
|
|
425
|
+
{#if virtualize}
|
|
426
|
+
<pre
|
|
427
|
+
bind:this={container}
|
|
428
|
+
class:hljs={true}
|
|
429
|
+
class:shl-virtual={true}
|
|
430
|
+
on:scroll={onScroll}
|
|
431
|
+
{...$$restProps}
|
|
432
|
+
><code>{#if !mounted}{code}{:else}<span class="shl-virtual-sizer" style="height: {vLineCount * vLineHeight}px;"><span class="shl-virtual-window" style="transform: translateY({vStart * vLineHeight}px);">{#each vVisibleLines as line, i (vStart + i)}<span class="highlight-stream-line" data-line={vStart + i}>{@html line}</span>{#if showCaret && vEnd === vLineCount && i === vVisibleLines.length - 1}<span class="highlight-stream-caret" aria-hidden="true"></span>{/if}{"\n"}{/each}</span></span>{/if}</code><span
|
|
433
|
+
bind:this={probe}
|
|
434
|
+
class="shl-virtual-probe highlight-stream-line"
|
|
435
|
+
aria-hidden="true"
|
|
436
|
+
> </span></pre>
|
|
437
|
+
{:else}
|
|
438
|
+
<pre bind:this={container} on:scroll={onScroll} {...$$restProps}><code
|
|
244
439
|
class:hljs={true}
|
|
245
440
|
>{#if useSplitRendering}{#each sealedChunks as chunk, c (c)}{@html chunk}{/each}{#each tailLines as line, li (sealedLineCount + li)}{#if sealedLineCount + li > 0}{"\n"}{/if}<span class="highlight-stream-line" data-line={sealedLineCount + li}>{@html line}</span>{/each}{#if showCaret}<span class="highlight-stream-caret" aria-hidden="true"></span>{/if}{:else}{@html highlighted}{/if}</code></pre>
|
|
441
|
+
{/if}
|
|
246
442
|
|
|
247
443
|
<style>
|
|
444
|
+
.shl-virtual {
|
|
445
|
+
display: block;
|
|
446
|
+
position: relative;
|
|
447
|
+
overflow: auto;
|
|
448
|
+
white-space: pre;
|
|
449
|
+
margin: 0;
|
|
450
|
+
}
|
|
451
|
+
|
|
452
|
+
.shl-virtual-sizer {
|
|
453
|
+
display: block;
|
|
454
|
+
position: relative;
|
|
455
|
+
}
|
|
456
|
+
|
|
457
|
+
.shl-virtual-window {
|
|
458
|
+
display: block;
|
|
459
|
+
position: absolute;
|
|
460
|
+
top: 0;
|
|
461
|
+
left: 0;
|
|
462
|
+
right: 0;
|
|
463
|
+
}
|
|
464
|
+
|
|
465
|
+
.shl-virtual-probe {
|
|
466
|
+
position: absolute;
|
|
467
|
+
visibility: hidden;
|
|
468
|
+
pointer-events: none;
|
|
469
|
+
}
|
|
470
|
+
|
|
248
471
|
.highlight-stream-caret {
|
|
249
472
|
display: inline-block;
|
|
250
473
|
width: var(--caret-width, 0.6em);
|
|
@@ -37,6 +37,31 @@ export type HighlightStreamProps = HTMLAttributes<HTMLPreElement> & {
|
|
|
37
37
|
*/
|
|
38
38
|
autoScroll?: boolean;
|
|
39
39
|
|
|
40
|
+
/**
|
|
41
|
+
* Render only the lines within the scrolled viewport (plus `overscan`)
|
|
42
|
+
* instead of the whole growing buffer, so a long-running stream costs a
|
|
43
|
+
* bounded number of DOM nodes instead of one per line. Backed by
|
|
44
|
+
* `createTokenizedDocument` rather than the sealed-chunk session used
|
|
45
|
+
* otherwise, so output always reflects the streaming (non-canonicalized)
|
|
46
|
+
* parse, even once `done` -- the same tradeoff `HighlightVirtual` makes.
|
|
47
|
+
* `on:highlight` is not dispatched in this mode.
|
|
48
|
+
* @default false
|
|
49
|
+
*/
|
|
50
|
+
virtualize?: boolean;
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* Extra lines rendered above and below the viewport when `virtualize` is set.
|
|
54
|
+
* @default 12
|
|
55
|
+
*/
|
|
56
|
+
overscan?: number;
|
|
57
|
+
|
|
58
|
+
/**
|
|
59
|
+
* Lines between engine checkpoints when `virtualize` is set (forwarded to
|
|
60
|
+
* `createTokenizedDocument`).
|
|
61
|
+
* @default 100
|
|
62
|
+
*/
|
|
63
|
+
checkpointInterval?: number;
|
|
64
|
+
|
|
40
65
|
/**
|
|
41
66
|
* Width of the blinking caret.
|
|
42
67
|
* @default "0.6em"
|
package/HighlightVirtual.svelte
CHANGED
|
@@ -23,6 +23,7 @@
|
|
|
23
23
|
|
|
24
24
|
import { onMount, tick } from "svelte";
|
|
25
25
|
import { createTokenizedDocument } from "./tokenized-document.js";
|
|
26
|
+
import { watchLineHeight, windowRange } from "./virtual-window.js";
|
|
26
27
|
|
|
27
28
|
/** @type {HTMLElement} */
|
|
28
29
|
let container;
|
|
@@ -78,13 +79,13 @@
|
|
|
78
79
|
if (!doc) return;
|
|
79
80
|
const total = doc.lineCount();
|
|
80
81
|
lineCount = total;
|
|
81
|
-
|
|
82
|
-
|
|
82
|
+
({ start, end } = windowRange({
|
|
83
|
+
scrollTop,
|
|
84
|
+
clientHeight,
|
|
85
|
+
lineHeight,
|
|
86
|
+
overscan,
|
|
83
87
|
total,
|
|
84
|
-
|
|
85
|
-
);
|
|
86
|
-
start = Math.min(first, total);
|
|
87
|
-
end = Math.max(start, last);
|
|
88
|
+
}));
|
|
88
89
|
visibleLines = doc.lineRange(start, end);
|
|
89
90
|
}
|
|
90
91
|
|
|
@@ -124,20 +125,12 @@
|
|
|
124
125
|
scheduleRepaint();
|
|
125
126
|
}
|
|
126
127
|
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
if (typeof document !== "undefined" && document.fonts?.ready) {
|
|
134
|
-
document.fonts.ready.then(async () => {
|
|
135
|
-
await tick();
|
|
136
|
-
if (!probe) return;
|
|
137
|
-
const height = probe.getBoundingClientRect().height;
|
|
138
|
-
if (height > 0 && height !== lineHeight) lineHeight = height;
|
|
139
|
-
});
|
|
140
|
-
}
|
|
128
|
+
function measureLineHeight() {
|
|
129
|
+
return watchLineHeight(
|
|
130
|
+
() => probe,
|
|
131
|
+
() => lineHeight,
|
|
132
|
+
(height) => (lineHeight = height),
|
|
133
|
+
);
|
|
141
134
|
}
|
|
142
135
|
|
|
143
136
|
// Rebuilds/updates the document whenever its content or shape changes.
|
package/LICENSE.highlight.txt
CHANGED
|
@@ -2,7 +2,7 @@ Third-party notice
|
|
|
2
2
|
==================
|
|
3
3
|
|
|
4
4
|
svelte-highlight ships grammar definitions derived from highlight.js
|
|
5
|
-
11.
|
|
5
|
+
11.12.0 (https://github.com/highlightjs/highlight.js), used under the
|
|
6
6
|
BSD-3-Clause license below. Each derived grammar module carries a banner
|
|
7
7
|
pointing back to this file. The svelte-highlight engine itself and all
|
|
8
8
|
custom (non-hljs-derived) grammars are original code under this package's
|
package/README.md
CHANGED
|
@@ -1379,7 +1379,13 @@ Set `autoScroll` to keep the container pinned to the bottom as output grows -- i
|
|
|
1379
1379
|
<HighlightStream language={typescript} {code} {done} autoScroll style="max-height: 20em; overflow-y: auto;" />
|
|
1380
1380
|
```
|
|
1381
1381
|
|
|
1382
|
-
Per-chunk work is O(tail), not O(stream length so far): finished output is sealed into immutable chunks the DOM never re-diffs, so a response that's ten times longer doesn't cost ten times more per repaint. DOM updates stay proportional to the changed lines -- fine for chat-sized output up to very long responses,
|
|
1382
|
+
Per-chunk work is O(tail), not O(stream length so far): finished output is sealed into immutable chunks the DOM never re-diffs, so a response that's ten times longer doesn't cost ten times more per repaint. DOM updates stay proportional to the changed lines -- fine for chat-sized output up to very long responses, but every line ever streamed still stays in the DOM; for a stream that runs long enough to *scroll* through, set `virtualize` to bound that too.
|
|
1383
|
+
|
|
1384
|
+
```svelte
|
|
1385
|
+
<HighlightStream language={typescript} {code} {done} virtualize style="height: 20em;" />
|
|
1386
|
+
```
|
|
1387
|
+
|
|
1388
|
+
`virtualize` renders only the lines within the scrolled viewport (plus `overscan`), the same windowing `HighlightVirtual` does for static documents -- a stream that runs to tens of thousands of lines still costs a couple dozen DOM nodes. It swaps the sealed-chunk session for `TokenizedDocument` (see [Large documents](#large-documents) below), so output always reflects the streaming (non-canonicalized) parse, even once `done` -- unlike the default mode, which upgrades to a canonical final render. `on:highlight` isn't dispatched in this mode, since materializing the full HTML on every repaint would defeat the point of windowing; `on:done`, the caret, and `autoScroll` all keep working.
|
|
1383
1389
|
|
|
1384
1390
|
## Large documents
|
|
1385
1391
|
|
|
@@ -1737,19 +1743,22 @@ Use `bind:this`, then call `undo()`, `redo()`, `focus()`, `selectAll()`, `insert
|
|
|
1737
1743
|
|
|
1738
1744
|
#### Props
|
|
1739
1745
|
|
|
1740
|
-
| Name
|
|
1741
|
-
|
|
|
1742
|
-
| code
|
|
1743
|
-
| language
|
|
1744
|
-
| done
|
|
1745
|
-
| caret
|
|
1746
|
-
| autoScroll
|
|
1746
|
+
| Name | Type | Default value |
|
|
1747
|
+
| :----------------- | :-------------------------------------- | :------------- |
|
|
1748
|
+
| code | `string` | `""` |
|
|
1749
|
+
| language | { name: `string`; register: `object` } | N/A (required) |
|
|
1750
|
+
| done | `boolean` | `false` |
|
|
1751
|
+
| caret | `boolean` | `true` |
|
|
1752
|
+
| autoScroll | `boolean` | `false` |
|
|
1753
|
+
| virtualize | `boolean` | `false` |
|
|
1754
|
+
| overscan | `number` | `12` |
|
|
1755
|
+
| checkpointInterval | `number` | `100` |
|
|
1747
1756
|
|
|
1748
|
-
`$$restProps` are forwarded to the top-level `pre` element.
|
|
1757
|
+
`$$restProps` are forwarded to the top-level `pre` element. `overscan` and `checkpointInterval` only apply when `virtualize` is set.
|
|
1749
1758
|
|
|
1750
1759
|
#### Dispatched Events
|
|
1751
1760
|
|
|
1752
|
-
- **on:highlight**: fired after each highlight pass, with `{ highlighted }`
|
|
1761
|
+
- **on:highlight**: fired after each highlight pass, with `{ highlighted }` -- not dispatched when `virtualize` is set
|
|
1753
1762
|
- **on:done**: fired after the final full highlight once `done` is set
|
|
1754
1763
|
|
|
1755
1764
|
```svelte
|