fmt: cargo

Author: LastLeaf

src/context/project.rs

@@ -6,7 +6,8 @@ use std::{
 
 use futures::StreamExt;
 use glass_easel_template_compiler::{
-    parse::{ParseError, ParseErrorKind, ParseErrorLevel, Template}, TmplConvertedExpr, TmplGroup
+    parse::{ParseError, ParseErrorKind, ParseErrorLevel, Template},
+    TmplConvertedExpr, TmplGroup,
 };
 use lsp_types::{Diagnostic, DiagnosticSeverity, Position, Range};
 use tokio::sync::Mutex as AsyncMutex;
@@ -565,15 +566,25 @@ impl Project {
         self.cached_wxml_converted_expr.remove(&tmpl_path).is_some()
     }
 
-    pub(crate) fn wxml_converted_expr_code(&mut self, abs_path: &Path, ts_env: &str) -> anyhow::Result<String> {
+    pub(crate) fn wxml_converted_expr_code(
+        &mut self,
+        abs_path: &Path,
+        ts_env: &str,
+    ) -> anyhow::Result<String> {
         let tmpl_path = self.unix_rel_path_or_fallback(&abs_path);
-        let expr = self.template_group.get_tmpl_converted_expr(&tmpl_path, ts_env)?;
+        let expr = self
+            .template_group
+            .get_tmpl_converted_expr(&tmpl_path, ts_env)?;
         let code = expr.code().to_string();
         self.cached_wxml_converted_expr.insert(tmpl_path, expr);
         Ok(code)
     }
 
-    pub(crate) fn wxml_converted_expr_get_source_location(&self, abs_path: &Path, loc: Location) -> Option<Location> {
+    pub(crate) fn wxml_converted_expr_get_source_location(
+        &self,
+        abs_path: &Path,
+        loc: Location,
+    ) -> Option<Location> {
         let tmpl_path = self.unix_rel_path_or_fallback(&abs_path);
         self.cached_wxml_converted_expr
             .get(&tmpl_path)

src/lib.rs

@@ -117,10 +117,22 @@ async fn handle_request(
 
     // handlers for each method
     handler!("shutdown", cleanup);
-    handler!("glassEaselAnalyzer/tmplConvertedExprRelease", wxml_ts::tmpl_converted_expr_release);
-    handler!("glassEaselAnalyzer/tmplConvertedExprCode", wxml_ts::tmpl_converted_expr_code);
-    handler!("glassEaselAnalyzer/tmplConvertedExprGetSourceLocation", wxml_ts::tmpl_converted_expr_get_source_location);
-    handler!("glassEaselAnalyzer/tmplConvertedExprGetTokenAtSourcePosition", wxml_ts::tmpl_converted_expr_get_token_at_source_position);
+    handler!(
+        "glassEaselAnalyzer/tmplConvertedExprRelease",
+        wxml_ts::tmpl_converted_expr_release
+    );
+    handler!(
+        "glassEaselAnalyzer/tmplConvertedExprCode",
+        wxml_ts::tmpl_converted_expr_code
+    );
+    handler!(
+        "glassEaselAnalyzer/tmplConvertedExprGetSourceLocation",
+        wxml_ts::tmpl_converted_expr_get_source_location
+    );
+    handler!(
+        "glassEaselAnalyzer/tmplConvertedExprGetTokenAtSourcePosition",
+        wxml_ts::tmpl_converted_expr_get_token_at_source_position
+    );
     handler!("textDocument/foldingRange", folding::folding_range);
     handler!("textDocument/semanticTokens/full", semantic::tokens_full);
     handler!("textDocument/semanticTokens/range", semantic::tokens_range);

src/wxml_ts.rs

@@ -2,7 +2,9 @@ use lsp_types::{Position, Range, Url};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    context::FileLang, utils::{location_to_lsp_range, lsp_range_to_location}, ServerContext
+    context::FileLang,
+    utils::{location_to_lsp_range, lsp_range_to_location},
+    ServerContext,
 };
 
 #[derive(Debug, Clone, Deserialize)]
@@ -22,9 +24,7 @@ pub(crate) async fn tmpl_converted_expr_release(
             move |project, abs_path, file_lang| -> anyhow::Result<bool> {
                 let success = if let Some(_) = project.cached_file_content(&abs_path) {
                     match file_lang {
-                        FileLang::Wxml => {
-                            project.wxml_converted_expr_release(&abs_path)
-                        }
+                        FileLang::Wxml => project.wxml_converted_expr_release(&abs_path),
                         _ => false,
                     }
                 } else {
@@ -62,7 +62,8 @@ pub(crate) async fn tmpl_converted_expr_code(
                 let code = if let Some(_) = project.cached_file_content(&abs_path) {
                     match file_lang {
                         FileLang::Wxml => {
-                            let code = project.wxml_converted_expr_code(&abs_path, &params.ts_env)?;
+                            let code =
+                                project.wxml_converted_expr_code(&abs_path, &params.ts_env)?;
                             Some(TmplConvertedExprCode { code })
                         }
                         _ => None,
@@ -98,7 +99,10 @@ pub(crate) async fn tmpl_converted_expr_get_source_location(
         .clone()
         .project_thread_task(
             &params.text_document_uri,
-            move |project, abs_path, file_lang| -> anyhow::Result<Option<TmplConvertedExprGetSourceLocation>> {
+            move |project,
+                  abs_path,
+                  file_lang|
+                  -> anyhow::Result<Option<TmplConvertedExprGetSourceLocation>> {
                 let src_loc = if let Some(_) = project.cached_file_content(&abs_path) {
                     match file_lang {
                         FileLang::Wxml => {
@@ -129,7 +133,7 @@ pub(crate) struct TmplConvertedExprGetTokenAtSourcePositionParams {
 #[serde(rename_all = "camelCase")]
 pub(crate) struct TmplConvertedExprGetTokenAtSourcePosition {
     src: Range,
-    dest: Position
+    dest: Position,
 }
 
 pub(crate) async fn tmpl_converted_expr_get_token_at_source_position(
@@ -140,23 +144,30 @@ pub(crate) async fn tmpl_converted_expr_get_token_at_source_position(
         .clone()
         .project_thread_task(
             &params.text_document_uri,
-            move |project, abs_path, file_lang| -> anyhow::Result<Option<TmplConvertedExprGetTokenAtSourcePosition>> {
+            move |project,
+                  abs_path,
+                  file_lang|
+                  -> anyhow::Result<Option<TmplConvertedExprGetTokenAtSourcePosition>> {
                 let ret = if let Some(_) = project.cached_file_content(&abs_path) {
                     match file_lang {
                         FileLang::Wxml => {
-                            let pos = crate::wxss::Position { line: params.pos.line, utf16_col: params.pos.character };
+                            let pos = crate::wxss::Position {
+                                line: params.pos.line,
+                                utf16_col: params.pos.character,
+                            };
                             project.wxml_converted_expr_get_token_at_source_position(&abs_path, pos)
                         }
                         _ => None,
                     }
                 } else {
                     None
                 };
-                let ret = ret.map(|(src, dest)| {
-                    TmplConvertedExprGetTokenAtSourcePosition {
-                        src: location_to_lsp_range(&src),
-                        dest: Position { line: dest.line, character: dest.utf16_col },
-                    }
+                let ret = ret.map(|(src, dest)| TmplConvertedExprGetTokenAtSourcePosition {
+                    src: location_to_lsp_range(&src),
+                    dest: Position {
+                        line: dest.line,
+                        character: dest.utf16_col,
+                    },
                 });
                 Ok(ret)
             },