language-servers/tinymist
1
0
Fork 0
mirror of https://github.com/Myriad-Dreamin/tinymist.git synced 2025-08-03 09:52:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

dev:remove a useless lock

Browse source
This commit is contained in:
Myriad-Dreamin 2024-03-11 12:07:35 +08:00
parent 615c7fa5c4
commit 052cf6e8d0
2 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/tinymist/src/lib.rs
View file

@ -290,7 +290,7 @@ pub struct TypstLanguageServer {
memory_changes: RwLock<HashMap<Arc<Path>, MemoryFileMeta>>,
primary: OnceCell<Deferred<CompileActor>>,
pinning: bool,
main: Arc<Mutex<Option<Deferred<CompileActor>>>>,
main: Option<Deferred<CompileActor>>,
tokens_cache: SemanticTokenCache,
}
@ -313,7 +313,7 @@ impl TypstLanguageServer {
memory_changes: RwLock::new(HashMap::new()),
primary: OnceCell::new(),
pinning: false,
main: Arc::new(Mutex::new(None)),
main: None,
tokens_cache: Default::default(),
}
}
@ -693,15 +693,14 @@ impl TypstLanguageServer {
let new_entry = file_uri.clone();
self.pinning = new_entry.is_some();
let mut m = self.main.lock();
let update_result = match (new_entry, m.is_some()) {
let update_result = match (new_entry, self.main.is_some()) {
(Some(new_entry), true) => {
let path = new_entry
.to_file_path()
.map_err(|_| invalid_params("invalid url"))?;
let path = path.as_path().into();
m.as_mut().unwrap().wait().change_entry(path)
self.main.as_mut().unwrap().wait().change_entry(path)
}
(Some(new_entry), false) => {
let path = new_entry
@ -711,18 +710,17 @@ impl TypstLanguageServer {
let main_node = self.server("main".to_owned(), Some(path));
*m = Some(main_node);
self.main = Some(main_node);
Ok(())
}
(None, true) => {
// todo: unpin main
m.as_mut().unwrap().wait().disable();
self.main.as_mut().unwrap().wait().disable();
Ok(())
}
(None, false) => Ok(()),
};
drop(m);
update_result.map_err(|err| {
error!("could not set main file: {err}");
@ -825,8 +823,7 @@ impl TypstLanguageServer {
self.primary().change_export_pdf(config.clone());
{
let m = self.main.lock();
if let Some(main) = m.as_ref() {
if let Some(main) = self.main.as_ref() {
main.wait().change_export_pdf(config);
}
}

6
crates/tinymist/src/query.rs
View file

@ -23,9 +23,8 @@ pub struct MemoryFileMeta {
impl TypstLanguageServer {
fn update_source(&self, files: FileChangeSet) -> Result<(), Error> {
let main = self.main.clone();
let primary = Some(self.primary_deferred());
let main = main.lock();
let main = main.as_ref();
let primary = Some(self.primary_deferred());
let clients_to_notify = (primary.iter()).chain(main.iter());
for client in clients_to_notify {
@ -171,8 +170,7 @@ impl TypstLanguageServer {
SelectionRange(req) => query_source!(self, SelectionRange, req),
DocumentSymbol(req) => query_source!(self, DocumentSymbol, req),
_ => {
let main = self.main.lock();
let main = &self.main;
let query_target = match main.as_ref() {
Some(main) if self.pinning => main.wait(),
Some(..) | None => {