build: bump world crates to 0.13.12-rc1 (#1608)

* refactor: move `debug_loc`

* build: fix rev

* build: bump tinymist inner version

* build: bump tinymist world version

* build: bump world crates to 0.13.12-rc1

* fix: used bad patch

* fix: clippy errors
This commit is contained in:
Myriad-Dreamin 2025-03-31 16:01:51 +08:00 committed by GitHub
parent 4844419bd8
commit 71116758ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
34 changed files with 148 additions and 155 deletions

148
Cargo.lock generated
View file

@ -408,9 +408,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
version = "1.2.16"
version = "1.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
dependencies = [
"shlex",
]
@ -499,9 +499,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.5.32"
version = "4.5.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
checksum = "e958897981290da2a852763fe9cdb89cd36977a5d729023127095fa94d95e2ff"
dependencies = [
"clap_builder",
"clap_derive",
@ -509,9 +509,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.5.32"
version = "4.5.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
checksum = "83b0f35019843db2160b5bb19ae09b4e6411ac33fc6a712003c33e03090e2489"
dependencies = [
"anstream",
"anstyle",
@ -842,9 +842,9 @@ dependencies = [
[[package]]
name = "darling"
version = "0.20.10"
version = "0.20.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
dependencies = [
"darling_core",
"darling_macro",
@ -852,9 +852,9 @@ dependencies = [
[[package]]
name = "darling_core"
version = "0.20.10"
version = "0.20.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
dependencies = [
"fnv",
"ident_case",
@ -866,9 +866,9 @@ dependencies = [
[[package]]
name = "darling_macro"
version = "0.20.10"
version = "0.20.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
dependencies = [
"darling_core",
"quote",
@ -902,9 +902,9 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
[[package]]
name = "deranged"
version = "0.4.0"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058"
dependencies = [
"powerfmt",
"serde",
@ -1643,14 +1643,15 @@ checksum = "3b24ad5637230df201ab1034d593f1d09bf7f2a9274f2e8897638078579f4265"
[[package]]
name = "iana-time-zone"
version = "0.1.61"
version = "0.1.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
checksum = "b2fd658b06e56721792c5df4475705b6cda790e9298d19d2f8af083457bcd127"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"log",
"wasm-bindgen",
"windows-core",
]
@ -1706,9 +1707,9 @@ dependencies = [
[[package]]
name = "icu_locid_transform_data"
version = "1.5.0"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d"
[[package]]
name = "icu_normalizer"
@ -1730,9 +1731,9 @@ dependencies = [
[[package]]
name = "icu_normalizer_data"
version = "1.5.0"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7"
[[package]]
name = "icu_properties"
@ -1752,9 +1753,9 @@ dependencies = [
[[package]]
name = "icu_properties_data"
version = "1.5.0"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2"
[[package]]
name = "icu_provider"
@ -1832,9 +1833,9 @@ dependencies = [
[[package]]
name = "icu_segmenter_data"
version = "1.5.0"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f739ee737260d955e330bc83fdeaaf1631f7fb7ed218761d3c04bb13bb7d79df"
checksum = "a1e52775179941363cc594e49ce99284d13d6948928d8e72c755f55e98caa1eb"
[[package]]
name = "ident_case"
@ -1871,9 +1872,9 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
[[package]]
name = "image"
version = "0.25.5"
version = "0.25.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a"
dependencies = [
"bytemuck",
"byteorder-lite",
@ -2035,9 +2036,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]]
name = "jiff"
version = "0.2.4"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d699bc6dfc879fb1bf9bdff0d4c56f0884fc6f0d0eb0fba397a6d00cd9a6b85e"
checksum = "c102670231191d07d37a35af3eb77f1f0dbf7a71be51a962dcd57ea607be7260"
dependencies = [
"jiff-static",
"log",
@ -2048,9 +2049,9 @@ dependencies = [
[[package]]
name = "jiff-static"
version = "0.2.4"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d16e75759ee0aa64c57a56acbf43916987b20c77373cb7e808979e02b93c9f9"
checksum = "4cdde31a9d349f1b1f51a0b3714a5940ac022976f4b49485fc04be052b183b4c"
dependencies = [
"proc-macro2",
"quote",
@ -2184,9 +2185,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.26"
version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
[[package]]
name = "lsp-types"
@ -2368,9 +2369,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.21.1"
version = "1.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
[[package]]
name = "oorandom"
@ -2569,9 +2570,9 @@ dependencies = [
[[package]]
name = "plist"
version = "1.7.0"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
checksum = "eac26e981c03a6e53e0aee43c113e3202f5581d5360dae7bd2c70e800dd0451d"
dependencies = [
"base64",
"indexmap 2.8.0",
@ -2660,7 +2661,7 @@ version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
dependencies = [
"zerocopy 0.8.23",
"zerocopy 0.8.24",
]
[[package]]
@ -2799,9 +2800,9 @@ dependencies = [
[[package]]
name = "quinn-udp"
version = "0.5.10"
version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e46f3055866785f6b92bc6164b76be02ca8f2eb4b002c0354b28cf4c119e5944"
checksum = "541d0f57c6ec747a90738a52741d3221f7960e8ac2f0ff4b1a63680e033b4ab5"
dependencies = [
"cfg_aliases",
"libc",
@ -2851,7 +2852,7 @@ checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
dependencies = [
"rand_chacha 0.9.0",
"rand_core 0.9.3",
"zerocopy 0.8.23",
"zerocopy 0.8.24",
]
[[package]]
@ -2946,8 +2947,7 @@ dependencies = [
[[package]]
name = "reflexo"
version = "0.5.5-rc7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19cf32f98fa6cc2a6d4b970e12223575e1650ae54e66e3a628f5f670945f9b08"
source = "git+https://github.com/Myriad-Dreamin/typst.ts/?rev=72e6c9653ca410c5df0b5a01b4c4a8c8cdb1acc8#72e6c9653ca410c5df0b5a01b4c4a8c8cdb1acc8"
dependencies = [
"base64",
"bitvec",
@ -2966,6 +2966,7 @@ dependencies = [
"siphasher",
"tiny-skia-path",
"tinymist-std",
"tinymist-world",
"typst",
"web-time",
]
@ -2973,8 +2974,7 @@ dependencies = [
[[package]]
name = "reflexo-typst"
version = "0.5.5-rc7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36562d01ed781c33d9ddbe43c3487e3334aa44ed85bef70a71c62ad8e1f73bc5"
source = "git+https://github.com/Myriad-Dreamin/typst.ts/?rev=72e6c9653ca410c5df0b5a01b4c4a8c8cdb1acc8#72e6c9653ca410c5df0b5a01b4c4a8c8cdb1acc8"
dependencies = [
"codespan-reporting",
"comemo",
@ -3006,8 +3006,7 @@ dependencies = [
[[package]]
name = "reflexo-typst2vec"
version = "0.5.5-rc7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e048e7b6c634f6cf4a7ba3d7e1954fb887f8fcdf717dbf8432ac4b2f3f18dd6f"
source = "git+https://github.com/Myriad-Dreamin/typst.ts/?rev=72e6c9653ca410c5df0b5a01b4c4a8c8cdb1acc8#72e6c9653ca410c5df0b5a01b4c4a8c8cdb1acc8"
dependencies = [
"bitvec",
"comemo",
@ -3033,8 +3032,7 @@ dependencies = [
[[package]]
name = "reflexo-vec2svg"
version = "0.5.5-rc7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9dfa3ec4d443fdd5ea073d026159d6750822bfd3a3aab9344a4d1279c629685"
source = "git+https://github.com/Myriad-Dreamin/typst.ts/?rev=72e6c9653ca410c5df0b5a01b4c4a8c8cdb1acc8#72e6c9653ca410c5df0b5a01b4c4a8c8cdb1acc8"
dependencies = [
"base64",
"comemo",
@ -3225,9 +3223,9 @@ dependencies = [
[[package]]
name = "rust_decimal"
version = "1.37.0"
version = "1.37.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c24af6e7ac43c88a8a458d1139d0246fdce2f6cd2f1ac6cb51eb88b29c978af"
checksum = "faa7de2ba56ac291bd90c6b9bece784a52ae1411f9506544b3eae36dd2356d50"
dependencies = [
"arrayvec 0.7.6",
"num-traits",
@ -3331,9 +3329,9 @@ dependencies = [
[[package]]
name = "rustls-webpki"
version = "0.103.0"
version = "0.103.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0aa4eeac2588ffff23e9d7a7e9b3f971c5fb5b7ebc9452745e0c232c64f83b2f"
checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
dependencies = [
"ring",
"rustls-pki-types",
@ -3614,9 +3612,9 @@ checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
[[package]]
name = "socket2"
version = "0.5.8"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
dependencies = [
"libc",
"windows-sys 0.52.0",
@ -3901,9 +3899,9 @@ dependencies = [
[[package]]
name = "thin-vec"
version = "0.2.13"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b"
checksum = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d"
[[package]]
name = "thiserror"
@ -3953,9 +3951,9 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820"
[[package]]
name = "time"
version = "0.3.40"
version = "0.3.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618"
checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
dependencies = [
"deranged",
"itoa",
@ -3976,9 +3974,9 @@ checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
[[package]]
name = "time-macros"
version = "0.2.21"
version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04"
checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
dependencies = [
"num-conv",
"time-core",
@ -4087,15 +4085,15 @@ dependencies = [
[[package]]
name = "tinymist-analysis"
version = "0.13.2"
version = "0.13.10"
dependencies = [
"ecow",
"insta",
"log",
"lsp-types",
"regex",
"serde",
"strum",
"tinymist-world",
"toml",
"typst",
]
@ -4169,7 +4167,7 @@ dependencies = [
[[package]]
name = "tinymist-derive"
version = "0.13.2"
version = "0.13.12-rc1"
dependencies = [
"quote",
"syn 2.0.100",
@ -4191,7 +4189,7 @@ dependencies = [
[[package]]
name = "tinymist-project"
version = "0.13.2"
version = "0.13.12-rc12-rc1"
dependencies = [
"anyhow",
"chrono",
@ -4287,7 +4285,7 @@ dependencies = [
[[package]]
name = "tinymist-std"
version = "0.13.2"
version = "0.13.12-rc1"
dependencies = [
"anyhow",
"base64",
@ -4314,7 +4312,6 @@ dependencies = [
"serde_with",
"siphasher",
"tempfile",
"tinymist-analysis",
"typst",
"typst-shim",
"wasm-bindgen",
@ -4324,7 +4321,7 @@ dependencies = [
[[package]]
name = "tinymist-task"
version = "0.13.2"
version = "0.13.12-rc1"
dependencies = [
"anyhow",
"chrono",
@ -4358,7 +4355,7 @@ dependencies = [
[[package]]
name = "tinymist-vfs"
version = "0.13.2"
version = "0.13.12-rc1"
dependencies = [
"comemo",
"ecow",
@ -4376,7 +4373,7 @@ dependencies = [
[[package]]
name = "tinymist-world"
version = "0.13.2"
version = "0.13.12-rc1"
dependencies = [
"anyhow",
"chrono",
@ -4390,6 +4387,7 @@ dependencies = [
"hex",
"js-sys",
"log",
"lsp-types",
"parking_lot",
"rayon",
"reqwest",
@ -4942,7 +4940,7 @@ dependencies = [
[[package]]
name = "typst-shim"
version = "0.13.2"
version = "0.13.12-rc1"
dependencies = [
"cfg-if",
"comemo",
@ -5849,11 +5847,11 @@ dependencies = [
[[package]]
name = "zerocopy"
version = "0.8.23"
version = "0.8.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
dependencies = [
"zerocopy-derive 0.8.23",
"zerocopy-derive 0.8.24",
]
[[package]]
@ -5869,9 +5867,9 @@ dependencies = [
[[package]]
name = "zerocopy-derive"
version = "0.8.23"
version = "0.8.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
dependencies = [
"proc-macro2",
"quote",

View file

@ -177,19 +177,19 @@ insta = { version = "1.39", features = ["glob"] }
# Our Own Crates
tinymist-assets = { version = "=0.13.10" }
tinymist-derive = { path = "./crates/tinymist-derive/", version = "0.13.2" }
tinymist-std = { path = "./crates/tinymist-std/", version = "0.13.2", default-features = false }
tinymist-vfs = { path = "./crates/tinymist-vfs/", version = "0.13.2", default-features = false }
tinymist-world = { path = "./crates/tinymist-world/", version = "0.13.2", default-features = false }
tinymist-project = { path = "./crates/tinymist-project/", version = "0.13.2" }
tinymist-task = { path = "./crates/tinymist-task/", version = "0.13.2" }
tinymist-analysis = { path = "./crates/tinymist-analysis/", version = "0.13.2" }
typst-shim = { path = "./crates/typst-shim", version = "0.13.2" }
tinymist-derive = { path = "./crates/tinymist-derive/", version = "0.13.12-rc1" }
tinymist-std = { path = "./crates/tinymist-std/", version = "0.13.12-rc1", default-features = false }
tinymist-vfs = { path = "./crates/tinymist-vfs/", version = "0.13.12-rc1", default-features = false }
tinymist-world = { path = "./crates/tinymist-world/", version = "0.13.12-rc1", default-features = false }
tinymist-project = { path = "./crates/tinymist-project/", version = "0.13.12-rc1" }
tinymist-task = { path = "./crates/tinymist-task/", version = "0.13.12-rc1" }
typst-shim = { path = "./crates/typst-shim", version = "0.13.12-rc1" }
tinymist-core = { path = "./crates/tinymist-core/", version = "0.13.10", default-features = false }
tinymist-debug = { path = "./crates/tinymist-debug/", version = "0.13.10" }
tinymist = { path = "./crates/tinymist/", version = "0.13.10" }
tinymist-l10n = { path = "./crates/tinymist-l10n/", version = "0.13.10" }
tinymist-analysis = { path = "./crates/tinymist-analysis/", version = "0.13.10" }
tinymist-query = { path = "./crates/tinymist-query/", version = "0.13.10" }
tinymist-render = { path = "./crates/tinymist-render/", version = "0.13.10" }
typst-preview = { path = "./crates/typst-preview", version = "0.13.10" }
@ -280,9 +280,9 @@ typst-eval = { git = "https://github.com/Myriad-Dreamin/typst.git", tag = "tinym
# These patches use a different version of `reflexo`.
#
# A regular build MUST use `tag` or `rev` to specify the version of the patched crate to ensure stability.
# reflexo = { git = "https://github.com/Myriad-Dreamin/typst.ts/", rev = "9e8f529b6a76fb108b9a70587fa7894bc497ac32" }
# reflexo-typst = { git = "https://github.com/Myriad-Dreamin/typst.ts/", rev = "9e8f529b6a76fb108b9a70587fa7894bc497ac32" }
# reflexo-vec2svg = { git = "https://github.com/Myriad-Dreamin/typst.ts/", rev = "9e8f529b6a76fb108b9a70587fa7894bc497ac32" }
reflexo = { git = "https://github.com/Myriad-Dreamin/typst.ts/", rev = "72e6c9653ca410c5df0b5a01b4c4a8c8cdb1acc8" }
reflexo-typst = { git = "https://github.com/Myriad-Dreamin/typst.ts/", rev = "72e6c9653ca410c5df0b5a01b4c4a8c8cdb1acc8" }
reflexo-vec2svg = { git = "https://github.com/Myriad-Dreamin/typst.ts/", rev = "72e6c9653ca410c5df0b5a01b4c4a8c8cdb1acc8" }
# These patches use local `reflexo` for development.
# reflexo = { path = "../typst.ts/crates/reflexo/" }
@ -290,16 +290,6 @@ typst-eval = { git = "https://github.com/Myriad-Dreamin/typst.git", tag = "tinym
# reflexo-vec2svg = { path = "../typst.ts/crates/conversion/vec2svg/" }
# typstyle-core = { git = "https://github.com/ParaN3xus/typstyle/", tag = "tinymist-nightly-v0.12.21-rc1" }
typst-shim = { path = "crates/typst-shim" }
tinymist-analysis = { path = "crates/tinymist-analysis" }
tinymist-std = { path = "crates/tinymist-std" }
tinymist-vfs = { path = "crates/tinymist-vfs" }
tinymist-world = { path = "crates/tinymist-world" }
tinymist-project = { path = "crates/tinymist-project" }
tinymist-task = { path = "crates/tinymist-task" }
# If reflexo use the tinymist from git, you should use the following patch.
# [patch."https://github.com/Myriad-Dreamin/tinymist.git"]
# typst-shim = { path = "crates/typst-shim" }
# tinymist-analysis = { path = "crates/tinymist-analysis" }
# tinymist-std = { path = "crates/tinymist-std" }
@ -307,3 +297,13 @@ tinymist-task = { path = "crates/tinymist-task" }
# tinymist-world = { path = "crates/tinymist-world" }
# tinymist-project = { path = "crates/tinymist-project" }
# tinymist-task = { path = "crates/tinymist-task" }
# If reflexo use the tinymist from git, you should use the following patch.
[patch."https://github.com/Myriad-Dreamin/tinymist.git"]
typst-shim = { path = "crates/typst-shim" }
tinymist-analysis = { path = "crates/tinymist-analysis" }
tinymist-std = { path = "crates/tinymist-std" }
tinymist-vfs = { path = "crates/tinymist-vfs" }
tinymist-world = { path = "crates/tinymist-world" }
tinymist-project = { path = "crates/tinymist-project" }
tinymist-task = { path = "crates/tinymist-task" }

View file

@ -232,12 +232,12 @@ pub(crate) fn read_msg_text(inp: &mut dyn BufRead) -> io::Result<Option<String>>
buf.resize(size, 0);
inp.read_exact(&mut buf)?;
let buf = String::from_utf8(buf).map_err(invalid_data)?;
log::debug!("< {}", buf);
log::debug!("< {buf}");
Ok(Some(buf))
}
pub(crate) fn write_msg_text(out: &mut dyn Write, msg: &str) -> io::Result<()> {
log::debug!("> {}", msg);
log::debug!("> {msg}");
write!(out, "Content-Length: {}\r\n\r\n", msg.len())?;
out.write_all(msg.as_bytes())?;
out.flush()?;

View file

@ -145,7 +145,7 @@ pub fn io_transport<I: BufRead, O: Write>(
#[cfg(feature = "lsp")]
let is_exit = matches!(&msg, Message::Lsp(LspMessage::Notification(n)) if n.is_exit());
log::trace!("sending message {:#?}", msg);
log::trace!("sending message {msg:#?}");
reader_sender
.send(msg)
.expect("receiver was dropped, failed to send a message");

View file

@ -4,7 +4,7 @@ description = "Typst Static Analyzers for Tinymist."
categories = ["compilers"]
keywords = ["language", "typst"]
# group: world
version = "0.13.2"
version.workspace = true
authors.workspace = true
license.workspace = true
edition.workspace = true
@ -14,12 +14,12 @@ rust-version.workspace = true
[dependencies]
ecow.workspace = true
lsp-types.workspace = true
log.workspace = true
serde.workspace = true
strum.workspace = true
toml.workspace = true
tinymist-world.workspace = true
typst.workspace = true
log.workspace = true
[dev-dependencies]
insta.workspace = true

View file

@ -1,6 +1,5 @@
//! Tinymist Analysis
pub mod debug_loc;
pub mod location;
mod prelude;
pub mod syntax;

View file

@ -6,9 +6,9 @@ use std::ops::Range;
use typst::syntax::Source;
/// An LSP Position encoded by [`PositionEncoding`].
type LspPosition = lsp_types::Position;
type LspPosition = tinymist_world::debug_loc::LspPosition;
/// An LSP range encoded by [`PositionEncoding`].
type LspRange = lsp_types::Range;
type LspRange = tinymist_world::debug_loc::LspRange;
/// What counts as "1 character" for string indexing. We should always prefer
/// UTF-8, but support UTF-16 as long as it is standard. For more background on
@ -28,7 +28,7 @@ pub enum PositionEncoding {
Utf8,
}
impl From<PositionEncoding> for lsp_types::PositionEncodingKind {
impl From<PositionEncoding> for tinymist_world::debug_loc::PositionEncodingKind {
fn from(position_encoding: PositionEncoding) -> Self {
match position_encoding {
PositionEncoding::Utf16 => Self::UTF16,
@ -187,7 +187,7 @@ pub fn to_lsp_range(
#[cfg(test)]
mod test {
use lsp_types::Position;
use super::LspPosition as Position;
use super::*;

View file

@ -56,8 +56,8 @@
//! ^ SurroundingSyntax::Regular
//! ```
use crate::debug_loc::SourceSpanOffset;
use serde::{Deserialize, Serialize};
use tinymist_world::debug_loc::SourceSpanOffset;
use typst::syntax::Span;
use crate::prelude::*;

View file

@ -6,8 +6,8 @@ use std::sync::{Arc, LazyLock};
use parking_lot::Mutex;
use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
use tinymist_analysis::location::PositionEncoding;
use tinymist_std::debug_loc::LspRange;
use tinymist_std::hash::FxHashMap;
use tinymist_world::debug_loc::LspRange;
use tinymist_world::vfs::{FileId, WorkspaceResolver};
use tinymist_world::{CompilerFeat, CompilerWorld};
use typst::diag::FileResult;

View file

@ -4,7 +4,7 @@ description = "Provides derive for tinymist."
categories = ["compilers"]
keywords = ["typst"]
# group: world
version = "0.13.2"
version = "0.13.12-rc1"
authors.workspace = true
license.workspace = true
edition.workspace = true

View file

@ -4,7 +4,7 @@ description = "Project model of typst for tinymist."
categories = ["compilers"]
keywords = ["language", "typst"]
# group: world
version = "0.13.2"
version = "0.13.12-rc12-rc1"
authors.workspace = true
license.workspace = true
edition.workspace = true

View file

@ -7,7 +7,7 @@ use std::collections::HashMap;
use std::path::PathBuf;
use std::sync::{Arc, Mutex};
use tinymist_std::debug_loc::DataSource;
use tinymist_world::debug_loc::DataSource;
use tinymist_world::font::system::SystemFontSearcher;
use typst::text::{Font, FontBook, FontInfo};
use typst::utils::LazyHash;

View file

@ -43,7 +43,7 @@ pub fn analyze_call(
source: Source,
node: LinkedNode,
) -> Option<Arc<CallInfo>> {
log::trace!("func call found: {:?}", node);
log::trace!("func call found: {node:?}");
let call = node.cast::<ast::FuncCall>()?;
let callee = call.callee();

View file

@ -9,9 +9,9 @@ use once_cell::sync::OnceCell;
use parking_lot::Mutex;
use rustc_hash::FxHashMap;
use tinymist_project::LspWorld;
use tinymist_std::debug_loc::DataSource;
use tinymist_std::hash::{hash128, FxDashMap};
use tinymist_std::typst::TypstDocument;
use tinymist_world::debug_loc::DataSource;
use tinymist_world::vfs::{FileId, PathResolution, WorkspaceResolver};
use tinymist_world::{EntryReader, DETACHED_ENTRY};
use typst::diag::{eco_format, At, FileError, FileResult, SourceResult, StrResult};

View file

@ -2,8 +2,8 @@ use std::sync::Arc;
use std::{collections::HashMap, path::PathBuf};
use serde::{Deserialize, Serialize};
use tinymist_std::debug_loc::DataSource;
use tinymist_std::typst::TypstDocument;
use tinymist_world::debug_loc::DataSource;
use typst::text::{Font, FontStretch, FontStyle, FontWeight};
use typst::{
layout::{Frame, FrameItem},

View file

@ -110,18 +110,18 @@ impl InlayHintWorker<'_> {
match node.kind() {
// Type inlay hints
SyntaxKind::LetBinding => {
log::trace!("let binding found: {:?}", node);
log::trace!("let binding found: {node:?}");
}
// Assignment inlay hints
SyntaxKind::Eq => {
log::trace!("assignment found: {:?}", node);
log::trace!("assignment found: {node:?}");
}
SyntaxKind::DestructAssignment => {
log::trace!("destruct assignment found: {:?}", node);
log::trace!("destruct assignment found: {node:?}");
}
// Parameter inlay hints
SyntaxKind::FuncCall => {
log::trace!("func call found: {:?}", node);
log::trace!("func call found: {node:?}");
let call_info = analyze_call(self.ctx, self.source.clone(), node.clone())?;
crate::log_debug_ct!("got call_info {call_info:?}");
@ -264,7 +264,7 @@ impl InlayHintWorker<'_> {
// todo: union signatures
}
SyntaxKind::Set => {
log::trace!("set rule found: {:?}", node);
log::trace!("set rule found: {node:?}");
}
_ => {}
}

View file

@ -3,7 +3,8 @@
use std::num::NonZeroUsize;
use tinymist_project::LspWorld;
use tinymist_std::{debug_loc::SourceSpanOffset, typst::TypstDocument};
use tinymist_std::typst::TypstDocument;
use tinymist_world::debug_loc::SourceSpanOffset;
use typst::{
layout::{Frame, FrameItem, Point, Position, Size},
syntax::{LinkedNode, Source, Span, SyntaxKind},

View file

@ -31,7 +31,7 @@ pub fn construct_module_dependencies(
Err(err) => {
static WARN_ONCE: Once = Once::new();
WARN_ONCE.call_once(|| {
log::warn!("construct_module_dependencies: {err:?}", err = err);
log::warn!("construct_module_dependencies: {err:?}");
});
continue;
}

View file

@ -11,9 +11,9 @@ use std::{
use once_cell::sync::Lazy;
use serde_json::{ser::PrettyFormatter, Serializer, Value};
use tinymist_project::{CompileFontArgs, ExportTarget, LspCompileSnapshot, LspComputeGraph};
use tinymist_std::debug_loc::LspRange;
use tinymist_std::path::unix_slash;
use tinymist_std::typst::TypstDocument;
use tinymist_world::debug_loc::LspRange;
use tinymist_world::package::PackageSpec;
use tinymist_world::vfs::WorkspaceResolver;
use tinymist_world::{EntryManager, EntryReader, EntryState, ShadowApi, TaskInputs};

View file

@ -2,7 +2,7 @@
name = "tinymist-std"
description = "Additional functions wrapping Rust's standard library."
# group: world
version = "0.13.2"
version = "0.13.12-rc1"
authors.workspace = true
license.workspace = true
edition.workspace = true
@ -19,7 +19,6 @@ dashmap.workspace = true
ecow.workspace = true
fxhash.workspace = true
log.workspace = true
tinymist-analysis.workspace = true
path-clean.workspace = true
pathdiff.workspace = true
parking_lot.workspace = true

View file

@ -13,8 +13,6 @@ pub use concepts::*;
pub use error::{ErrKind, Error, Result};
#[cfg(feature = "typst")]
pub use tinymist_analysis::debug_loc;
#[cfg(feature = "typst")]
pub use typst_shim;

View file

@ -4,7 +4,7 @@ description = "Task model of typst for tinymist."
categories = ["compilers"]
keywords = ["language", "typst"]
# group: world
version = "0.13.2"
version = "0.13.12-rc1"
authors.workspace = true
license.workspace = true
edition.workspace = true

View file

@ -2,7 +2,7 @@
name = "tinymist-vfs"
description = "Vfs for tinymist."
# group: world
version = "0.13.2"
version = "0.13.12-rc1"
authors.workspace = true
license.workspace = true
edition.workspace = true

View file

@ -4,7 +4,7 @@ description = "Typst's World implementation for tinymist."
categories = ["compilers"]
keywords = ["language", "typst"]
# group: world
version = "0.13.2"
version = "0.13.12-rc1"
authors.workspace = true
license.workspace = true
edition.workspace = true
@ -26,6 +26,7 @@ fontdb = { workspace = true, optional = true }
hex.workspace = true
js-sys = { workspace = true, optional = true }
log.workspace = true
lsp-types.workspace = true
parking_lot.workspace = true
rayon.workspace = true
reqwest = { workspace = true, optional = true }

View file

@ -1,9 +1,11 @@
//! The debug location that can be used to locate a position in a document or a
//! file.
use serde::{Deserialize, Serialize};
pub use lsp_types::PositionEncodingKind;
pub use typst::layout::Position as TypstPosition;
use serde::{Deserialize, Serialize};
/// A serializable physical position in a document.
///
/// Note that it uses [`f32`] instead of [`f64`] as same as
@ -82,7 +84,6 @@ pub struct FlatSourceLocation {
/// A resolved file position. The position is encoded in Utf-8, Utf-16 or
/// Utf-32. The position encoding must be negotiated via some protocol like LSP.
pub type LspPosition = lsp_types::Position;
/// A resolved file range.
///
/// See [`LspPosition`] for the definition of the position inside a file.

View file

@ -1,7 +1,7 @@
use tinymist_std::debug_loc::{DataSource, MemoryDataSource};
use typst::foundations::Bytes;
use typst::text::{FontBook, FontInfo};
use crate::debug_loc::{DataSource, MemoryDataSource};
use crate::font::{BufferFontLoader, FontResolverImpl, FontSlot};
/// memory font builder.

View file

@ -6,11 +6,11 @@ use std::{
sync::{Arc, Mutex},
};
use tinymist_std::debug_loc::DataSource;
use typst::text::{Font, FontBook, FontInfo};
use typst::utils::LazyHash;
use super::{BufferFontLoader, FontProfile, FontSlot, PartialFontBook};
use crate::debug_loc::DataSource;
use crate::Bytes;
/// A FontResolver can resolve a font by index.

View file

@ -1,10 +1,10 @@
use core::fmt;
use std::sync::Arc;
use tinymist_std::debug_loc::DataSource;
use tinymist_std::QueryRef;
use typst::text::Font;
use crate::debug_loc::DataSource;
use crate::font::FontLoader;
type FontSlotInner = QueryRef<Option<Font>, (), Box<dyn FontLoader + Send>>;

View file

@ -9,7 +9,6 @@ use std::{
use fontdb::Database;
use rayon::iter::{IntoParallelIterator, ParallelIterator};
use sha2::{Digest, Sha256};
use tinymist_std::debug_loc::{DataSource, MemoryDataSource};
use tinymist_std::error::prelude::*;
use tinymist_vfs::system::LazyFile;
use typst::{
@ -22,6 +21,7 @@ use super::{
BufferFontLoader, FontProfile, FontProfileItem, FontResolverImpl, FontSlot,
LazyBufferFontLoader, PartialFontBook,
};
use crate::debug_loc::{DataSource, FsDataSource, MemoryDataSource};
use crate::{build_info, config::CompileFontOpts};
#[derive(Debug, Default)]
@ -185,7 +185,6 @@ impl SystemFontSearcher {
pub fn flush(&mut self) {
use fontdb::Source;
use tinymist_std::debug_loc::FsDataSource;
let face = self.db.faces().collect::<Vec<_>>();
let info = face.into_par_iter().map(|face| {

View file

@ -3,27 +3,25 @@
#![allow(missing_docs)]
pub mod args;
pub mod source;
pub mod config;
pub mod debug_loc;
pub mod entry;
pub use entry::*;
pub mod world;
pub use world::*;
pub mod font;
pub mod package;
pub mod parser;
mod snapshot;
pub use snapshot::*;
mod compute;
pub mod source;
pub mod world;
pub use compute::*;
pub use entry::*;
pub use snapshot::*;
pub use world::*;
pub use tinymist_vfs as vfs;
mod compute;
mod snapshot;
/// Run the compiler in the system environment.
#[cfg(feature = "system")]
pub mod system;

View file

@ -1,7 +1,7 @@
use std::sync::Arc;
use reflexo_typst::debug_loc::DataSource;
use serde::{Deserialize, Serialize};
use tinymist_std::debug_loc::DataSource;
use typst::text::{FontStretch, FontStyle, FontWeight};
use super::prelude::*;

View file

@ -983,7 +983,7 @@ impl ServerState {
writeln!(o, "$#{k}$/* {} */#pagebreak()", e.unicode).ok();
o
});
log::debug!("math shaping text: {text}", text = math_shaping_text);
log::debug!("math shaping text: {math_shaping_text}");
let symbols_ref = symbols.keys().cloned().collect::<Vec<_>>();

View file

@ -8,16 +8,15 @@ pub use actor::editor::{
};
pub use args::*;
pub use outline::Outline;
use tinymist_std::debug_loc::DocumentPosition;
use tinymist_std::error::IgnoreLogging;
use std::{collections::HashMap, future::Future, path::PathBuf, pin::Pin, sync::Arc};
use futures::sink::SinkExt;
use once_cell::sync::OnceCell;
use reflexo_typst::debug_loc::SourceSpanOffset;
use reflexo_typst::debug_loc::{DocumentPosition, SourceSpanOffset};
use reflexo_typst::Error;
use serde::{Deserialize, Serialize};
use tinymist_std::error::IgnoreLogging;
use tinymist_std::typst::TypstDocument;
use tokio::sync::{broadcast, mpsc};
use typst::{layout::Position, syntax::Span};

View file

@ -2,7 +2,7 @@
name = "typst-shim"
description = "A compatibility layer for Typst release and mainline versions."
authors = ["The Typst Project Developers"]
version = "0.13.2"
version = "0.13.12-rc1"
edition.workspace = true
license.workspace = true
homepage.workspace = true