diff options
Diffstat (limited to 'support/texlab/src/features/formatting/latexindent.rs')
-rw-r--r-- | support/texlab/src/features/formatting/latexindent.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/support/texlab/src/features/formatting/latexindent.rs b/support/texlab/src/features/formatting/latexindent.rs index 300f512578..4898aa4415 100644 --- a/support/texlab/src/features/formatting/latexindent.rs +++ b/support/texlab/src/features/formatting/latexindent.rs @@ -3,21 +3,19 @@ use std::{ process::{Command, Stdio}, }; -use cancellation::CancellationToken; -use cstree::{TextLen, TextRange}; use lsp_types::{DocumentFormattingParams, TextEdit}; +use rowan::{TextLen, TextRange}; use tempfile::tempdir; use crate::{features::FeatureRequest, DocumentLanguage, LineIndexExt}; pub fn format_with_latexindent( request: &FeatureRequest<DocumentFormattingParams>, - _cancellation_token: &CancellationToken, ) -> Option<Vec<TextEdit>> { let directory = tempdir().ok()?; let document = request.main_document(); - let options = request.context.options.read().unwrap(); + let options = &request.workspace.environment.options; let current_dir = options .root_directory .as_ref() @@ -43,8 +41,6 @@ pub fn format_with_latexindent( let modify_line_breaks = options.latexindent.modify_line_breaks; - drop(options); - let path = directory.path(); let _ = fs::copy( current_dir.join("localSettings.yaml"), @@ -59,13 +55,13 @@ pub fn format_with_latexindent( path.join("latexindent.yaml"), ); - let name = if document.language() == DocumentLanguage::Bibtex { + let name = if document.data.language() == DocumentLanguage::Bibtex { "file.bib" } else { "file.tex" }; - fs::write(directory.path().join(name), &document.text).ok()?; + fs::write(directory.path().join(name), document.text.as_str()).ok()?; let mut args = Vec::new(); if modify_line_breaks { |