language-servers/tinymist
1
0
Fork 0
mirror of https://github.com/Myriad-Dreamin/tinymist.git synced 2025-07-24 13:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

build: bump typst to 0.11.1 (#301)

Browse source
This commit is contained in:
Myriad-Dreamin 2024-05-18 12:17:24 +08:00 • committed by GitHub
parent 71591b1f08
commit 071d9072e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 384 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

667
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

32
Cargo.toml
View file

@ -42,18 +42,18 @@ toml = { version = "0.8", default-features = false, features = [
] } ] }
codespan-reporting = "0.11" codespan-reporting = "0.11"
typst = "0.11.0" typst = "0.11.1"
typst-timing = "0.11.0" typst-timing = "0.11.1"
typst-pdf = "0.11.0" typst-pdf = "0.11.1"
typst-svg = "0.11.0" typst-svg = "0.11.1"
typst-render = "0.11.0" typst-render = "0.11.1"
typst-assets = "0.11.0" typst-assets = "0.11.1"
reflexo = { version = "0.5.0-rc3", default-features = false, features = [ reflexo = { version = "0.5.0-rc4", default-features = false, features = [
"flat-vector", "flat-vector",
] } ] }
typst-ts-core = { version = "0.5.0-rc3", default-features = false } typst-ts-core = { version = "0.5.0-rc4", default-features = false }
typst-ts-compiler = { version = "0.5.0-rc3" } typst-ts-compiler = { version = "0.5.0-rc4" }
typst-ts-svg-exporter = { version = "0.5.0-rc3" } typst-ts-svg-exporter = { version = "0.5.0-rc4" }
typst-preview = { version = "0.11.3" } typst-preview = { version = "0.11.3" }
typstyle = "0.11.17" typstyle = "0.11.17"
typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", tag = "0.2.7" } typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", tag = "0.2.7" }
@ -127,12 +127,12 @@ undocumented_unsafe_blocks = "warn"
[patch.crates-io] [patch.crates-io]
typst = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "tinymist-v0.11.0-2" } typst = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "tinymist-v0.11.1" }
typst-timing = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "tinymist-v0.11.0-2" } typst-timing = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "tinymist-v0.11.1" }
typst-svg = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "tinymist-v0.11.0-2" } typst-svg = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "tinymist-v0.11.1" }
typst-render = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "tinymist-v0.11.0-2" } typst-render = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "tinymist-v0.11.1" }
typst-pdf = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "tinymist-v0.11.0-2" } typst-pdf = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "tinymist-v0.11.1" }
typst-syntax = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "tinymist-v0.11.0-2" } typst-syntax = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "tinymist-v0.11.1" }
# typst = { path = "../typst/crates/typst" } # typst = { path = "../typst/crates/typst" }
# typst-timing = { path = "../typst/crates/typst-timing" } # typst-timing = { path = "../typst/crates/typst-timing" }

5
crates/tinymist-query/src/analysis/global.rs
View file

@ -420,7 +420,10 @@ pub trait AnalysisResources {
fn resolve(&self, spec: &PackageSpec) -> Result<Arc<Path>, PackageError>; fn resolve(&self, spec: &PackageSpec) -> Result<Arc<Path>, PackageError>;
/// Get all the files in the workspace. /// Get all the files in the workspace.
fn iter_dependencies(&self, f: &mut dyn FnMut(&ImmutPath, std::time::SystemTime)); fn iter_dependencies<'a>(
&'a self,
f: &mut dyn FnMut(&'a ImmutPath, FileResult<&std::time::SystemTime>),
);
/// Resolve extra font information. /// Resolve extra font information.
fn font_info(&self, _font: Font) -> Option<Arc<DataSource>> { fn font_info(&self, _font: Font) -> Option<Arc<DataSource>> {

14
crates/tinymist-query/src/tests.rs
View file

@ -8,9 +8,12 @@ use std::{
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
pub use serde::Serialize; pub use serde::Serialize;
use serde_json::{ser::PrettyFormatter, Serializer, Value}; use serde_json::{ser::PrettyFormatter, Serializer, Value};
use typst::syntax::{ use typst::{
ast::{self, AstNode}, diag::FileResult,
FileId as TypstFileId, LinkedNode, Source, SyntaxKind, VirtualPath, syntax::{
ast::{self, AstNode},
FileId as TypstFileId, LinkedNode, Source, SyntaxKind, VirtualPath,
},
}; };
use typst::{diag::PackageError, foundations::Bytes}; use typst::{diag::PackageError, foundations::Bytes};
use typst_ts_compiler::{ use typst_ts_compiler::{
@ -43,7 +46,10 @@ impl<'a> AnalysisResources for WrapWorld<'a> {
self.0.registry.resolve(spec) self.0.registry.resolve(spec)
} }
fn iter_dependencies(&self, f: &mut dyn FnMut(&reflexo::ImmutPath, typst_ts_compiler::Time)) { fn iter_dependencies<'b>(
&'b self,
f: &mut dyn FnMut(&'b reflexo::ImmutPath, FileResult<&typst_ts_compiler::Time>),
) {
self.0.iter_dependencies(f) self.0.iter_dependencies(f)
} }
} }

7
crates/tinymist/src/actor/typ_client.rs
View file

@ -42,7 +42,7 @@ use tinymist_query::{
use tinymist_render::PeriscopeRenderer; use tinymist_render::PeriscopeRenderer;
use tokio::sync::{mpsc, oneshot, watch}; use tokio::sync::{mpsc, oneshot, watch};
use typst::{ use typst::{
diag::{PackageError, SourceDiagnostic, SourceResult}, diag::{FileResult, PackageError, SourceDiagnostic, SourceResult},
layout::Position, layout::Position,
model::Document as TypstDocument, model::Document as TypstDocument,
syntax::package::PackageSpec, syntax::package::PackageSpec,
@ -242,7 +242,10 @@ impl CompileDriver {
self.0.registry.resolve(spec) self.0.registry.resolve(spec)
} }
fn iter_dependencies(&self, f: &mut dyn FnMut(&ImmutPath, Time)) { fn iter_dependencies<'b>(
&'b self,
f: &mut dyn FnMut(&'b ImmutPath, FileResult<&Time>),
) {
use typst_ts_compiler::NotifyApi; use typst_ts_compiler::NotifyApi;
self.0.iter_dependencies(f) self.0.iter_dependencies(f)
} }