Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
mermaid_render: Update merman to `0.8.0-alpha.5` (#62931)
Bennet Bo Fennerec18126b1dbd
diff --git a/Cargo.lock b/Cargo.lockindex 48dfc5468c3..a51b6ab34cb 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -299,7 +299,7 @@ dependencies = ["smallvec","sqlez","streaming_diff",- "strsim 0.11.1",+ "strsim","task","telemetry","tempfile",@@ -805,15 +805,6 @@ version = "1.0.102"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"-[[package]]-name = "approx"-version = "0.4.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"-dependencies = [- "num-traits",-]-[[package]]name = "approx"version = "0.5.1"@@ -897,15 +888,6 @@ version = "1.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"-[[package]]-name = "ascii-canvas"-version = "3.0.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6"-dependencies = [- "term",-]-[[package]]name = "ash"version = "0.38.0+1.3.281"@@ -2126,12 +2108,6 @@ dependencies = ["thiserror 2.0.17",]-[[package]]-name = "beef"-version = "0.5.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"-[[package]]name = "benchmarks"version = "0.1.0"@@ -2225,15 +2201,6 @@ dependencies = ["syn 2.0.117",]-[[package]]-name = "bit-set"-version = "0.5.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"-dependencies = [- "bit-vec 0.6.3",-]-[[package]]name = "bit-set"version = "0.8.0"@@ -2252,12 +2219,6 @@ dependencies = ["bit-vec 0.9.1",]-[[package]]-name = "bit-vec"-version = "0.6.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"-[[package]]name = "bit-vec"version = "0.8.0"@@ -2958,16 +2919,6 @@ dependencies = ["libc",]-[[package]]-name = "cgmath"-version = "0.18.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317"-dependencies = [- "approx 0.4.0",- "num-traits",-]-[[package]]name = "channel"version = "0.1.0"@@ -3095,7 +3046,7 @@ dependencies = ["anstream","anstyle","clap_lex",- "strsim 0.11.1",+ "strsim","terminal_size",]@@ -4708,16 +4659,6 @@ dependencies = ["util",]-[[package]]-name = "darling"-version = "0.14.4"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"-dependencies = [- "darling_core 0.14.4",- "darling_macro 0.14.4",-]-[[package]]name = "darling"version = "0.20.11"@@ -4748,20 +4689,6 @@ dependencies = ["darling_macro 0.23.0",]-[[package]]-name = "darling_core"-version = "0.14.4"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"-dependencies = [- "fnv",- "ident_case",- "proc-macro2",- "quote",- "strsim 0.10.0",- "syn 1.0.109",-]-[[package]]name = "darling_core"version = "0.20.11"@@ -4772,7 +4699,7 @@ dependencies = ["ident_case","proc-macro2","quote",- "strsim 0.11.1",+ "strsim","syn 2.0.117",]@@ -4786,7 +4713,7 @@ dependencies = ["ident_case","proc-macro2","quote",- "strsim 0.11.1",+ "strsim","syn 2.0.117",]@@ -4799,21 +4726,10 @@ dependencies = ["ident_case","proc-macro2","quote",- "strsim 0.11.1",+ "strsim","syn 2.0.117",]-[[package]]-name = "darling_macro"-version = "0.14.4"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"-dependencies = [- "darling_core 0.14.4",- "quote",- "syn 1.0.109",-]-[[package]]name = "darling_macro"version = "0.20.11"@@ -5054,37 +4970,6 @@ dependencies = ["serde_core",]-[[package]]-name = "derive_builder"-version = "0.12.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"-dependencies = [- "derive_builder_macro",-]--[[package]]-name = "derive_builder_core"-version = "0.12.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"-dependencies = [- "darling 0.14.4",- "proc-macro2",- "quote",- "syn 1.0.109",-]--[[package]]-name = "derive_builder_macro"-version = "0.12.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"-dependencies = [- "derive_builder_core",- "syn 1.0.109",-]-[[package]]name = "derive_more"version = "2.1.1"@@ -5241,16 +5126,6 @@ dependencies = ["dirs-sys",]-[[package]]-name = "dirs-next"-version = "2.0.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"-dependencies = [- "cfg-if",- "dirs-sys-next",-]-[[package]]name = "dirs-sys"version = "0.5.0"@@ -5259,19 +5134,8 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"dependencies = ["libc","option-ext",- "redox_users 0.5.2",- "windows-sys 0.59.0",-]--[[package]]-name = "dirs-sys-next"-version = "0.1.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"-dependencies = [- "libc",- "redox_users 0.4.6",- "winapi",+ "redox_users",+ "windows-sys 0.61.2",][[package]]@@ -5404,22 +5268,23 @@ dependencies = [[[package]]name = "dugong"-version = "0.7.0"-source = "git+https://github.com/zed-industries/merman?tag=v0.7.0-with-patches#a3ed8d9f3fd1d74c802f25ed9edd501743796504"+version = "0.8.0-alpha.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "49e042d0154d5b36580c5151b45baeb008e5fdb00a918ea203e85f24f2c921e6"dependencies = ["dugong-graphlib","rustc-hash 2.1.1","serde","serde_json",- "web-time",][[package]]name = "dugong-graphlib"-version = "0.7.0"-source = "git+https://github.com/zed-industries/merman?tag=v0.7.0-with-patches#a3ed8d9f3fd1d74c802f25ed9edd501743796504"+version = "0.8.0-alpha.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "219fd4382e892b3eb905d02a7cfb30ca60a7dad662a554b4aebf056f270c7649"dependencies = [- "hashbrown 0.16.1",+ "hashbrown 0.17.1","rustc-hash 2.1.1","serde","serde_json",@@ -5509,7 +5374,7 @@ dependencies = ["postage","pretty_assertions","project",- "pulldown-cmark 0.13.0",+ "pulldown-cmark 0.13.4","rand 0.9.4","regex","release_channel",@@ -5879,15 +5744,6 @@ dependencies = ["phf 0.11.3",]-[[package]]-name = "ena"-version = "0.14.4"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "eabffdaee24bd1bf95c5ef7cec31260444317e72ea56c4c91750e8b7ee58d5f1"-dependencies = [- "log",-]-[[package]]name = "encode_unicode"version = "1.0.0"@@ -6064,7 +5920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"dependencies = ["libc",- "windows-sys 0.52.0",+ "windows-sys 0.61.2",][[package]]@@ -6126,9 +5982,9 @@ dependencies = [[[package]]name = "euclid"-version = "0.22.11"+version = "0.22.14"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48"+checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06"dependencies = ["num-traits",]@@ -7171,15 +7027,6 @@ dependencies = ["windows-link 0.2.1",]-[[package]]-name = "getopts"-version = "0.2.24"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "cfe4fbac503b8d1f88e6676011885f34b7174f46e59956bba534ba83abded4df"-dependencies = [- "unicode-width",-]-[[package]]name = "getrandom"version = "0.2.16"@@ -7278,7 +7125,7 @@ dependencies = ["gobject-sys","libc","system-deps",- "windows-sys 0.52.0",+ "windows-sys 0.61.2",][[package]]@@ -7463,114 +7310,6 @@ dependencies = ["xml-rs",]-[[package]]-name = "glam"-version = "0.14.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "333928d5eb103c5d4050533cec0384302db6be8ef7d3cebd30ec6a35350353da"--[[package]]-name = "glam"-version = "0.15.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3abb554f8ee44336b72d522e0a7fe86a29e09f839a36022fa869a7dfe941a54b"--[[package]]-name = "glam"-version = "0.16.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4126c0479ccf7e8664c36a2d719f5f2c140fbb4f9090008098d2c291fa5b3f16"--[[package]]-name = "glam"-version = "0.17.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e01732b97afd8508eee3333a541b9f7610f454bb818669e66e90f5f57c93a776"--[[package]]-name = "glam"-version = "0.18.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "525a3e490ba77b8e326fb67d4b44b4bd2f920f44d4cc73ccec50adc68e3bee34"--[[package]]-name = "glam"-version = "0.19.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2b8509e6791516e81c1a630d0bd7fbac36d2fa8712a9da8662e716b52d5051ca"--[[package]]-name = "glam"-version = "0.20.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f43e957e744be03f5801a55472f593d43fabdebf25a4585db250f04d86b1675f"--[[package]]-name = "glam"-version = "0.21.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "518faa5064866338b013ff9b2350dc318e14cc4fcd6cb8206d7e7c9886c98815"--[[package]]-name = "glam"-version = "0.22.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774"--[[package]]-name = "glam"-version = "0.23.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c"--[[package]]-name = "glam"-version = "0.24.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"--[[package]]-name = "glam"-version = "0.25.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"--[[package]]-name = "glam"-version = "0.27.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"--[[package]]-name = "glam"-version = "0.28.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94"--[[package]]-name = "glam"-version = "0.29.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8babf46d4c1c9d92deac9f7be466f76dfc4482b6452fc5024b5e8daf6ffeb3ee"--[[package]]-name = "glam"-version = "0.30.10"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "19fc433e8437a212d1b6f1e68c7824af3aed907da60afa994e7f542d18d12aa9"--[[package]]-name = "glam"-version = "0.31.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "556f6b2ea90b8d15a74e0e7bb41671c9bdf38cd9f78c284d750b9ce58a2b5be7"--[[package]]-name = "glam"-version = "0.32.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f70749695b063ecbf6b62949ccccde2e733ec3ecbbd71d467dca4e5c6c97cca0"-[[package]]name = "glib"version = "0.21.5"@@ -8108,6 +7847,16 @@ dependencies = ["tree-sitter-yaml",]+[[package]]+name = "granit-parser"+version = "1.0.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "c60388b03522b86e24b6b45952255279936b08a871775156fc89c94e792d21d8"+dependencies = [+ "arraydeque",+ "smallvec",+]+[[package]]name = "group"version = "0.12.1"@@ -8268,6 +8017,8 @@ version = "0.17.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"dependencies = [+ "allocator-api2",+ "equivalent","foldhash 0.2.0","serde","serde_core",@@ -8796,14 +8547,40 @@ dependencies = ["strum 0.27.2",]+[[package]]+name = "icu_collator"+version = "2.3.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "59eea194d189ca897bcb960fd2130f9e7d53998460d4d32e85a60b10d5507cf4"+dependencies = [+ "icu_collator_data",+ "icu_collections",+ "icu_locale_core",+ "icu_locale_fallback",+ "icu_normalizer",+ "icu_properties",+ "icu_provider",+ "smallvec",+ "utf16_iter",+ "utf8_iter",+ "zerovec",+]++[[package]]+name = "icu_collator_data"+version = "2.3.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "f7d7e54efdddeb1208c08dd5d32b53a879ac00d2d3d051b2255fd26821d16368"+[[package]]name = "icu_collections"-version = "2.0.0"+version = "2.3.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"+checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513"dependencies = ["displaydoc","potential_utf",+ "utf8_iter","yoke","zerofrom","zerovec",@@ -8811,70 +8588,92 @@ dependencies = [[[package]]name = "icu_locale_core"-version = "2.0.0"+version = "2.3.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"+checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb"dependencies = ["displaydoc","litemap",+ "serde","tinystr","writeable","zerovec",]+[[package]]+name = "icu_locale_fallback"+version = "2.3.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "251af8e57c9400e3eb58242fe5b8b1152b2a64fdf4cf632f923c38ccee6f2fa9"+dependencies = [+ "icu_locale_core",+ "icu_locale_fallback_data",+ "icu_provider",+ "potential_utf",+ "tinystr",+ "zerovec",+]++[[package]]+name = "icu_locale_fallback_data"+version = "2.3.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "decf2a22ec8fa68f1a0c1129a3f8583f8f8bc24e8b9ccbe98ead99f62a4dc3a8"+[[package]]name = "icu_normalizer"-version = "2.0.0"+version = "2.3.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"+checksum = "12f9cf5f235641ed274641dd81c3f28d870e276763d0797aeeab72317b1c646f"dependencies = [- "displaydoc","icu_collections","icu_normalizer_data","icu_properties","icu_provider","smallvec",+ "utf16_iter",+ "utf8_iter",+ "write16","zerovec",][[package]]name = "icu_normalizer_data"-version = "2.0.0"+version = "2.3.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"+checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0"[[package]]name = "icu_properties"-version = "2.0.1"+version = "2.3.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"+checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148"dependencies = ["displaydoc","icu_collections","icu_locale_core","icu_properties_data","icu_provider",- "potential_utf","zerotrie","zerovec",][[package]]name = "icu_properties_data"-version = "2.0.1"+version = "2.3.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"+checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa"[[package]]name = "icu_provider"-version = "2.0.0"+version = "2.3.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"+checksum = "92a7ed671a6aad807a8651a2e1782a6598fda9ce5185dd8158549e95a91c6428"dependencies = ["displaydoc","icu_locale_core",+ "serde","stable_deref_trait",- "tinystr","writeable","yoke","zerofrom",@@ -9404,13 +9203,12 @@ dependencies = [[[package]]name = "json5"-version = "0.4.1"+version = "1.3.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1"+checksum = "733a844dbd6fef128e98cb4487b887cb55454d92cd9994b1bafe004fabbe670c"dependencies = [- "pest",- "pest_derive","serde",+ "ucd-trie",][[package]]@@ -9601,15 +9399,6 @@ dependencies = ["libc",]-[[package]]-name = "kurbo"-version = "0.9.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b"-dependencies = [- "arrayvec",-]-[[package]]name = "kurbo"version = "0.13.1"@@ -9631,36 +9420,11 @@ dependencies = ["log",]-[[package]]-name = "lalrpop"-version = "0.20.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca"-dependencies = [- "ascii-canvas",- "bit-set 0.5.3",- "ena",- "itertools 0.11.0",- "lalrpop-util",- "petgraph",- "pico-args",- "regex",- "regex-syntax",- "string_cache",- "term",- "tiny-keccak",- "unicode-xid",- "walkdir",-]-[[package]]name = "lalrpop-util"-version = "0.20.2"+version = "0.23.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"-dependencies = [- "regex-automata",-]+checksum = "884f3e747ed2dcee867cda1b0c31a048f9e20de2d916a248949319921a2e666e"[[package]]name = "language"@@ -9703,7 +9467,7 @@ dependencies = ["shellexpand","smallvec","streaming-iterator",- "strsim 0.11.1",+ "strsim","sum_tree","task","text",@@ -10116,9 +9880,9 @@ dependencies = [[[package]]name = "libm"-version = "0.2.15"+version = "0.2.16"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"[[package]]name = "libmimalloc-sys"@@ -10439,51 +10203,18 @@ dependencies = ["value-bag",]-[[package]]-name = "logos"-version = "0.14.4"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7251356ef8cb7aec833ddf598c6cb24d17b689d20b993f9d11a3d764e34e6458"-dependencies = [- "logos-derive",-]--[[package]]-name = "logos-codegen"-version = "0.14.4"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "59f80069600c0d66734f5ff52cc42f2dabd6b29d205f333d61fd7832e9e9963f"-dependencies = [- "beef",- "fnv",- "lazy_static",- "proc-macro2",- "quote",- "regex-syntax",- "syn 2.0.117",-]--[[package]]-name = "logos-derive"-version = "0.14.4"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "24fb722b06a9dc12adb0963ed585f19fc61dc5413e6a9be9422ef92c091e731d"-dependencies = [- "logos-codegen",-]-[[package]]name = "lol_html"-version = "2.8.1"+version = "3.0.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6888e8653f6e49cb2924c660fc367a8beeb6239b71e117fa082153c6ea44d427"+checksum = "5adbb62638edf7e6bc88835cd3ea388bdd53382af42045da0e414ea78aa0c91a"dependencies = ["bitflags 2.13.1","cfg-if","cssparser 0.36.0","encoding_rs","foldhash 0.2.0",- "hashbrown 0.16.1",+ "hashbrown 0.17.1","memchr","mime","precomputed-hash",@@ -10702,14 +10433,14 @@ dependencies = [[[package]]name = "manatee"-version = "0.7.0"-source = "git+https://github.com/zed-industries/merman?tag=v0.7.0-with-patches#a3ed8d9f3fd1d74c802f25ed9edd501743796504"+version = "0.8.0-alpha.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "9741945d2b000ec5182e0c35edcff22cb592a3eda4e6efe34663718e3e54617f"dependencies = ["indexmap 2.14.0",- "nalgebra",+ "libm","rustc-hash 2.1.1","thiserror 2.0.17",- "web-time",][[package]]@@ -10741,7 +10472,7 @@ dependencies = ["markup5ever_rcdom","mermaid_render","node_runtime",- "pulldown-cmark 0.13.0",+ "pulldown-cmark 0.13.4","settings","smallvec","stacksafe",@@ -10840,16 +10571,6 @@ version = "0.7.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"-[[package]]-name = "matrixmultiply"-version = "0.3.10"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a06de3016e9fae57a36fd14dba131fccf49f74b40b7fbdb472f96e361ec71a08"-dependencies = [- "autocfg",- "rawpointer",-]-[[package]]name = "maybe-owned"version = "0.3.4"@@ -10927,9 +10648,9 @@ dependencies = [[[package]]name = "memchr"-version = "2.7.6"+version = "2.8.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"[[package]]name = "memfd"@@ -11004,64 +10725,68 @@ dependencies = [[[package]]name = "merman"-version = "0.7.0"-source = "git+https://github.com/zed-industries/merman?tag=v0.7.0-with-patches#a3ed8d9f3fd1d74c802f25ed9edd501743796504"+version = "0.8.0-alpha.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "263b2e923bce36d7e5d799af599e762f0160f0e6f3a397564e913ef35d7718f6"dependencies = [- "chrono","merman-core","merman-render",+ "serde_json","thiserror 2.0.17",][[package]]name = "merman-core"-version = "0.7.0"-source = "git+https://github.com/zed-industries/merman?tag=v0.7.0-with-patches#a3ed8d9f3fd1d74c802f25ed9edd501743796504"+version = "0.8.0-alpha.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "dae7b72e61bbc56c7bebb94ef0fa831886d66057d17298338b2a3cac6ab71def"dependencies = [- "chrono","euclid",+ "granit-parser","htmlize","indexmap 2.14.0","json5",- "lalrpop","lalrpop-util",- "logos","lol_html",- "regex","rustc-hash 2.1.1","ryu-js","serde","serde_json",- "serde_yaml","thiserror 2.0.17",- "tracing",+ "unicode-general-category","url",- "uuid",- "web-time",][[package]]name = "merman-render"-version = "0.7.0"-source = "git+https://github.com/zed-industries/merman?tag=v0.7.0-with-patches#a3ed8d9f3fd1d74c802f25ed9edd501743796504"+version = "0.8.0-alpha.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "cd17bfdd6866df20f34a8697eba00e0b86efa734de0b6a629b07a755d748fd68"dependencies = ["base64 0.22.1",- "chrono",+ "cssparser 0.36.0",+ "data-url","dugong",+ "icu_collator",+ "icu_locale_core","indexmap 2.14.0",+ "kurbo",+ "libm","manatee","merman-core",- "pulldown-cmark 0.12.2",+ "pulldown-cmark 0.13.4",+ "quick-xml 0.41.0","roughr-merman",+ "roxmltree 0.21.1","rustc-hash 2.1.1","ryu-js","serde","serde_json",- "svgtypes 0.11.0",+ "svgtypes","thiserror 2.0.17",+ "unicode-linebreak",+ "unicode-segmentation","unicode-width",- "url",- "web-time",][[package]]@@ -11364,39 +11089,6 @@ dependencies = ["unicode-ident",]-[[package]]-name = "nalgebra"-version = "0.34.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "df76ea0ff5c7e6b88689085804d6132ded0ddb9de5ca5b8aeb9eeadc0508a70a"-dependencies = [- "approx 0.5.1",- "glam 0.14.0",- "glam 0.15.2",- "glam 0.16.0",- "glam 0.17.3",- "glam 0.18.0",- "glam 0.19.0",- "glam 0.20.5",- "glam 0.21.3",- "glam 0.22.0",- "glam 0.23.0",- "glam 0.24.2",- "glam 0.25.0",- "glam 0.27.0",- "glam 0.28.0",- "glam 0.29.3",- "glam 0.30.10",- "glam 0.31.1",- "glam 0.32.1",- "matrixmultiply",- "num-complex",- "num-rational",- "num-traits",- "simba",- "typenum",-]-[[package]]name = "nanoid"version = "0.4.0"@@ -11682,7 +11374,7 @@ version = "0.50.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"dependencies = [- "windows-sys 0.59.0",+ "windows-sys 0.61.2",][[package]]@@ -12699,10 +12391,9 @@ version = "0.7.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6"dependencies = [- "approx 0.5.1",+ "approx","fast-srgb8","palette_derive",- "phf 0.11.3",][[package]]@@ -13816,16 +13507,6 @@ dependencies = ["miniz_oxide",]-[[package]]-name = "points_on_curve"-version = "0.7.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ca77ae128f56aad518f82cf0af3dcda13b874e59a608dbb287c7887fec97b505"-dependencies = [- "euclid",- "num-traits",-]-[[package]]name = "polling"version = "3.11.0"@@ -13941,6 +13622,7 @@ version = "0.1.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"dependencies = [+ "serde","zerovec",]@@ -14398,7 +14080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"dependencies = ["bytes 1.11.1",- "heck 0.4.1",+ "heck 0.5.0","itertools 0.11.0","log","multimap",@@ -14550,28 +14232,15 @@ checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993"dependencies = ["bitflags 2.13.1","memchr",- "pulldown-cmark-escape 0.10.1",- "unicase",-]--[[package]]-name = "pulldown-cmark"-version = "0.12.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f86ba2052aebccc42cbbb3ed234b8b13ce76f75c3551a303cb2bcffcff12bb14"-dependencies = [- "bitflags 2.13.1",- "getopts",- "memchr",- "pulldown-cmark-escape 0.11.0",+ "pulldown-cmark-escape","unicase",][[package]]name = "pulldown-cmark"-version = "0.13.0"+version = "0.13.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0"+checksum = "e9f068eba8e7071c5f9511831b44f32c740d5adf574e990f946ddb53db2f314e"dependencies = ["bitflags 2.13.1","memchr",@@ -14584,12 +14253,6 @@ version = "0.10.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "bd348ff538bc9caeda7ee8cad2d1d48236a1f443c1fa3913c6a02fe0043b1dd3"-[[package]]-name = "pulldown-cmark-escape"-version = "0.11.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae"-[[package]]name = "pulley-interpreter"version = "36.0.13"@@ -14680,6 +14343,15 @@ dependencies = ["serde",]+[[package]]+name = "quick-xml"+version = "0.41.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"+dependencies = [+ "memchr",+]+[[package]]name = "quinn"version = "0.11.9"@@ -14732,7 +14404,7 @@ dependencies = ["once_cell","socket2 0.6.3","tracing",- "windows-sys 0.52.0",+ "windows-sys 0.60.2",][[package]]@@ -14979,12 +14651,6 @@ dependencies = ["objc2-quartz-core 0.3.2",]-[[package]]-name = "rawpointer"-version = "0.2.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"-[[package]]name = "rayon"version = "1.11.0"@@ -15096,17 +14762,6 @@ dependencies = ["bitflags 2.13.1",]-[[package]]-name = "redox_users"-version = "0.4.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"-dependencies = [- "getrandom 0.2.16",- "libredox",- "thiserror 1.0.69",-]-[[package]]name = "redox_users"version = "0.5.2"@@ -15526,7 +15181,7 @@ dependencies = ["log","pico-args","rgb",- "svgtypes 0.16.1",+ "svgtypes","tiny-skia","usvg","zune-jpeg",@@ -15653,18 +15308,14 @@ dependencies = [[[package]]name = "roughr-merman"-version = "0.12.0"-source = "git+https://github.com/zed-industries/merman?tag=v0.7.0-with-patches#a3ed8d9f3fd1d74c802f25ed9edd501743796504"+version = "0.12.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "0a1b0137cf48e915300be3fe4cf9f8f9a2af242ebf41b6f8fa716c2fd482f00b"dependencies = [- "derive_builder","euclid",- "getrandom 0.2.16","num-traits","palette",- "points_on_curve",- "rand 0.8.6",- "svg_path_ops",- "svgtypes 0.11.0",+ "svgtypes",][[package]]@@ -15880,7 +15531,7 @@ dependencies = ["errno 0.3.14","libc","linux-raw-sys 0.11.0",- "windows-sys 0.52.0",+ "windows-sys 0.61.2",][[package]]@@ -16087,15 +15738,6 @@ version = "5.4.9"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "da0ba8adb63e0deebd0744d8fc5bea394c08029159deaf680513fec1a3949144"-[[package]]-name = "safe_arch"-version = "0.7.4"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "96b02de82ddbe1b636e6170c21be622223aea188ef2e139be0a5b219ec215323"-dependencies = [- "bytemuck",-]-[[package]]name = "same-file"version = "1.0.6"@@ -16490,9 +16132,9 @@ dependencies = [[[package]]name = "selectors"-version = "0.35.0"+version = "0.37.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "93fdfed56cd634f04fe8b9ddf947ae3dc493483e819593d2ba17df9ad05db8b2"+checksum = "2cfaaa6035167f0e604e42723c7650d59ee269ef220d7bbe0565602c8a0173b9"dependencies = ["bitflags 2.13.1","cssparser 0.36.0",@@ -17101,19 +16743,6 @@ dependencies = ["rand_core 0.6.4",]-[[package]]-name = "simba"-version = "0.9.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c99284beb21666094ba2b75bbceda012e610f5479dfcc2d6e2426f53197ffd95"-dependencies = [- "approx 0.5.1",- "num-complex",- "num-traits",- "paste",- "wide",-]-[[package]]name = "simd-adler32"version = "0.3.7"@@ -17282,7 +16911,7 @@ version = "0.8.9"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "c1c97747dbf44bb1ca44a561ece23508e99cb592e862f22222dcf42f51d1e451"dependencies = [- "heck 0.4.1",+ "heck 0.5.0","proc-macro2","quote","syn 2.0.117",@@ -17764,12 +17393,6 @@ dependencies = ["unicode-properties",]-[[package]]-name = "strsim"-version = "0.10.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"-[[package]]name = "strsim"version = "0.11.1"@@ -17929,16 +17552,6 @@ version = "0.4.5"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb"-[[package]]-name = "svg_path_ops"-version = "0.11.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a2ed183bad71dff813db12a317785a8565c9b44732cca3c2effd40a06eb9cd28"-dependencies = [- "cgmath",- "svgtypes 0.11.0",-]-[[package]]name = "svg_preview"version = "0.1.0"@@ -17952,23 +17565,13 @@ dependencies = ["zed_actions",]-[[package]]-name = "svgtypes"-version = "0.11.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7"-dependencies = [- "kurbo 0.9.5",- "siphasher 0.3.11",-]-[[package]]name = "svgtypes"version = "0.16.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "695b5790b3131dafa99b3bbfd25a216edb3d216dad9ca208d4657bfb8f2abc3d"dependencies = [- "kurbo 0.13.1",+ "kurbo","siphasher 1.0.1",]@@ -18506,7 +18109,7 @@ dependencies = ["getrandom 0.3.4","once_cell","rustix 1.1.2",- "windows-sys 0.52.0",+ "windows-sys 0.61.2",][[package]]@@ -18520,17 +18123,6 @@ dependencies = ["utf-8",]-[[package]]-name = "term"-version = "0.7.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"-dependencies = [- "dirs-next",- "rustversion",- "winapi",-]-[[package]]name = "termcolor"version = "1.4.1"@@ -18897,11 +18489,12 @@ dependencies = [[[package]]name = "tinystr"-version = "0.8.1"+version = "0.8.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"+checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643"dependencies = ["displaydoc",+ "serde_core","zerovec",]@@ -19928,9 +19521,9 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"[[package]]name = "unicode-normalization"-version = "0.1.24"+version = "0.1.25"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"+checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"dependencies = ["tinyvec",]@@ -19949,9 +19542,9 @@ checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee"[[package]]name = "unicode-segmentation"-version = "1.12.0"+version = "1.13.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"+checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"[[package]]name = "unicode-vo"@@ -20030,7 +19623,7 @@ dependencies = ["flate2","fontdb","imagesize",- "kurbo 0.13.1",+ "kurbo","log","pico-args","roxmltree 0.21.1",@@ -20038,7 +19631,7 @@ dependencies = ["simplecss","siphasher 1.0.1","strict-num",- "svgtypes 0.16.1",+ "svgtypes","tiny-skia-path","unicode-bidi","unicode-script",@@ -20052,6 +19645,12 @@ version = "0.7.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"+[[package]]+name = "utf16_iter"+version = "1.0.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"+[[package]]name = "utf8-chars"version = "3.0.6"@@ -21453,16 +21052,6 @@ dependencies = ["wasite",]-[[package]]-name = "wide"-version = "0.7.33"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0ce5da8ecb62bcd8ec8b7ea19f69a51275e91299be594ea5cc6ef7819e16cd03"-dependencies = [- "bytemuck",- "safe_arch",-]-[[package]]name = "wiggle"version = "36.0.12"@@ -21526,7 +21115,7 @@ version = "0.1.11"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"dependencies = [- "windows-sys 0.48.0",+ "windows-sys 0.61.2",][[package]]@@ -22807,11 +22396,17 @@ dependencies = ["windows-link 0.2.1",]+[[package]]+name = "write16"+version = "1.0.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"+[[package]]name = "writeable"-version = "0.6.1"+version = "0.6.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"+checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc"[[package]]name = "wyz"@@ -23066,11 +22661,10 @@ dependencies = [[[package]]name = "yoke"-version = "0.8.0"+version = "0.8.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"+checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"dependencies = [- "serde","stable_deref_trait","yoke-derive","zerofrom",@@ -23078,9 +22672,9 @@ dependencies = [[[package]]name = "yoke-derive"-version = "0.8.0"+version = "0.8.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"dependencies = ["proc-macro2","quote",@@ -23650,21 +23244,23 @@ dependencies = [[[package]]name = "zerotrie"-version = "0.2.2"+version = "0.2.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"+checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f"dependencies = ["displaydoc","yoke","zerofrom",+ "zerovec",][[package]]name = "zerovec"-version = "0.11.4"+version = "0.11.8"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"+checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8"dependencies = [+ "serde","yoke","zerofrom","zerovec-derive",@@ -23672,13 +23268,13 @@ dependencies = [[[package]]name = "zerovec-derive"-version = "0.11.1"+version = "0.11.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"+checksum = "9f212a141d820099d57ffafb9569be9617a6f27d3dc881fbee8fb56642f917a9"dependencies = ["proc-macro2","quote",- "syn 2.0.117",+ "syn 3.0.3",][[package]]diff --git a/crates/mermaid_render/Cargo.toml b/crates/mermaid_render/Cargo.tomlindex df9bfc08786..3db9744478d 100644--- a/crates/mermaid_render/Cargo.toml+++ b/crates/mermaid_render/Cargo.toml@@ -18,7 +18,10 @@ test-support = [][dependencies]anyhow.workspace = truegpui.workspace = true-merman = { git = "https://github.com/zed-industries/merman", tag = "v0.7.0-with-patches", features = ["render"] }+merman = { version = "=0.8.0-alpha.5", default-features = false, features = [+ "layout-cytoscape",+ "svg",+] }quick-xml.workspace = trueserde_json.workspace = truetracing.workspace = truediff --git a/crates/mermaid_render/src/postprocess/inject_css.rs b/crates/mermaid_render/src/postprocess/inject_css.rsindex 6a34c6d1b8f..426433b0f6c 100644--- a/crates/mermaid_render/src/postprocess/inject_css.rs+++ b/crates/mermaid_render/src/postprocess/inject_css.rs@@ -374,6 +374,7 @@ fn build_injected_css(theme: &MermaidTheme, svg_id: &str) -> String {r#"text, tspan, foreignObject div, foreignObject span, foreignObject p {{ font-family: {font} !important; }}foreignObject div, foreignObject span, foreignObject p {{ font-size: 16px; color: {text}; }}+ .merman-foreignobject-fallback-text {{ font-size: 16px !important; }}foreignObject p {{ margin: 0; }}foreignObject {{ overflow: visible; }}foreignObject div {{ max-width: none !important; }}@@ -416,7 +417,7 @@ fn build_injected_css(theme: &MermaidTheme, svg_id: &str) -> String {text.actor {{ text-anchor: middle; }}text.actor>tspan {{ fill: {actor_text} !important; stroke: none; }}.labelText, .labelText>tspan {{ fill: {actor_text} !important; }}- .actor-line {{ stroke: {actor_border} !important; }}+ .actor-line {{ stroke: {actor_border} !important; fill: none !important; }}.messageLine0 {{ stroke: {text} !important; }}.messageLine1 {{ stroke: {text} !important; }}#arrowhead path {{ fill: {text} !important; stroke: {text} !important; }}@@ -428,7 +429,7 @@ fn build_injected_css(theme: &MermaidTheme, svg_id: &str) -> String {.noteText, .noteText>tspan {{ fill: {note_text} !important; }}.activation0, .activation1, .activation2 {{ fill: {secondary} !important; stroke: {border} !important; }}.labelBox {{ stroke: {actor_border} !important; fill: {actor_bg} !important; }}- .actor-man line {{ stroke: {actor_border} !important; fill: {actor_bg} !important; }}+ .actor-man line {{ stroke: {actor_border} !important; fill: none !important; }}.actor-man circle {{ stroke: {actor_border} !important; fill: {actor_bg} !important; }}.pieTitleText {{ fill: {text} !important; }}.slice {{ fill: {text} !important; }}diff --git a/crates/mermaid_render/src/render.rs b/crates/mermaid_render/src/render.rsindex 5db7ca87536..3db6f17fcb8 100644--- a/crates/mermaid_render/src/render.rs+++ b/crates/mermaid_render/src/render.rs@@ -10,7 +10,7 @@ pub(super) fn render_mermaid(source: &str, theme: &MermaidTheme) -> Result<Strinlet diagram_id = format!("merman-{id}");let config = to_merman_config(theme);- let renderer = merman::render::HeadlessRenderer::new()+ let renderer = merman::svg::HeadlessRenderer::new().with_site_config(config).with_vendored_text_measurer().with_diagram_id(&diagram_id);@@ -19,8 +19,8 @@ pub(super) fn render_mermaid(source: &str, theme: &MermaidTheme) -> Result<Strin// fallback text, unsupported CSS removal, and invalid SVG attribute cleanup.// Zed also strips merman's existing `!important` declarations before// injecting its own theme CSS so host styling wins consistently in usvg/resvg.- let pipeline = merman::render::SvgPipeline::resvg_safe()- .with_postprocessor(merman::render::CssOverridePostprocessor::strip_existing_important());+ let pipeline = merman::svg::SvgPipeline::resvg_safe()+ .with_postprocessor(merman::svg::CssOverridePostprocessor::strip_existing_important());let svg = renderer.render_svg_with_pipeline_sync(source, &pipeline)@@ -122,12 +122,11 @@ fn to_merman_config(theme: &MermaidTheme) -> merman::MermaidConfig {"theme": "base","darkMode": theme.dark_mode,"fontFamily": theme.font_family,- // resvg can't rasterize HTML `<foreignObject>` labels, and the- // fallback that replaces them loses soft wrapping, so emit native SVG- // text labels. Nodes read the top-level key; edges read `flowchart`.- "htmlLabels": false,+ // resvg can't rasterize HTML `<foreignObject>` labels, so merman's+ // raster-safe pipeline replaces them with wrapped native SVG text.+ "htmlLabels": true,"flowchart": {- "htmlLabels": false,+ "htmlLabels": true,"padding": 16,},"themeVariables": theme_vars,@@ -165,27 +164,98 @@ mod tests {assert!(!css_svg.contains("!important"), "got: {css_svg}");}- /// Soft-wrapped labels must render as native SVG `<tspan>` lines rather- /// than the resvg-safe pipeline's single-line `<foreignObject>` fallback,- /// which overflows the node box (see the `htmlLabels` comment in- /// [`to_merman_config`]). If the fallback marker reappears after a merman- /// upgrade, the config has stopped disabling HTML labels.#[test]- fn long_labels_render_as_wrapped_svg_text() {+ fn long_flowchart_labels_render_as_wrapped_svg_text() {let source = "flowchart TD\n \A[\"Pass 2: search transcript with annotation blocks excised, \map offsets back to buffer space\"] --> \|ambiguous or zero| B[\"Error describing where matches were found\"]";let svg = render_mermaid(source, &MermaidTheme::default()).expect("render failed");+ assert!(!svg.contains("<foreignObject"), "got: {svg}");+ assert!(!svg.contains(+ "Pass 2: search transcript with annotation blocks excised, map offsets back to buffer space</text>"+ ));+ let wrapped_line_count = svg.matches("merman-foreignobject-fallback-text").count();assert!(- !svg.contains(r#"data-merman-foreignobject="fallback""#),- "labels went through the foreignObject fallback, which loses soft wrapping: {svg}"+ wrapped_line_count > 3,+ "expected long labels to wrap onto multiple SVG text lines, got {wrapped_line_count}: {svg}");- let wrapped_line_count = svg.matches("text-outer-tspan").count();+ }++ #[test]+ fn class_diagram_labels_keep_sixteen_pixel_font_size() {+ let source = r#"classDiagram+ class User {+ +String id+ +String name+ +signIn()+ }+ "#;+ let theme = MermaidTheme::default();+ let svg = render_mermaid(source, &theme).expect("render failed");+ let svg = crate::postprocess::postprocess(&svg, &theme).expect("postprocess failed");+ let mut options = usvg::Options::default();+ options.fontdb_mut().load_system_fonts();+ let tree = usvg::Tree::from_str(&svg, &options).expect("SVG parsing failed");++ assert_eq!(text_font_size(tree.root(), "User"), Some(16.0));+ assert_eq!(text_font_size(tree.root(), "+String name"), Some(16.0));+ }++ #[test]+ fn mindmap_renders_drawable_svg() {+ let source = r#"mindmap+ root((Application))+ Frontend+ Components+ State+ Routing+ Backend+ API+ Authentication+ Jobs+ Data+ Database+ Cache+ Backups+ Operations+ Monitoring+ Deployment+ "#;+ let theme = MermaidTheme::default();+ let svg = render_mermaid(source, &theme).expect("render failed");+ let svg = crate::postprocess::postprocess(&svg, &theme).expect("postprocess failed");+ let mut options = usvg::Options::default();+ options.fontdb_mut().load_system_fonts();+ let tree = usvg::Tree::from_str(&svg, &options).expect("SVG parsing failed");++ assert!(tree.root().has_children(), "got: {svg}");assert!(- wrapped_line_count > 3,- "expected long labels to wrap onto multiple tspan lines, got {wrapped_line_count}: {svg}"+ text_font_size(tree.root(), "Application").is_some(),+ "got: {svg}");}++ fn text_font_size(group: &usvg::Group, expected_text: &str) -> Option<f32> {+ for node in group.children() {+ match node {+ usvg::Node::Group(group) => {+ if let Some(font_size) = text_font_size(group, expected_text) {+ return Some(font_size);+ }+ }+ usvg::Node::Text(text) => {+ for chunk in text.chunks() {+ if chunk.text() == expected_text {+ return chunk.spans().first().map(|span| span.font_size().get());+ }+ }+ }+ usvg::Node::Path(_) | usvg::Node::Image(_) => {}+ }+ }++ None+ }}diff --git a/crates/zlog/src/filter.rs b/crates/zlog/src/filter.rsindex 4f03a47f609..afd1466d875 100644--- a/crates/zlog/src/filter.rs+++ b/crates/zlog/src/filter.rs@@ -39,9 +39,10 @@ const DEFAULT_FILTERS: &[(&str, log::LevelFilter)] = &[("zbus", log::LevelFilter::Warn),#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "windows"))]("naga::back::spv::writer", log::LevelFilter::Warn),- // usvg prints a lot of warnings on rendering an SVG with partial errors, which- // can happen a lot with the SVG preview+ // usvg and its CSS parser print a lot of warnings on rendering an SVG with+ // partial errors, which can happen a lot with the SVG preview.("usvg::parser", log::LevelFilter::Error),+ ("simplecss::selector", log::LevelFilter::Error),("pet", log::LevelFilter::Warn),];