Compare commits
3 Commits
e0fd726f02
...
gui-testin
| Author | SHA1 | Date | |
|---|---|---|---|
| fa03714826 | |||
38d26f0028
|
|||
|
462c27e111
|
179
Cargo.lock
generated
179
Cargo.lock
generated
@ -28,6 +28,22 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "accesskit"
|
||||||
|
version = "0.19.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e25ae84c0260bdf5df07796d7cc4882460de26a2b406ec0e6c42461a723b271b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "accesskit_consumer"
|
||||||
|
version = "0.28.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8bfae7c152994a31dc7d99b8eeac7784a919f71d1b306f4b83217e110fd3824c"
|
||||||
|
dependencies = [
|
||||||
|
"accesskit 0.19.0",
|
||||||
|
"hashbrown",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "adler2"
|
name = "adler2"
|
||||||
version = "2.0.0"
|
version = "2.0.0"
|
||||||
@ -143,6 +159,12 @@ dependencies = [
|
|||||||
"windows-sys 0.59.0",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "anyhow"
|
||||||
|
version = "1.0.98"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "arboard"
|
name = "arboard"
|
||||||
version = "3.5.0"
|
version = "3.5.0"
|
||||||
@ -412,7 +434,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
|
checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"termcolor",
|
"termcolor",
|
||||||
"unicode-width",
|
"unicode-width 0.1.14",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -421,6 +443,16 @@ version = "1.0.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
|
checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "colored"
|
||||||
|
version = "2.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
|
||||||
|
dependencies = [
|
||||||
|
"lazy_static",
|
||||||
|
"windows-sys 0.59.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "combine"
|
name = "combine"
|
||||||
version = "4.6.7"
|
version = "4.6.7"
|
||||||
@ -511,6 +543,25 @@ dependencies = [
|
|||||||
"cfg-if",
|
"cfg-if",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossbeam-deque"
|
||||||
|
version = "0.8.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
|
||||||
|
dependencies = [
|
||||||
|
"crossbeam-epoch",
|
||||||
|
"crossbeam-utils",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossbeam-epoch"
|
||||||
|
version = "0.9.18"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
|
||||||
|
dependencies = [
|
||||||
|
"crossbeam-utils",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "crossbeam-utils"
|
name = "crossbeam-utils"
|
||||||
version = "0.8.21"
|
version = "0.8.21"
|
||||||
@ -535,6 +586,19 @@ version = "0.3.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
|
checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "dify"
|
||||||
|
version = "0.7.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "11217d469eafa3b809ad84651eb9797ccbb440b4a916d5d85cb1b994e89787f6"
|
||||||
|
dependencies = [
|
||||||
|
"anyhow",
|
||||||
|
"colored",
|
||||||
|
"getopts",
|
||||||
|
"image",
|
||||||
|
"rayon",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dispatch"
|
name = "dispatch"
|
||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
@ -638,6 +702,7 @@ dependencies = [
|
|||||||
"objc2-foundation 0.2.2",
|
"objc2-foundation 0.2.2",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
|
"pollster",
|
||||||
"profiling",
|
"profiling",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
"ron",
|
"ron",
|
||||||
@ -647,6 +712,7 @@ dependencies = [
|
|||||||
"wasm-bindgen-futures",
|
"wasm-bindgen-futures",
|
||||||
"web-sys",
|
"web-sys",
|
||||||
"web-time",
|
"web-time",
|
||||||
|
"wgpu",
|
||||||
"winapi",
|
"winapi",
|
||||||
"windows-sys 0.59.0",
|
"windows-sys 0.59.0",
|
||||||
"winit",
|
"winit",
|
||||||
@ -657,7 +723,7 @@ name = "egui"
|
|||||||
version = "0.31.1"
|
version = "0.31.1"
|
||||||
source = "git+https://github.com/emilk/egui?rev=f2ce6424f3a32f47308fb9871d540c01377b2cd9#f2ce6424f3a32f47308fb9871d540c01377b2cd9"
|
source = "git+https://github.com/emilk/egui?rev=f2ce6424f3a32f47308fb9871d540c01377b2cd9#f2ce6424f3a32f47308fb9871d540c01377b2cd9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"accesskit",
|
"accesskit 0.18.0",
|
||||||
"ahash",
|
"ahash",
|
||||||
"bitflags 2.9.0",
|
"bitflags 2.9.0",
|
||||||
"emath",
|
"emath",
|
||||||
@ -757,6 +823,27 @@ dependencies = [
|
|||||||
"winit",
|
"winit",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "egui_kittest"
|
||||||
|
version = "0.31.1"
|
||||||
|
source = "git+https://github.com/emilk/egui?rev=f2ce6424f3a32f47308fb9871d540c01377b2cd9#f2ce6424f3a32f47308fb9871d540c01377b2cd9"
|
||||||
|
dependencies = [
|
||||||
|
"dify",
|
||||||
|
"eframe",
|
||||||
|
"egui",
|
||||||
|
"egui-wgpu",
|
||||||
|
"image",
|
||||||
|
"kittest",
|
||||||
|
"pollster",
|
||||||
|
"wgpu",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "either"
|
||||||
|
version = "1.15.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "emath"
|
name = "emath"
|
||||||
version = "0.31.1"
|
version = "0.31.1"
|
||||||
@ -989,6 +1076,15 @@ dependencies = [
|
|||||||
"windows-targets 0.48.5",
|
"windows-targets 0.48.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "getopts"
|
||||||
|
version = "0.2.23"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "cba6ae63eb948698e300f645f87c70f76630d505f23b8907cf1e193ee85048c1"
|
||||||
|
dependencies = [
|
||||||
|
"unicode-width 0.2.1",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "getrandom"
|
name = "getrandom"
|
||||||
version = "0.2.16"
|
version = "0.2.16"
|
||||||
@ -1144,6 +1240,18 @@ dependencies = [
|
|||||||
"bitflags 2.9.0",
|
"bitflags 2.9.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "gpu-allocator"
|
||||||
|
version = "0.27.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd"
|
||||||
|
dependencies = [
|
||||||
|
"log",
|
||||||
|
"presser",
|
||||||
|
"thiserror 1.0.69",
|
||||||
|
"windows",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpu-descriptor"
|
name = "gpu-descriptor"
|
||||||
version = "0.3.1"
|
version = "0.3.1"
|
||||||
@ -1411,6 +1519,7 @@ dependencies = [
|
|||||||
"egui",
|
"egui",
|
||||||
"egui_extras",
|
"egui_extras",
|
||||||
"egui_glow 0.31.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"egui_glow 0.31.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"egui_kittest",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"eyre",
|
"eyre",
|
||||||
"getrandom 0.3.2",
|
"getrandom 0.3.2",
|
||||||
@ -1532,6 +1641,16 @@ version = "3.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
|
checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "kittest"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "git+https://github.com/rerun-io/kittest?branch=main#91bf0fd98b5afe04427bb3aea4c68c6e0034b4bd"
|
||||||
|
dependencies = [
|
||||||
|
"accesskit 0.19.0",
|
||||||
|
"accesskit_consumer",
|
||||||
|
"parking_lot",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "kurbo"
|
name = "kurbo"
|
||||||
version = "0.9.5"
|
version = "0.9.5"
|
||||||
@ -1541,6 +1660,12 @@ dependencies = [
|
|||||||
"arrayvec",
|
"arrayvec",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "lazy_static"
|
||||||
|
version = "1.5.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.172"
|
version = "0.2.172"
|
||||||
@ -2245,6 +2370,12 @@ dependencies = [
|
|||||||
"windows-sys 0.59.0",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pollster"
|
||||||
|
version = "0.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "portable-atomic"
|
name = "portable-atomic"
|
||||||
version = "1.11.0"
|
version = "1.11.0"
|
||||||
@ -2269,6 +2400,12 @@ dependencies = [
|
|||||||
"zerocopy 0.8.25",
|
"zerocopy 0.8.25",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "presser"
|
||||||
|
version = "0.3.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro-crate"
|
name = "proc-macro-crate"
|
||||||
version = "3.3.0"
|
version = "3.3.0"
|
||||||
@ -2361,12 +2498,38 @@ dependencies = [
|
|||||||
"getrandom 0.3.2",
|
"getrandom 0.3.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "range-alloc"
|
||||||
|
version = "0.1.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "raw-window-handle"
|
name = "raw-window-handle"
|
||||||
version = "0.6.2"
|
version = "0.6.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
|
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rayon"
|
||||||
|
version = "1.10.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
|
||||||
|
dependencies = [
|
||||||
|
"either",
|
||||||
|
"rayon-core",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rayon-core"
|
||||||
|
version = "1.12.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
|
||||||
|
dependencies = [
|
||||||
|
"crossbeam-deque",
|
||||||
|
"crossbeam-utils",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rctree"
|
name = "rctree"
|
||||||
version = "0.5.0"
|
version = "0.5.0"
|
||||||
@ -2962,6 +3125,12 @@ version = "0.1.14"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
|
checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unicode-width"
|
||||||
|
version = "0.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-xid"
|
name = "unicode-xid"
|
||||||
version = "0.2.6"
|
version = "0.2.6"
|
||||||
@ -3313,6 +3482,7 @@ dependencies = [
|
|||||||
"document-features",
|
"document-features",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"log",
|
"log",
|
||||||
|
"naga",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
"profiling",
|
"profiling",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
@ -3360,13 +3530,16 @@ dependencies = [
|
|||||||
"android_system_properties",
|
"android_system_properties",
|
||||||
"arrayvec",
|
"arrayvec",
|
||||||
"ash",
|
"ash",
|
||||||
|
"bit-set",
|
||||||
"bitflags 2.9.0",
|
"bitflags 2.9.0",
|
||||||
|
"block",
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
"cfg_aliases",
|
"cfg_aliases",
|
||||||
"core-graphics-types",
|
"core-graphics-types",
|
||||||
"glow",
|
"glow",
|
||||||
"glutin_wgl_sys",
|
"glutin_wgl_sys",
|
||||||
"gpu-alloc",
|
"gpu-alloc",
|
||||||
|
"gpu-allocator",
|
||||||
"gpu-descriptor",
|
"gpu-descriptor",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"khronos-egl",
|
"khronos-egl",
|
||||||
@ -3381,6 +3554,7 @@ dependencies = [
|
|||||||
"ordered-float",
|
"ordered-float",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
"profiling",
|
"profiling",
|
||||||
|
"range-alloc",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
"renderdoc-sys",
|
"renderdoc-sys",
|
||||||
"rustc-hash",
|
"rustc-hash",
|
||||||
@ -3390,6 +3564,7 @@ dependencies = [
|
|||||||
"web-sys",
|
"web-sys",
|
||||||
"wgpu-types",
|
"wgpu-types",
|
||||||
"windows",
|
"windows",
|
||||||
|
"windows-core",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|||||||
@ -41,9 +41,11 @@ web-sys = "0.3.77"
|
|||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
egui = { git = "https://github.com/emilk/egui", rev = "f2ce6424f3a32f47308fb9871d540c01377b2cd9" }
|
egui = { git = "https://github.com/emilk/egui", rev = "f2ce6424f3a32f47308fb9871d540c01377b2cd9" }
|
||||||
eframe = { git = "https://github.com/emilk/egui", rev = "f2ce6424f3a32f47308fb9871d540c01377b2cd9" }
|
eframe = { git = "https://github.com/emilk/egui", rev = "f2ce6424f3a32f47308fb9871d540c01377b2cd9" }
|
||||||
|
egui_kittest = { git = "https://github.com/emilk/egui", rev = "f2ce6424f3a32f47308fb9871d540c01377b2cd9" }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
insta = { version = "1.43.1", features = ["yaml"] }
|
insta = { version = "1.43.1", features = ["yaml"] }
|
||||||
|
egui_kittest = { version = "0.31", features = ["wgpu", "snapshot"] }
|
||||||
# egui = { path = "../egui/crates/egui" }
|
# egui = { path = "../egui/crates/egui" }
|
||||||
# eframe = { path = "../egui/crates/eframe" }
|
# eframe = { path = "../egui/crates/eframe" }
|
||||||
|
|
||||||
|
|||||||
@ -1,245 +0,0 @@
|
|||||||
use egui::text::{CCursorRange, LayoutJob};
|
|
||||||
|
|
||||||
use crate::easy_mark::easy_mark_parser;
|
|
||||||
|
|
||||||
/// Highlight easymark, memoizing previous output to save CPU.
|
|
||||||
///
|
|
||||||
/// In practice, the highlighter is fast enough not to need any caching.
|
|
||||||
#[derive(Default)]
|
|
||||||
pub struct MemoizedHighlighter {
|
|
||||||
style: egui::Style,
|
|
||||||
code: String,
|
|
||||||
output: LayoutJob,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl MemoizedHighlighter {
|
|
||||||
pub fn highlight(
|
|
||||||
&mut self,
|
|
||||||
egui_style: &egui::Style,
|
|
||||||
code: &str,
|
|
||||||
cursor: Option<CCursorRange>,
|
|
||||||
) -> LayoutJob {
|
|
||||||
if (&self.style, self.code.as_str()) != (egui_style, code) {
|
|
||||||
self.style = egui_style.clone();
|
|
||||||
code.clone_into(&mut self.code);
|
|
||||||
self.output = highlight_easymark(egui_style, code, cursor);
|
|
||||||
}
|
|
||||||
self.output.clone()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn highlight_easymark(
|
|
||||||
egui_style: &egui::Style,
|
|
||||||
mut text: &str,
|
|
||||||
|
|
||||||
// TODO: hide special characters where cursor isn't
|
|
||||||
_cursor: Option<CCursorRange>,
|
|
||||||
) -> LayoutJob {
|
|
||||||
let mut job = LayoutJob::default();
|
|
||||||
let mut style = easy_mark_parser::Style::default();
|
|
||||||
let mut start_of_line = true;
|
|
||||||
|
|
||||||
const CODE_INDENT: f32 = 10.0;
|
|
||||||
|
|
||||||
while !text.is_empty() {
|
|
||||||
if start_of_line && text.starts_with("```") {
|
|
||||||
let astyle = format_from_style(
|
|
||||||
egui_style,
|
|
||||||
&easy_mark_parser::Style {
|
|
||||||
code: true,
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
// Render the initial backticks as spaces
|
|
||||||
text = &text[3..];
|
|
||||||
job.append(" ", CODE_INDENT, astyle.clone());
|
|
||||||
|
|
||||||
match text.find("\n```") {
|
|
||||||
Some(n) => {
|
|
||||||
for line in text[..n + 1].lines() {
|
|
||||||
job.append(line, CODE_INDENT, astyle.clone());
|
|
||||||
job.append("\n", 0.0, astyle.clone());
|
|
||||||
}
|
|
||||||
// Render the final backticks as spaces
|
|
||||||
job.append(" ", CODE_INDENT, astyle);
|
|
||||||
text = &text[n + 4..];
|
|
||||||
}
|
|
||||||
None => {
|
|
||||||
job.append(text, 0.0, astyle.clone());
|
|
||||||
text = "";
|
|
||||||
}
|
|
||||||
};
|
|
||||||
style = Default::default();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if text.starts_with('`') {
|
|
||||||
style.code = true;
|
|
||||||
let end = text[1..]
|
|
||||||
.find(&['`', '\n'][..])
|
|
||||||
.map_or_else(|| text.len(), |i| i + 2);
|
|
||||||
job.append(&text[..end], 0.0, format_from_style(egui_style, &style));
|
|
||||||
text = &text[end..];
|
|
||||||
style.code = false;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
let skip;
|
|
||||||
|
|
||||||
// zero-width space
|
|
||||||
let _zws = "\u{200b}";
|
|
||||||
|
|
||||||
let mut apply_basic_style =
|
|
||||||
|text: &mut &str,
|
|
||||||
style: &mut easy_mark_parser::Style,
|
|
||||||
access: fn(&mut easy_mark_parser::Style) -> &mut bool| {
|
|
||||||
let skip = if *access(style) {
|
|
||||||
// Include the character that is ending this style:
|
|
||||||
job.append(&text[..1], 0.0, format_from_style(egui_style, style));
|
|
||||||
*text = &text[1..];
|
|
||||||
0
|
|
||||||
} else {
|
|
||||||
1
|
|
||||||
};
|
|
||||||
*access(style) ^= true;
|
|
||||||
skip
|
|
||||||
};
|
|
||||||
|
|
||||||
if text.starts_with('*') {
|
|
||||||
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.strong);
|
|
||||||
} else if text.starts_with('/') {
|
|
||||||
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.italics);
|
|
||||||
} else if text.starts_with('_') {
|
|
||||||
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.underline);
|
|
||||||
} else if text.starts_with('$') {
|
|
||||||
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.small);
|
|
||||||
} else if text.starts_with('~') {
|
|
||||||
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.strikethrough);
|
|
||||||
} else if text.starts_with('^') {
|
|
||||||
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.raised);
|
|
||||||
} else if text.starts_with('\\') && text.len() >= 2 {
|
|
||||||
skip = 2;
|
|
||||||
} else if start_of_line && text.starts_with(' ') {
|
|
||||||
// we don't preview indentation, because it is confusing
|
|
||||||
skip = 1;
|
|
||||||
} else if start_of_line && text.starts_with("###### ") {
|
|
||||||
style.heading = true;
|
|
||||||
skip = 7;
|
|
||||||
} else if start_of_line && text.starts_with("##### ") {
|
|
||||||
style.heading = true;
|
|
||||||
skip = 6;
|
|
||||||
} else if start_of_line && text.starts_with("#### ") {
|
|
||||||
style.heading = true;
|
|
||||||
skip = 5;
|
|
||||||
} else if start_of_line && text.starts_with("### ") {
|
|
||||||
style.heading = true;
|
|
||||||
skip = 4;
|
|
||||||
} else if start_of_line && text.starts_with("## ") {
|
|
||||||
style.heading = true;
|
|
||||||
skip = 3;
|
|
||||||
} else if start_of_line && text.starts_with("# ") {
|
|
||||||
style.heading = true;
|
|
||||||
skip = 2;
|
|
||||||
} else if start_of_line && text.starts_with("> ") {
|
|
||||||
style.quoted = true;
|
|
||||||
skip = 2;
|
|
||||||
// we don't preview indentation, because it is confusing
|
|
||||||
} else if start_of_line && text.trim_start().starts_with("- ") {
|
|
||||||
job.append("• ", 0.0, format_from_style(egui_style, &style));
|
|
||||||
text = &text[2..];
|
|
||||||
skip = 0;
|
|
||||||
// we don't preview indentation, because it is confusing
|
|
||||||
} else {
|
|
||||||
skip = 0;
|
|
||||||
}
|
|
||||||
// Note: we don't preview underline, strikethrough and italics because it confuses things.
|
|
||||||
|
|
||||||
// Swallow everything up to the next special character:
|
|
||||||
let line_end = text[skip..]
|
|
||||||
.find('\n')
|
|
||||||
.map_or_else(|| text.len(), |i| (skip + i + 1));
|
|
||||||
let end = text[skip..]
|
|
||||||
.find(&['*', '`', '~', '_', '/', '$', '^', '\\', '<', '['][..])
|
|
||||||
.map_or_else(|| text.len(), |i| (skip + i).max(1));
|
|
||||||
|
|
||||||
if line_end <= end {
|
|
||||||
job.append(
|
|
||||||
&text[..line_end],
|
|
||||||
0.0,
|
|
||||||
format_from_style(egui_style, &style),
|
|
||||||
);
|
|
||||||
text = &text[line_end..];
|
|
||||||
start_of_line = true;
|
|
||||||
style = Default::default();
|
|
||||||
} else {
|
|
||||||
job.append(&text[..end], 0.0, format_from_style(egui_style, &style));
|
|
||||||
text = &text[end..];
|
|
||||||
start_of_line = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
job
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_from_style(
|
|
||||||
egui_style: &egui::Style,
|
|
||||||
emark_style: &easy_mark_parser::Style,
|
|
||||||
) -> egui::text::TextFormat {
|
|
||||||
use egui::{Align, Color32, Stroke, TextStyle};
|
|
||||||
|
|
||||||
let color = if emark_style.code {
|
|
||||||
egui_style.visuals.strong_text_color() * Color32::from_rgb(0x44, 0xff, 0x44)
|
|
||||||
} else if emark_style.strong || emark_style.heading {
|
|
||||||
egui_style.visuals.strong_text_color()
|
|
||||||
} else if emark_style.quoted {
|
|
||||||
egui_style.visuals.weak_text_color()
|
|
||||||
} else {
|
|
||||||
egui_style.visuals.text_color()
|
|
||||||
};
|
|
||||||
|
|
||||||
let text_style = if emark_style.heading {
|
|
||||||
TextStyle::Heading
|
|
||||||
} else if emark_style.code {
|
|
||||||
TextStyle::Monospace
|
|
||||||
} else if emark_style.small | emark_style.raised {
|
|
||||||
TextStyle::Small
|
|
||||||
} else {
|
|
||||||
TextStyle::Body
|
|
||||||
};
|
|
||||||
|
|
||||||
let background = if emark_style.code {
|
|
||||||
egui_style.visuals.code_bg_color
|
|
||||||
} else {
|
|
||||||
Color32::TRANSPARENT
|
|
||||||
};
|
|
||||||
|
|
||||||
let underline = if emark_style.underline {
|
|
||||||
Stroke::new(1.0, color)
|
|
||||||
} else {
|
|
||||||
Stroke::NONE
|
|
||||||
};
|
|
||||||
|
|
||||||
let strikethrough = if emark_style.strikethrough {
|
|
||||||
Stroke::new(1.0, color)
|
|
||||||
} else {
|
|
||||||
Stroke::NONE
|
|
||||||
};
|
|
||||||
|
|
||||||
let valign = if emark_style.raised {
|
|
||||||
Align::TOP
|
|
||||||
} else {
|
|
||||||
Align::BOTTOM
|
|
||||||
};
|
|
||||||
|
|
||||||
egui::text::TextFormat {
|
|
||||||
font_id: text_style.resolve(egui_style),
|
|
||||||
color,
|
|
||||||
background,
|
|
||||||
italics: emark_style.italics,
|
|
||||||
underline,
|
|
||||||
strikethrough,
|
|
||||||
valign,
|
|
||||||
..Default::default()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -170,7 +170,7 @@ impl FileEditor {
|
|||||||
dragger_rect.set_height(item_response.response.rect.height());
|
dragger_rect.set_height(item_response.response.rect.height());
|
||||||
|
|
||||||
// Controls for moving the buffer item
|
// Controls for moving the buffer item
|
||||||
ui.allocate_new_ui(
|
ui.scope_builder(
|
||||||
UiBuilder::new()
|
UiBuilder::new()
|
||||||
.max_rect(dragger_rect)
|
.max_rect(dragger_rect)
|
||||||
.layout(Layout::top_down(Align::Center)),
|
.layout(Layout::top_down(Align::Center)),
|
||||||
|
|||||||
@ -40,7 +40,7 @@ pub struct Style {
|
|||||||
pub raised: bool,
|
pub raised: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub enum MarkdownItem<'a> {
|
pub enum Item<'a> {
|
||||||
Text {
|
Text {
|
||||||
span: Span<'a>,
|
span: Span<'a>,
|
||||||
style: Style,
|
style: Style,
|
||||||
|
|||||||
@ -1,9 +1,6 @@
|
|||||||
use egui::text::{CCursorRange, LayoutJob};
|
use egui::text::{CCursorRange, LayoutJob};
|
||||||
|
|
||||||
use crate::markdown::{
|
use super::{Item, Style, parse};
|
||||||
span::Span,
|
|
||||||
tokenizer::{Heading, Token, TokenKind, tokenize},
|
|
||||||
};
|
|
||||||
|
|
||||||
/// Highlight markdown, caching previous output to save CPU.
|
/// Highlight markdown, caching previous output to save CPU.
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
@ -13,36 +10,6 @@ pub struct MemoizedHighlighter {
|
|||||||
output: LayoutJob,
|
output: LayoutJob,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
|
|
||||||
pub struct Style {
|
|
||||||
/// # heading (large text)
|
|
||||||
pub heading: Option<Heading>,
|
|
||||||
|
|
||||||
/// > quoted (slightly dimmer color or other font style)
|
|
||||||
pub quoted: bool,
|
|
||||||
|
|
||||||
/// `code` (monospace, some other color)
|
|
||||||
pub code: bool,
|
|
||||||
|
|
||||||
/// self.strong* (emphasized, e.g. bold)
|
|
||||||
pub strong: bool,
|
|
||||||
|
|
||||||
/// _underline_
|
|
||||||
pub underline: bool,
|
|
||||||
|
|
||||||
/// ~strikethrough~
|
|
||||||
pub strikethrough: bool,
|
|
||||||
|
|
||||||
/// /italics/
|
|
||||||
pub italics: bool,
|
|
||||||
|
|
||||||
/// $small$
|
|
||||||
pub small: bool,
|
|
||||||
|
|
||||||
/// ^raised^
|
|
||||||
pub raised: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl MemoizedHighlighter {
|
impl MemoizedHighlighter {
|
||||||
pub fn highlight(
|
pub fn highlight(
|
||||||
&mut self,
|
&mut self,
|
||||||
@ -67,189 +34,72 @@ pub fn highlight_markdown(
|
|||||||
_cursor: Option<CCursorRange>,
|
_cursor: Option<CCursorRange>,
|
||||||
) -> LayoutJob {
|
) -> LayoutJob {
|
||||||
let mut job = LayoutJob::default();
|
let mut job = LayoutJob::default();
|
||||||
let mut style = Style::default();
|
|
||||||
|
|
||||||
let mut prev = TokenKind::Newline;
|
let code_style = Style {
|
||||||
|
|
||||||
let tokens: Vec<_> = tokenize(text).collect();
|
|
||||||
let mut tokens = &tokens[..];
|
|
||||||
|
|
||||||
const CODE_INDENT: f32 = 10.0;
|
|
||||||
|
|
||||||
while !tokens.is_empty() {
|
|
||||||
let token = tokens.first().unwrap();
|
|
||||||
tokens = &tokens[1..];
|
|
||||||
|
|
||||||
let start_of_line = prev == TokenKind::Newline;
|
|
||||||
prev = token.kind;
|
|
||||||
|
|
||||||
let mut basic_style: Option<fn(&mut Style) -> &mut bool> = None;
|
|
||||||
|
|
||||||
match token.kind {
|
|
||||||
TokenKind::CodeBlock if start_of_line => {
|
|
||||||
let span = collect_until(
|
|
||||||
token,
|
|
||||||
&mut tokens,
|
|
||||||
series([TokenKind::Newline, TokenKind::CodeBlock]),
|
|
||||||
);
|
|
||||||
|
|
||||||
let code_style = format_from_style(
|
|
||||||
egui_style,
|
|
||||||
&Style {
|
|
||||||
code: true,
|
code: true,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
},
|
};
|
||||||
);
|
|
||||||
|
|
||||||
job.append(&*span, CODE_INDENT, code_style.clone());
|
for item in parse(text) {
|
||||||
style = Default::default();
|
match item {
|
||||||
continue;
|
Item::Text { span, style } => {
|
||||||
|
job.append(&span, 0.0, format_from_style(egui_style, &style));
|
||||||
}
|
}
|
||||||
|
Item::CodeBlock {
|
||||||
TokenKind::Newline => style = Style::default(),
|
all,
|
||||||
|
language: _, // TODO
|
||||||
TokenKind::Strong => basic_style = Some(|s| &mut s.strong),
|
code: _, // TODO
|
||||||
TokenKind::Italic => basic_style = Some(|s| &mut s.italics),
|
} => {
|
||||||
TokenKind::Strikethrough => basic_style = Some(|s| &mut s.strikethrough),
|
job.append(&all, 100.0, format_from_style(egui_style, &code_style));
|
||||||
|
|
||||||
TokenKind::CodeBlock | TokenKind::Mono => {
|
|
||||||
style.code = true;
|
|
||||||
let span = collect_until(
|
|
||||||
token,
|
|
||||||
&mut tokens,
|
|
||||||
any_of([TokenKind::Mono, TokenKind::CodeBlock, TokenKind::Newline]),
|
|
||||||
);
|
|
||||||
job.append(&*span, 0.0, format_from_style(egui_style, &style));
|
|
||||||
style.code = false;
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: different heading strengths
|
|
||||||
TokenKind::Heading(h) if start_of_line => style.heading = Some(h),
|
|
||||||
TokenKind::Quote if start_of_line => style.quoted = true,
|
|
||||||
|
|
||||||
// TODO: indented list entries
|
|
||||||
TokenKind::ListEntry if start_of_line => {
|
|
||||||
job.append("• ", 0.0, format_from_style(egui_style, &style));
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
TokenKind::Text
|
|
||||||
// the following tokens are only richly rendered if encountered e.g. at start_of_line.
|
|
||||||
| TokenKind::Indentation
|
|
||||||
| TokenKind::ListEntry
|
|
||||||
| TokenKind::Heading(..)
|
|
||||||
| TokenKind::Quote => {}
|
|
||||||
}
|
|
||||||
|
|
||||||
// if we encountered a marker for Bold, Italic, or Strikethrough, toggle that style and
|
|
||||||
// render the token with the style enabled.
|
|
||||||
if let Some(basic_style) = basic_style {
|
|
||||||
let mut tmp_style = style;
|
|
||||||
*basic_style(&mut tmp_style) = true;
|
|
||||||
*basic_style(&mut style) ^= true; // toggle
|
|
||||||
job.append(&token.span, 0.0, format_from_style(egui_style, &tmp_style));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
job.append(&token.span, 0.0, format_from_style(egui_style, &style));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
job
|
job
|
||||||
}
|
}
|
||||||
|
|
||||||
fn series<'a, const N: usize>(of: [TokenKind; N]) -> impl FnMut(&[Token<'a>; N]) -> bool {
|
fn format_from_style(egui_style: &egui::Style, style: &Style) -> egui::text::TextFormat {
|
||||||
move |token| {
|
|
||||||
of.iter()
|
|
||||||
.zip(token)
|
|
||||||
.all(|(kind, token)| kind == &token.kind)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn any_of<'a, const N: usize>(these: [TokenKind; N]) -> impl FnMut(&[Token<'a>; 1]) -> bool {
|
|
||||||
move |[token]| these.contains(&token.kind)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Collect all tokens up to and including `pattern`, and merge them into a signle span.
|
|
||||||
///
|
|
||||||
/// `N` determines how many specific and consecutive tokens we are looking for.
|
|
||||||
/// i.e. if we were looking for a [TokenKind::Newline] followed by a [TokenKind::Quote], `N`
|
|
||||||
/// would equal `2`.
|
|
||||||
///
|
|
||||||
/// `pattern` is a function that accepts an array of `N` tokens and returns `true` if they match,
|
|
||||||
/// i.e. if we should stop collecting. [any_of] and [series] can help to construct this function.
|
|
||||||
///
|
|
||||||
/// The collected tokens will be split off the head of the slice referred to by `tokens`.
|
|
||||||
///
|
|
||||||
/// # Panic
|
|
||||||
/// Panics if `tokens` does not contain only consecutive adjacent spans.
|
|
||||||
fn collect_until<'a, const N: usize>(
|
|
||||||
token: &Token<'a>,
|
|
||||||
tokens: &mut &[Token<'a>],
|
|
||||||
pattern: impl FnMut(&[Token<'a>; N]) -> bool,
|
|
||||||
) -> Span<'a>
|
|
||||||
where
|
|
||||||
for<'b> &'b [Token<'a>; N]: TryFrom<&'b [Token<'a>]>,
|
|
||||||
{
|
|
||||||
let mut windows = tokens
|
|
||||||
.windows(N)
|
|
||||||
.map(|slice| <&[Token<'a>; N]>::try_from(slice).ok().unwrap());
|
|
||||||
|
|
||||||
let split_at = match windows.position(pattern) {
|
|
||||||
Some(i) => i + N,
|
|
||||||
None => tokens.len(), // consume everything
|
|
||||||
};
|
|
||||||
|
|
||||||
let (consume, keep) = tokens.split_at(split_at);
|
|
||||||
*tokens = keep;
|
|
||||||
|
|
||||||
consume
|
|
||||||
.iter()
|
|
||||||
.fold(token.span.clone(), |span: Span<'_>, token| {
|
|
||||||
span.try_merge(&token.span).unwrap()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_from_style(egui_style: &egui::Style, emark_style: &Style) -> egui::text::TextFormat {
|
|
||||||
use egui::{Align, Color32, Stroke, TextStyle};
|
use egui::{Align, Color32, Stroke, TextStyle};
|
||||||
|
|
||||||
let color = if emark_style.strong || emark_style.heading.is_some() {
|
let color = if style.code {
|
||||||
|
egui_style.visuals.strong_text_color() * Color32::GREEN
|
||||||
|
} else if style.strong || style.heading.is_some() {
|
||||||
egui_style.visuals.strong_text_color()
|
egui_style.visuals.strong_text_color()
|
||||||
} else if emark_style.quoted {
|
} else if style.quoted {
|
||||||
egui_style.visuals.weak_text_color()
|
egui_style.visuals.weak_text_color()
|
||||||
} else {
|
} else {
|
||||||
egui_style.visuals.text_color()
|
egui_style.visuals.text_color()
|
||||||
};
|
};
|
||||||
|
|
||||||
let text_style = if emark_style.heading.is_some() {
|
let text_style = if style.heading.is_some() {
|
||||||
TextStyle::Heading
|
TextStyle::Heading
|
||||||
} else if emark_style.code {
|
} else if style.code {
|
||||||
TextStyle::Monospace
|
TextStyle::Monospace
|
||||||
} else if emark_style.small | emark_style.raised {
|
} else if style.small | style.raised {
|
||||||
TextStyle::Small
|
TextStyle::Small
|
||||||
} else {
|
} else {
|
||||||
TextStyle::Body
|
TextStyle::Body
|
||||||
};
|
};
|
||||||
|
|
||||||
let background = if emark_style.code {
|
let background = if style.code {
|
||||||
egui_style.visuals.code_bg_color
|
egui_style.visuals.code_bg_color
|
||||||
} else {
|
} else {
|
||||||
Color32::TRANSPARENT
|
Color32::TRANSPARENT
|
||||||
};
|
};
|
||||||
|
|
||||||
let underline = if emark_style.underline {
|
let underline = if style.underline {
|
||||||
Stroke::new(1.0, color)
|
Stroke::new(1.0, color)
|
||||||
} else {
|
} else {
|
||||||
Stroke::NONE
|
Stroke::NONE
|
||||||
};
|
};
|
||||||
|
|
||||||
let strikethrough = if emark_style.strikethrough {
|
let strikethrough = if style.strikethrough {
|
||||||
Stroke::new(1.0, color)
|
Stroke::new(1.0, color)
|
||||||
} else {
|
} else {
|
||||||
Stroke::NONE
|
Stroke::NONE
|
||||||
};
|
};
|
||||||
|
|
||||||
let valign = if emark_style.raised {
|
let valign = if style.raised {
|
||||||
Align::TOP
|
Align::TOP
|
||||||
} else {
|
} else {
|
||||||
Align::BOTTOM
|
Align::BOTTOM
|
||||||
@ -259,7 +109,7 @@ fn format_from_style(egui_style: &egui::Style, emark_style: &Style) -> egui::tex
|
|||||||
font_id: text_style.resolve(egui_style),
|
font_id: text_style.resolve(egui_style),
|
||||||
color,
|
color,
|
||||||
background,
|
background,
|
||||||
italics: emark_style.italics,
|
italics: style.italics,
|
||||||
underline,
|
underline,
|
||||||
strikethrough,
|
strikethrough,
|
||||||
valign,
|
valign,
|
||||||
|
|||||||
@ -1,7 +1,11 @@
|
|||||||
|
mod ast;
|
||||||
mod highlighter;
|
mod highlighter;
|
||||||
|
mod parser;
|
||||||
mod span;
|
mod span;
|
||||||
mod tokenizer;
|
mod tokenizer;
|
||||||
|
|
||||||
|
pub use ast::*;
|
||||||
pub use highlighter::*;
|
pub use highlighter::*;
|
||||||
|
pub use parser::*;
|
||||||
pub use span::*;
|
pub use span::*;
|
||||||
pub use tokenizer::*;
|
pub use tokenizer::*;
|
||||||
|
|||||||
172
src/markdown/parser.rs
Normal file
172
src/markdown/parser.rs
Normal file
@ -0,0 +1,172 @@
|
|||||||
|
use std::iter::{self, once};
|
||||||
|
|
||||||
|
use crate::markdown::Style;
|
||||||
|
|
||||||
|
use super::{Item, Span, Token, TokenKind, tokenize};
|
||||||
|
|
||||||
|
pub fn parse(text: &str) -> Vec<Item<'_>> {
|
||||||
|
let tokens: Vec<_> = tokenize(text).collect();
|
||||||
|
parse_tokens(&tokens)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn parse_tokens<'a>(mut tokens: &[Token<'a>]) -> Vec<Item<'a>> {
|
||||||
|
// pretend that the first token was preceeded by a newline.
|
||||||
|
// means we don't have to handle the first token as a special case.
|
||||||
|
let mut prev = TokenKind::Newline;
|
||||||
|
|
||||||
|
let mut style = Style::default();
|
||||||
|
|
||||||
|
let mono_style = Style {
|
||||||
|
code: true,
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
iter::from_fn(move || {
|
||||||
|
if tokens.is_empty() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
let token = tokens.first().unwrap();
|
||||||
|
tokens = &tokens[1..];
|
||||||
|
|
||||||
|
let start_of_line = prev == TokenKind::Newline;
|
||||||
|
prev = token.kind;
|
||||||
|
|
||||||
|
let mut basic_style: Option<fn(&mut Style) -> &mut bool> = None;
|
||||||
|
|
||||||
|
match token.kind {
|
||||||
|
TokenKind::CodeBlock if start_of_line => {
|
||||||
|
let language = collect_until(
|
||||||
|
None,
|
||||||
|
&mut tokens,
|
||||||
|
any_of([TokenKind::Newline]),
|
||||||
|
);
|
||||||
|
|
||||||
|
let code = collect_until(
|
||||||
|
None,
|
||||||
|
&mut tokens,
|
||||||
|
series([TokenKind::Newline, TokenKind::CodeBlock]),
|
||||||
|
);
|
||||||
|
|
||||||
|
let all = [
|
||||||
|
&token.span,
|
||||||
|
&language,
|
||||||
|
&code,
|
||||||
|
].into_iter().fold(Span::empty(), |a, b| a.try_merge(b).unwrap());
|
||||||
|
|
||||||
|
let language = language.trim_end_matches("\n");
|
||||||
|
let code = code.trim_end_matches("\n```");
|
||||||
|
|
||||||
|
return Some(Item::CodeBlock { all, language, code });
|
||||||
|
}
|
||||||
|
|
||||||
|
TokenKind::Newline => style = Style::default(),
|
||||||
|
|
||||||
|
TokenKind::Strong => basic_style = Some(|s| &mut s.strong),
|
||||||
|
TokenKind::Italic => basic_style = Some(|s| &mut s.italics),
|
||||||
|
TokenKind::Strikethrough => basic_style = Some(|s| &mut s.strikethrough),
|
||||||
|
|
||||||
|
TokenKind::CodeBlock | TokenKind::Mono => {
|
||||||
|
let span = collect_until(
|
||||||
|
Some(token),
|
||||||
|
&mut tokens,
|
||||||
|
any_of([TokenKind::Mono, TokenKind::CodeBlock, TokenKind::Newline]),
|
||||||
|
);
|
||||||
|
|
||||||
|
return Some(Item::Text { span, style: mono_style});
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: different heading strengths
|
||||||
|
TokenKind::Heading(h) if start_of_line => style.heading = Some(h),
|
||||||
|
TokenKind::Quote if start_of_line => style.quoted = true,
|
||||||
|
|
||||||
|
// TODO: replace dashes with dots
|
||||||
|
//// TODO: indented list entries
|
||||||
|
//TokenKind::ListEntry if start_of_line => {
|
||||||
|
// job.append("• ", 0.0, format_from_style(egui_style, &style));
|
||||||
|
// continue;
|
||||||
|
//}
|
||||||
|
|
||||||
|
TokenKind::Text
|
||||||
|
// the following tokens are only richly rendered if encountered e.g. at start_of_line.
|
||||||
|
| TokenKind::Indentation
|
||||||
|
| TokenKind::ListEntry
|
||||||
|
| TokenKind::Heading(..)
|
||||||
|
| TokenKind::Quote => {}
|
||||||
|
}
|
||||||
|
|
||||||
|
// if we encountered a marker for Bold, Italic, or Strikethrough, toggle that style and
|
||||||
|
// render the token with the style enabled.
|
||||||
|
if let Some(basic_style) = basic_style {
|
||||||
|
let mut tmp_style = style;
|
||||||
|
*basic_style(&mut tmp_style) = true;
|
||||||
|
*basic_style(&mut style) ^= true; // toggle
|
||||||
|
return Some(Item::Text {
|
||||||
|
span: token.span.clone(),
|
||||||
|
style: tmp_style,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Some(Item::Text {
|
||||||
|
span: token.span.clone(),
|
||||||
|
style,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn series<'a, const N: usize>(of: [TokenKind; N]) -> impl FnMut(&[Token<'a>; N]) -> bool {
|
||||||
|
move |token| {
|
||||||
|
of.iter()
|
||||||
|
.zip(token)
|
||||||
|
.all(|(kind, token)| kind == &token.kind)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn any_of<'a, const N: usize>(these: [TokenKind; N]) -> impl FnMut(&[Token<'a>; 1]) -> bool {
|
||||||
|
move |[token]| these.contains(&token.kind)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Collect all tokens up to and including `pattern`, and merge them into a signle span.
|
||||||
|
///
|
||||||
|
/// `N` determines how many specific and consecutive tokens we are looking for.
|
||||||
|
/// i.e. if we were looking for a [TokenKind::Newline] followed by a [TokenKind::Quote], `N`
|
||||||
|
/// would equal `2`.
|
||||||
|
///
|
||||||
|
/// `pattern` is a function that accepts an array of `N` tokens and returns `true` if they match,
|
||||||
|
/// i.e. if we should stop collecting. [any_of] and [series] can help to construct this function.
|
||||||
|
///
|
||||||
|
/// The collected tokens will be split off the head of the slice referred to by `tokens`.
|
||||||
|
///
|
||||||
|
/// # Panic
|
||||||
|
/// Panics if `tokens` does not contain only consecutive adjacent spans.
|
||||||
|
fn collect_until<'a, const N: usize>(
|
||||||
|
first_token: Option<&Token<'a>>,
|
||||||
|
tokens: &mut &[Token<'a>],
|
||||||
|
pattern: impl FnMut(&[Token<'a>; N]) -> bool,
|
||||||
|
) -> Span<'a>
|
||||||
|
where
|
||||||
|
// &[T; N]: TryFrom<&[T]>
|
||||||
|
for<'b> &'b [Token<'a>; N]: TryFrom<&'b [Token<'a>]>,
|
||||||
|
{
|
||||||
|
let mut windows = tokens.windows(N).map(|slice| {
|
||||||
|
<&[Token<'a>; N]>::try_from(slice)
|
||||||
|
.ok()
|
||||||
|
.expect("`windows` promises to return slices of length N")
|
||||||
|
});
|
||||||
|
|
||||||
|
let split_at = match windows.position(pattern) {
|
||||||
|
Some(i) => i + N,
|
||||||
|
None => tokens.len(), // consume everything
|
||||||
|
};
|
||||||
|
|
||||||
|
let (consume, keep) = tokens.split_at(split_at);
|
||||||
|
*tokens = keep;
|
||||||
|
|
||||||
|
once(first_token)
|
||||||
|
.flatten()
|
||||||
|
.chain(consume)
|
||||||
|
.fold(Span::empty(), |span: Span<'_>, token| {
|
||||||
|
span.try_merge(&token.span).unwrap()
|
||||||
|
})
|
||||||
|
}
|
||||||
@ -3,6 +3,8 @@ use std::{
|
|||||||
ops::{Deref, Range},
|
ops::{Deref, Range},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
use eyre::{bail, eyre};
|
||||||
|
|
||||||
#[derive(Clone, Eq, PartialEq)]
|
#[derive(Clone, Eq, PartialEq)]
|
||||||
pub struct Span<'a> {
|
pub struct Span<'a> {
|
||||||
complete_str: &'a str,
|
complete_str: &'a str,
|
||||||
@ -17,6 +19,13 @@ impl<'a> Span<'a> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub const fn empty() -> Self {
|
||||||
|
Span {
|
||||||
|
complete_str: "",
|
||||||
|
range: 0..0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn get(&self, slice: Range<usize>) -> Option<Self> {
|
pub fn get(&self, slice: Range<usize>) -> Option<Self> {
|
||||||
let start = self.range.start.checked_add(slice.start)?;
|
let start = self.range.start.checked_add(slice.start)?;
|
||||||
let end = self.range.start.checked_add(slice.end)?;
|
let end = self.range.start.checked_add(slice.end)?;
|
||||||
@ -41,26 +50,49 @@ impl<'a> Span<'a> {
|
|||||||
Some((head, tail))
|
Some((head, tail))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn trim_end_matches(&self, p: &str) -> Self {
|
||||||
|
if !self.ends_with(p) {
|
||||||
|
return self.clone();
|
||||||
|
}
|
||||||
|
|
||||||
|
Self {
|
||||||
|
range: self.range.start..self.range.end - p.len(),
|
||||||
|
complete_str: self.complete_str,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Try to merge the spans.
|
/// Try to merge the spans.
|
||||||
///
|
///
|
||||||
|
/// If either spans is empty, this just returns the other one.
|
||||||
/// This only works if spans are pointing into the same backing buffer, and are adjacent.
|
/// This only works if spans are pointing into the same backing buffer, and are adjacent.
|
||||||
pub fn try_merge(&self, other: &Self) -> Option<Self> {
|
pub fn try_merge(&self, other: &Self) -> eyre::Result<Self> {
|
||||||
|
if self.is_empty() {
|
||||||
|
return Ok(other.clone());
|
||||||
|
}
|
||||||
|
|
||||||
|
if other.is_empty() {
|
||||||
|
return Ok(self.clone());
|
||||||
|
}
|
||||||
|
|
||||||
if self.complete_str.as_ptr() != other.complete_str.as_ptr() {
|
if self.complete_str.as_ptr() != other.complete_str.as_ptr() {
|
||||||
return None;
|
bail!("Can't merge different strings");
|
||||||
}
|
}
|
||||||
|
|
||||||
if self.range.end == other.range.start {
|
if self.range.end == other.range.start {
|
||||||
Some(Self {
|
Ok(Self {
|
||||||
range: self.range.start..other.range.end,
|
range: self.range.start..other.range.end,
|
||||||
..*self
|
..*self
|
||||||
})
|
})
|
||||||
} else if self.range.start == other.range.end {
|
} else if self.range.start == other.range.end {
|
||||||
Some(Self {
|
Ok(Self {
|
||||||
range: other.range.start..self.range.end,
|
range: other.range.start..self.range.end,
|
||||||
..*self
|
..*self
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
None
|
Err(eyre!("String: {:?}", self.complete_str)
|
||||||
|
.wrap_err(eyre!("Span 2: {:?}", other.deref()))
|
||||||
|
.wrap_err(eyre!("Span 1: {:?}", self.deref()))
|
||||||
|
.wrap_err("Can't merge disjoint string spans"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,16 +1,6 @@
|
|||||||
use std::iter;
|
use std::iter;
|
||||||
|
|
||||||
use super::span::Span;
|
use super::{Heading, span::Span};
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
||||||
pub enum Heading {
|
|
||||||
H6,
|
|
||||||
H5,
|
|
||||||
H4,
|
|
||||||
H3,
|
|
||||||
H2,
|
|
||||||
H1,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
pub enum TokenKind {
|
pub enum TokenKind {
|
||||||
|
|||||||
Reference in New Issue
Block a user