-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
209 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| use super::execute_command; | ||
|
|
||
| #[inline] | ||
| pub fn format_using_just_fmt( | ||
| snippet_path: &std::path::Path, | ||
| ) -> std::io::Result<(bool, Option<String>)> { | ||
| let mut cmd = std::process::Command::new("just"); | ||
|
|
||
| cmd.arg("--fmt") | ||
| // TODO: remove once it is stabilized | ||
| .arg("--unstable") | ||
| .arg("--justfile") | ||
| .arg(snippet_path); | ||
|
|
||
| execute_command(&mut cmd, snippet_path) | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod test_just_fmt { | ||
| use crate::{ | ||
| formatters::{just_fmt::format_using_just_fmt, setup_snippet}, | ||
| languages::Language, | ||
| }; | ||
|
|
||
| #[test] | ||
| fn it_should_format_just() { | ||
| let input = "build: | ||
| cargo build | ||
| cargo build --release | ||
| "; | ||
|
|
||
| let expected_output = "build: | ||
| cargo build | ||
| cargo build --release | ||
| "; | ||
|
|
||
| let snippet = setup_snippet(input, Language::Gleam.to_file_ext()) | ||
| .expect("it to create a snippet file"); | ||
|
|
||
| let output = format_using_just_fmt(snippet.path()) | ||
| .expect("it to be successful") | ||
| .1 | ||
| .expect("it to be some"); | ||
|
|
||
| assert_eq!(expected_output, output); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| use schemars::JsonSchema; | ||
|
|
||
| use crate::formatters::{just_fmt::format_using_just_fmt, MdsfFormatter}; | ||
|
|
||
| use super::{Lang, LanguageFormatter}; | ||
|
|
||
| #[derive(Debug, Default, serde::Serialize, serde::Deserialize, JsonSchema)] | ||
| #[cfg_attr(test, derive(PartialEq, Eq))] | ||
| pub enum Just { | ||
| #[default] | ||
| #[serde(rename = "just_fmt")] | ||
| JustFmt, | ||
| } | ||
|
|
||
| impl Default for Lang<Just> { | ||
| #[inline] | ||
| fn default() -> Self { | ||
| Self { | ||
| enabled: true, | ||
| formatter: MdsfFormatter::<Just>::default(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl Default for MdsfFormatter<Just> { | ||
| #[inline] | ||
| fn default() -> Self { | ||
| Self::Single(Just::JustFmt) | ||
| } | ||
| } | ||
|
|
||
| impl LanguageFormatter for Just { | ||
| #[inline] | ||
| fn format_snippet( | ||
| &self, | ||
| snippet_path: &std::path::Path, | ||
| ) -> std::io::Result<(bool, Option<String>)> { | ||
| match self { | ||
| Self::JustFmt => format_using_just_fmt(snippet_path), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod test_just { | ||
| use crate::{ | ||
| formatters::{setup_snippet, MdsfFormatter}, | ||
| languages::Lang, | ||
| }; | ||
|
|
||
| use super::Just; | ||
|
|
||
| const INPUT: &str = " | ||
| build: | ||
| cargo build | ||
| cargo build --release | ||
| "; | ||
| const EXTENSION: &str = crate::languages::Language::Just.to_file_ext(); | ||
|
|
||
| #[test] | ||
| fn it_should_be_enabled_by_default() { | ||
| assert!(Lang::<Just>::default().enabled); | ||
| } | ||
|
|
||
| #[test] | ||
| fn it_should_not_format_when_enabled_is_false() { | ||
| let snippet = setup_snippet(INPUT, EXTENSION).expect("it to save the file"); | ||
| let snippet_path = snippet.path(); | ||
|
|
||
| assert!(Lang::<Just> { | ||
| enabled: false, | ||
| formatter: MdsfFormatter::Single(Just::default()) | ||
| } | ||
| .format(snippet_path) | ||
| .expect("it to not fail") | ||
| .is_none()); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_just_fmt() { | ||
| let l = Lang::<Just> { | ||
| enabled: true, | ||
| formatter: MdsfFormatter::Single(Just::JustFmt), | ||
| }; | ||
|
|
||
| let snippet = setup_snippet(INPUT, EXTENSION).expect("it to save the file"); | ||
| let snippet_path = snippet.path(); | ||
|
|
||
| let output = l | ||
| .format(snippet_path) | ||
| .expect("it to not fail") | ||
| .expect("it to be a snippet"); | ||
|
|
||
| let expected_output = "build: | ||
| cargo build | ||
| cargo build --release | ||
| "; | ||
|
|
||
| assert_eq!(output, expected_output); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters