language-servers/tinymist
1
0
Fork 0
mirror of https://github.com/Myriad-Dreamin/tinymist.git synced 2025-08-04 02:08:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

refactor: remove z_internal_error and outdated comments (#1228)

Browse source
This commit is contained in:
Myriad-Dreamin 2025-01-30 00:25:42 +08:00 • committed by GitHub
parent af47f578e4
commit eac275c28d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 19 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/tinymist/src/actor/mod.rs
View file

@ -1,5 +1,3 @@
//! Bootstrap actors for Tinymist.
pub mod editor;
#[cfg(feature = "preview")]
pub mod preview;

32
crates/tinymist/src/cmd.rs
View file

@ -384,7 +384,7 @@ impl ServerState {
let from_source = get_arg!(args[0] as String);
let to_path = get_arg!(args[1] as Option<PathBuf>).map(From::from);
let snap = self.snapshot().map_err(z_internal_error)?;
let snap = self.snapshot().map_err(internal_error)?;
just_future(async move {
// Parse the package specification. If the user didn't specify the version,
@ -400,7 +400,7 @@ impl ServerState {
StrResult::Ok(spec.at(version))
})
.map_err(map_string_err("failed to parse package spec"))
.map_err(z_internal_error)?;
.map_err(internal_error)?;
let from_source = TemplateSource::Package(spec);
@ -412,7 +412,7 @@ impl ServerState {
},
)
.map_err(map_string_err("failed to initialize template"))
.map_err(z_internal_error)?;
.map_err(internal_error)?;
log::info!("template initialized: {from_source:?} to {to_path:?}");
@ -427,7 +427,7 @@ impl ServerState {
let from_source = get_arg!(args[0] as String);
let snap = self.snapshot().map_err(z_internal_error)?;
let snap = self.snapshot().map_err(internal_error)?;
just_future(async move {
// Parse the package specification. If the user didn't specify the version,
@ -443,13 +443,13 @@ impl ServerState {
StrResult::Ok(spec.at(version))
})
.map_err(map_string_err("failed to parse package spec"))
.map_err(z_internal_error)?;
.map_err(internal_error)?;
let from_source = TemplateSource::Package(spec);
let entry = package::get_entry(&snap.world, from_source)
.map_err(map_string_err("failed to get template entry"))
.map_err(z_internal_error)?;
.map_err(internal_error)?;
let entry = String::from_utf8(entry.to_vec())
.map_err(|_| invalid_params("template entry is not a valid UTF-8 string"))?;
@ -493,7 +493,7 @@ impl ServerState {
let entry = self.entry_resolver().resolve(Some(path));
let snap = self.snapshot().map_err(z_internal_error)?;
let snap = self.snapshot().map_err(internal_error)?;
let user_action = self.user_action;
just_future(async move {
@ -504,14 +504,14 @@ impl ServerState {
let root = entry
.root()
.ok_or_else(|| error_once!("root must be determined for trace, got", entry: display_entry()))
.map_err(z_internal_error)?;
.map_err(internal_error)?;
let main = entry
.main()
.and_then(|e| e.vpath().resolve(&root))
.ok_or_else(
|| error_once!("main file must be resolved, got", entry: display_entry()),
)
.map_err(z_internal_error)?;
.map_err(internal_error)?;
let task = user_action.trace(TraceParams {
compiler_program: self_path,
@ -560,13 +560,13 @@ impl ServerState {
impl ServerState {
/// Get the all valid fonts
pub fn resource_fonts(&mut self, _arguments: Vec<JsonValue>) -> AnySchedulableResponse {
let snapshot = self.snapshot().map_err(z_internal_error)?;
let snapshot = self.snapshot().map_err(internal_error)?;
just_future(Self::get_font_resources(snapshot))
}
/// Get the all valid symbols
pub fn resource_symbols(&mut self, _arguments: Vec<JsonValue>) -> AnySchedulableResponse {
let snapshot = self.snapshot().map_err(z_internal_error)?;
let snapshot = self.snapshot().map_err(internal_error)?;
just_future(Self::get_symbol_resources(snapshot))
}
@ -583,7 +583,7 @@ impl ServerState {
/// Get directory of packages
pub fn resource_package_dirs(&mut self, _arguments: Vec<JsonValue>) -> AnySchedulableResponse {
let snap = self.snapshot().map_err(z_internal_error)?;
let snap = self.snapshot().map_err(internal_error)?;
just_future(async move {
let paths = snap.world.registry.paths();
let paths = paths.iter().map(|p| p.as_ref()).collect::<Vec<_>>();
@ -596,7 +596,7 @@ impl ServerState {
&mut self,
_arguments: Vec<JsonValue>,
) -> AnySchedulableResponse {
let snap = self.snapshot().map_err(z_internal_error)?;
let snap = self.snapshot().map_err(internal_error)?;
just_future(async move {
let paths = snap.world.registry.local_path();
let paths = paths.as_deref().into_iter().collect::<Vec<_>>();
@ -611,7 +611,7 @@ impl ServerState {
) -> AnySchedulableResponse {
let ns = get_arg!(arguments[1] as EcoString);
let snap = self.snapshot().map_err(z_internal_error)?;
let snap = self.snapshot().map_err(internal_error)?;
just_future(async move {
let packages =
tinymist_query::package::list_package_by_namespace(&snap.world.registry, ns)
@ -664,7 +664,7 @@ impl ServerState {
self.within_package(info.clone(), move |a| {
tinymist_query::docs::package_docs(a, &info)
.map_err(map_string_err("failed to generate docs"))
.map_err(z_internal_error)
.map_err(internal_error)
})
}
@ -676,7 +676,7 @@ impl ServerState {
self.within_package(info.clone(), move |a| {
tinymist_query::package::check_package(a, &info)
.map_err(map_string_err("failed to check package"))
.map_err(z_internal_error)
.map_err(internal_error)
})
}

8
crates/tinymist/src/resource/symbols.rs
View file

@ -1,13 +1,11 @@
use std::{collections::BTreeMap, path::Path, sync::Arc};
// use reflexo_typst::font::GlyphId;
use reflexo_typst::{vector::font::GlyphId, TypstDocument, TypstFont};
use sync_lsp::LspResult;
use tinymist_project::LspCompileSnapshot;
use typst::{syntax::VirtualPath, World};
use crate::world::{base::ShadowApi, EntryState, TaskInputs};
use crate::z_internal_error;
use super::prelude::*;
@ -987,12 +985,12 @@ impl ServerState {
forked
.map_shadow_by_id(forked.main(), math_shaping_text.into_bytes().into())
.map_err(|e| error_once!("cannot map shadow", err: e))
.map_err(z_internal_error)?;
.map_err(internal_error)?;
let sym_doc = std::marker::PhantomData
.compile(&forked, &mut Default::default())
.map_err(|e| error_once!("cannot compile symbols", err: format!("{e:?}")))
.map_err(z_internal_error)?;
.map_err(internal_error)?;
log::debug!("sym doc: {sym_doc:?}");
Some(trait_symbol_fonts(&sym_doc.output, &symbols_ref))
@ -1086,7 +1084,7 @@ impl ServerState {
serde_json::to_value(resp)
.context("cannot serialize response")
.map_err(z_internal_error)
.map_err(internal_error)
}
}

2
crates/tinymist/src/state/input.rs
View file

@ -1,5 +1,3 @@
//! tinymist's language server
use std::path::PathBuf;
use lsp_types::request::WorkspaceConfiguration;

2
crates/tinymist/src/state/protocol.rs
View file

@ -1,5 +1,3 @@
//! tinymist's language server
use lsp_types::*;
use request::{RegisterCapability, UnregisterCapability};
use sync_lsp::*;

2
crates/tinymist/src/state/server.rs
View file

@ -1,5 +1,3 @@
//! tinymist's language server
use std::collections::HashMap;
use std::ops::Deref;
use std::path::{Path, PathBuf};

10
crates/tinymist/src/utils.rs
View file

@ -1,7 +1,5 @@
use core::fmt;
use lsp_server::{ErrorCode, ResponseError};
#[derive(Clone)]
pub struct Derived<T>(pub T);
@ -47,14 +45,6 @@ macro_rules! get_arg_or_default {
}
pub(crate) use get_arg_or_default;
pub fn z_internal_error(msg: tinymist_std::Error) -> ResponseError {
ResponseError {
code: ErrorCode::InternalError as i32,
message: format!("internal: {msg:?}"),
data: None,
}
}
pub fn try_<T>(f: impl FnOnce() -> Option<T>) -> Option<T> {
f()
}