Merge pull request #104 from brack-lang/feat/#46-check_formatted

feat: check formatted ci

.github/workflows/ci.yml

@@ -16,6 +16,16 @@ on:
       - '**/*.md'
 
 jobs:
+  cargo-fmt:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v27
+      - uses: cachix/cachix-action@v15
+        with:
+          name: brack-lang
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+      - run: nix build ".#cargo-fmt"
   test:
     runs-on: ubuntu-22.04
     steps:

build.rs

@@ -8,4 +8,3 @@ fn main() {
         eprintln!("Failed to read VERSION file");
     }
 }
-

crates/brack-codegen/src/curly.rs

@@ -1,5 +1,9 @@
 use anyhow::Result;
-use brack_plugin::{plugins::Plugins, types::{arg_counter, Type}, value::Value};
+use brack_plugin::{
+    plugins::Plugins,
+    types::{arg_counter, Type},
+    value::Value,
+};
 use brack_transformer::ast::AST;
 
 use crate::{expr, square, text};

crates/brack-codegen/src/square.rs

@@ -1,5 +1,9 @@
 use anyhow::Result;
-use brack_plugin::{plugins::Plugins, types::{arg_counter, Type}, value::Value};
+use brack_plugin::{
+    plugins::Plugins,
+    types::{arg_counter, Type},
+    value::Value,
+};
 use brack_transformer::ast::AST;
 
 use crate::{curly, expr, text};

crates/brack-codegen/src/text.rs

@@ -3,7 +3,10 @@ use brack_plugin::{plugins::Plugins, value::Value};
 use brack_transformer::ast::AST;
 
 pub(crate) fn generate(ast: &AST, plugins: &mut Plugins) -> Result<String> {
-    let result = ast.value().ok_or_else(|| anyhow::anyhow!("No value found"))?.to_string();
+    let result = ast
+        .value()
+        .ok_or_else(|| anyhow::anyhow!("No value found"))?
+        .to_string();
     let hook_result = plugins.call_text_hook(vec![Value::Text(result.clone())])?;
     match hook_result {
         Some(result) => Ok(result),

crates/brack-expander/src/expand.rs

@@ -24,7 +24,8 @@ fn expand_angle(overall_ast: &AST, ast: &AST, plugins: &mut Plugins) -> Result<A
         }
     }
 
-    let new_ast = plugins.call_macro_command(&module_name, &ident_name, overall_ast.clone(), ast.id())?;
+    let new_ast =
+        plugins.call_macro_command(&module_name, &ident_name, overall_ast.clone(), ast.id())?;
     Ok(new_ast)
 }
 

crates/brack-language-server/src/notification/did_open.rs

@@ -13,7 +13,7 @@ impl Server {
             .uri
             .to_file_path()
             .map_err(|_| anyhow::anyhow!("Invalid file path"))?;
-        
+
         // root/docs/file.[] -> root
         let root = file_path
             .parent()

crates/brack-language-server/src/request.rs

@@ -1,6 +1,9 @@
 use anyhow::Result;
 use lsp_types::{
-    CompletionOptions, CompletionParams, InitializeParams, InitializeResult, SemanticTokenModifier, SemanticTokenType, SemanticTokensFullOptions, SemanticTokensLegend, SemanticTokensOptions, SemanticTokensParams, SemanticTokensServerCapabilities, ServerCapabilities, ServerInfo, TextDocumentSyncCapability, TextDocumentSyncKind
+    CompletionOptions, CompletionParams, InitializeParams, InitializeResult, SemanticTokenModifier,
+    SemanticTokenType, SemanticTokensFullOptions, SemanticTokensLegend, SemanticTokensOptions,
+    SemanticTokensParams, SemanticTokensServerCapabilities, ServerCapabilities, ServerInfo,
+    TextDocumentSyncCapability, TextDocumentSyncKind,
 };
 use serde::Deserialize;
 use serde_json::Value;

crates/brack-language-server/src/request/completion.rs

@@ -35,7 +35,7 @@ impl Server {
     ) -> Result<Option<CompletionResponse>> {
         if self.project.is_none() {
             // BLS doesn't support single-file mode now.
-            return Ok(None)
+            return Ok(None);
         }
         let project = self.project.as_ref().unwrap();
         let mut completion_items = vec![];

crates/brack-language-server/src/request/semantic_tokens.rs

@@ -11,7 +11,7 @@ fn token_kind_to_type(token: &Token) -> u32 {
         Token::AngleBracketOpen(_) | Token::AngleBracketClose(_) => SemanticTokenType::MACRO,
         Token::CurlyBracketOpen(_) | Token::CurlyBracketClose(_) => SemanticTokenType::METHOD,
         Token::SquareBracketOpen(_) | Token::SquareBracketClose(_) => SemanticTokenType::FUNCTION,
-        _ => return 100 // no decoration
+        _ => return 100, // no decoration
     };
     token_type_as_u32(typ)
 }

crates/brack-parser/Cargo.toml

@@ -19,9 +19,3 @@ features = ["v4", "fast-rng", "macro-diagnostics", "serde"]
 [features]
 default = []
 debug = []
-
-[[bin]]
-name = "debug_parse"
-path = "src/debug/debug_parse.rs"
-required-features = ["debug"]
-

crates/brack-plugin/src/lib.rs

@@ -1,6 +1,6 @@
 pub mod feature_flag;
+pub mod metadata;
 pub mod plugin;
 pub mod plugins;
-pub mod metadata;
 pub mod types;
 pub mod value;

crates/brack-plugin/src/plugins.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap};
+use std::collections::HashMap;
 
 use anyhow::Result;
 use brack_transformer::ast::AST;
@@ -61,7 +61,12 @@ impl Plugins {
         })
     }
 
-    pub fn argument_types(&self, module_name: &str, command_name: &str, typ: Type) -> Result<Vec<(String, Type)>> {
+    pub fn argument_types(
+        &self,
+        module_name: &str,
+        command_name: &str,
+        typ: Type,
+    ) -> Result<Vec<(String, Type)>> {
         let plugin = self
             .name_to_plugin
             .get(module_name)

flake.nix

@@ -76,6 +76,14 @@
             };
           })
           workspaceMemberNames);
+        packages.cargo-fmt =
+          pkgs.runCommand "cargo-fmt-check" {
+            buildInputs = with pkgs; [cargo rustfmt];
+            src = ./.;
+          } ''
+            mkdir -p $out
+            cargo fmt --all --check --manifest-path $src/Cargo.toml
+          '';
         packages.brack = generatedBuild.workspaceMembers."brack".build;
         packages.default = packages.brack;
         apps.${system}.default = {