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

dev: disable diagnostics on unpinned main

Browse source
This commit is contained in:
Myriad-Dreamin 2024-03-09 14:12:27 +08:00
parent d9921b9c3e
commit 569ade0e7a
1 changed files with 35 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

44
crates/tinymist/src/actor/typst.rs
View file

@ -6,7 +6,7 @@ use std::{
use anyhow::anyhow;
use futures::future::join_all;
use log::{debug, error, trace, warn};
use log::{debug, error, info, trace, warn};
use tinymist_query::{
lsp_to_typst, CompilerQueryRequest, CompilerQueryResponse, DiagnosticsMap, FoldRequestFeature,
LspDiagnostic, OnSaveExportRequest, PositionEncoding, SemanticTokenCache,
@ -16,7 +16,7 @@ use tower_lsp::lsp_types::{Diagnostic, TextDocumentContentChangeEvent, Url};
use typst::{
diag::{FileResult, SourceDiagnostic, SourceResult},
layout::Position,
syntax::{Source, Span},
syntax::{Source, Span, VirtualPath},
};
use typst_preview::{
CompilationHandle, CompilationHandleImpl, CompileHost, CompileStatus, DocToSrcJumpInfo,
@ -112,16 +112,12 @@ impl CompileCluster {
.server("main".to_owned(), self.roots.clone());
main_node.change_entry(path).await?;
// todo: disable primary watch
*m = Some(main_node);
Ok(())
}
(None, true) => {
// todo: unpin main
warn!("unpin main is not implemented yet");
// todo: enable primary watch
m.as_mut().unwrap().disable().await;
Ok(())
}
@ -180,7 +176,7 @@ impl CompileClusterActor {
loop {
tokio::select! {
Some((group, diagnostics)) = self.diag_rx.recv() => {
debug!("received diagnostics from {}: diag({:#?})", group, diagnostics.as_ref().map(|e| e.len()));
info!("received diagnostics from {}: diag({:?})", group, diagnostics.as_ref().map(|e| e.len()));
let with_primary = (self.affect_map.len() <= 1 && self.affect_map.contains_key("primary")) && group == "primary";
self.publish(group, diagnostics, with_primary).await;
if !with_primary {
@ -644,9 +640,15 @@ impl<C: Compiler<World = TypstSystemWorld>, H> Reporter<C, H> {
self.position_encoding,
);
// todo: better way to remove diagnostics
// todo: check all errors in this file
let main = self.inner.world().main;
let valid = main.is_some_and(|e| e.vpath() != &VirtualPath::new("detached.typ"));
let err = self
.diag_tx
.send((self.diag_group.clone(), Some(diagnostics)));
.send((self.diag_group.clone(), valid.then_some(diagnostics)));
if let Err(err) = err {
error!("failed to send diagnostics: {:#}", err);
}
@ -678,6 +680,30 @@ impl<H: CompilationHandle> CompileNode<H> {
self.inner.lock().await.steal_async(f).await
}
// todo: stop main
async fn disable(&self) {
let res = self
.steal_async(move |compiler, _| {
let path = Path::new("detached.typ");
let root = compiler.compiler.world().workspace_root();
let driver = &mut compiler.compiler.compiler.inner.compiler;
driver.set_entry_file(path.to_owned());
// todo: suitable approach to avoid panic
driver.notify_fs_event(typst_ts_compiler::vfs::notify::FilesystemEvent::Update(
typst_ts_compiler::vfs::notify::FileChangeSet::new_inserts(vec![(
root.join("detached.typ").into(),
Ok((Time::now(), Bytes::from("".as_bytes()))).into(),
)]),
));
})
.await;
if let Err(err) = res {
error!("failed to disable main: {:#}", err);
}
}
async fn change_entry(&self, path: ImmutPath) -> Result<(), Error> {
if !path.is_absolute() {
return Err(error_once!("entry file must be absolute", path: path.display()));