chore: bump version to v0.0.7

hougesen · May 29, 2024 · a3f4929 · a3f4929
1 parent a1149e4
commit a3f4929
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 54 deletions.
diff --git a/mdsf.json b/mdsf.json
@@ -85,14 +85,14 @@
     "enabled": true,
     "formatter": "npm-groovy-lint"
   },
-  "haskell": {
-    "enabled": true,
-    "formatter": [["fourmolu", "ormolu", "hindent", "stylish-haskell"]]
-  },
   "handlebars": {
     "enabled": true,
     "formatter": [["prettier", "djlint"]]
   },
+  "haskell": {
+    "enabled": true,
+    "formatter": [["fourmolu", "ormolu", "hindent", "stylish-haskell"]]
+  },
   "hcl": {
     "enabled": true,
     "formatter": [["terraform_fmt", "tofu_fmt"]]
@@ -139,6 +139,10 @@
     "enabled": true,
     "formatter": [["prettier", "mdformat"]]
   },
+  "mustache": {
+    "enabled": true,
+    "formatter": "djlint"
+  },
   "nim": {
     "enabled": true,
     "formatter": "nimpretty"
@@ -147,6 +151,10 @@
     "enabled": true,
     "formatter": [["nixfmt", "alejandra", "nixpkgs-fmt"]]
   },
+  "nunjucks": {
+    "enabled": true,
+    "formatter": "djlint"
+  },
   "objective_c": {
     "enabled": true,
     "formatter": "clang-format"
@@ -163,6 +171,10 @@
     "enabled": true,
     "formatter": [["buf", "clang-format"]]
   },
+  "puppet": {
+    "enabled": true,
+    "formatter": [["puppet-lint"]]
+  },
   "purescript": {
     "enabled": true,
     "formatter": "purs-tidy"
@@ -237,17 +249,5 @@
   "zig": {
     "enabled": true,
     "formatter": "zigfmt"
-  },
-  "nunjucks": {
-    "enabled": true,
-    "formatter": "djlint"
-  },
-  "mustache": {
-    "enabled": true,
-    "formatter": "djlint"
-  },
-  "puppet": {
-    "enabled": true,
-    "formatter": [["puppet-lint"]]
   }
 }
diff --git a/src/config.rs b/src/config.rs
@@ -104,10 +104,10 @@ pub struct MdsfConfig {
     pub groovy: Lang<Groovy>,
 
     #[serde(default)]
-    pub haskell: Lang<Haskell>,
+    pub handlebars: Lang<Handlebars>,
 
     #[serde(default)]
-    pub handlebars: Lang<Handlebars>,
+    pub haskell: Lang<Haskell>,
 
     #[serde(default)]
     pub hcl: Lang<Hcl>,
@@ -142,12 +142,18 @@ pub struct MdsfConfig {
     #[serde(default)]
     pub markdown: Lang<Markdown>,
 
+    #[serde(default)]
+    pub mustache: Lang<Mustache>,
+
     #[serde(default)]
     pub nim: Lang<Nim>,
 
     #[serde(default)]
     pub nix: Lang<Nix>,
 
+    #[serde(default)]
+    pub nunjucks: Lang<Nunjucks>,
+
     #[serde(default)]
     pub objective_c: Lang<ObjectiveC>,
 
@@ -160,6 +166,9 @@ pub struct MdsfConfig {
     #[serde(default)]
     pub protobuf: Lang<Protobuf>,
 
+    #[serde(default)]
+    pub puppet: Lang<Puppet>,
+
     #[serde(default)]
     pub purescript: Lang<PureScript>,
 
@@ -213,15 +222,6 @@ pub struct MdsfConfig {
 
     #[serde(default)]
     pub zig: Lang<Zig>,
-
-    #[serde(default)]
-    pub nunjucks: Lang<Nunjucks>,
-
-    #[serde(default)]
-    pub mustache: Lang<Mustache>,
-
-    #[serde(default)]
-    pub puppet: Lang<Puppet>,
 }
 
 impl Default for MdsfConfig {
@@ -232,7 +232,6 @@ impl Default for MdsfConfig {
             format_finished_document: false,
             javascript_runtime: JavaScriptRuntime::default(),
 
-            blade: Lang::<Blade>::default(),
             c: Lang::<C>::default(),
             cabal: Lang::<Cabal>::default(),
             clojure: Lang::<Clojure>::default(),
@@ -265,12 +264,15 @@ impl Default for MdsfConfig {
             kotlin: Lang::<Kotlin>::default(),
             lua: Lang::<Lua>::default(),
             markdown: Lang::<Markdown>::default(),
+            mustache: Lang::<Mustache>::default(),
             nim: Lang::<Nim>::default(),
             nix: Lang::<Nix>::default(),
+            nunjucks: Lang::<Nunjucks>::default(),
             objective_c: Lang::<ObjectiveC>::default(),
             ocaml: Lang::<OCaml>::default(),
             perl: Lang::<Perl>::default(),
             protobuf: Lang::<Protobuf>::default(),
+            puppet: Lang::<Puppet>::default(),
             purescript: Lang::<PureScript>::default(),
             python: Lang::<Python>::default(),
             rescript: Lang::<ReScript>::default(),
@@ -280,18 +282,16 @@ impl Default for MdsfConfig {
             rust: Lang::<Rust>::default(),
             scala: Lang::<Scala>::default(),
             shell: Lang::<Shell>::default(),
-            sql: Lang::<Sql>::default(),
             solidity: Lang::<Solidity>::default(),
+            sql: Lang::<Sql>::default(),
             swift: Lang::<Swift>::default(),
             toml: Lang::<Toml>::default(),
             typescript: Lang::<TypeScript>::default(),
             vue: Lang::<Vue>::default(),
             xml: Lang::<Xml>::default(),
             yaml: Lang::<Yaml>::default(),
             zig: Lang::<Zig>::default(),
-            mustache: Lang::<Mustache>::default(),
-            nunjucks: Lang::<Nunjucks>::default(),
-            puppet: Lang::<Puppet>::default(),
+            blade: Lang::<Blade>::default(),
         }
     }
 }

diff --git a/src/formatters/mod.rs b/src/formatters/mod.rs
@@ -184,20 +184,20 @@ pub fn format_snippet(config: &MdsfConfig, info: &LineInfo, code: &str) -> Strin
         if let Ok(Some(formatted_code)) = match info.language {
             Language::Blade => config.blade.format(snippet_path, info),
             Language::C => config.c.format(snippet_path, info),
+            Language::CSharp => config.csharp.format(snippet_path, info),
             Language::Cabal => config.cabal.format(snippet_path, info),
             Language::Clojure => config.clojure.format(snippet_path, info),
             Language::Cpp => config.cpp.format(snippet_path, info),
             Language::Crystal => config.crystal.format(snippet_path, info),
-            Language::CSharp => config.csharp.format(snippet_path, info),
             Language::Css(_flavor) => config.css.format(snippet_path, info),
             Language::D => config.d.format(snippet_path, info),
             Language::Dart => config.dart.format(snippet_path, info),
             Language::Elixir => config.elixir.format(snippet_path, info),
             Language::Elm => config.elm.format(snippet_path, info),
             Language::Erb => config.erb.format(snippet_path, info),
             Language::Erlang => config.erlang.format(snippet_path, info),
-            Language::Fortran => config.fortran.format(snippet_path, info),
             Language::FSharp => config.fsharp.format(snippet_path, info),
+            Language::Fortran => config.fortran.format(snippet_path, info),
             Language::Gleam => config.gleam.format(snippet_path, info),
             Language::Go => config.go.format(snippet_path, info),
             Language::GraphQL => config.graphql.format(snippet_path, info),
@@ -219,10 +219,11 @@ pub fn format_snippet(config: &MdsfConfig, info: &LineInfo, code: &str) -> Strin
             Language::Nim => config.nim.format(snippet_path, info),
             Language::Nix => config.nix.format(snippet_path, info),
             Language::Nunjucks => config.nunjucks.format(snippet_path, info),
-            Language::ObjectiveC => config.objective_c.format(snippet_path, info),
             Language::OCaml => config.ocaml.format(snippet_path, info),
+            Language::ObjectiveC => config.objective_c.format(snippet_path, info),
             Language::Perl => config.perl.format(snippet_path, info),
             Language::Protobuf => config.protobuf.format(snippet_path, info),
+            Language::Puppet => config.puppet.format(snippet_path, info),
             Language::PureScript => config.purescript.format(snippet_path, info),
             Language::Python => config.python.format(snippet_path, info),
             Language::ReScript => config.rescript.format(snippet_path, info),
@@ -241,7 +242,6 @@ pub fn format_snippet(config: &MdsfConfig, info: &LineInfo, code: &str) -> Strin
             Language::Xml => config.xml.format(snippet_path, info),
             Language::Yaml => config.yaml.format(snippet_path, info),
             Language::Zig => config.zig.format(snippet_path, info),
-            Language::Puppet => config.puppet.format(snippet_path, info),
         } {
             let mut f = formatted_code.trim().to_owned();