Skip to content
This repository has been archived by the owner on Jun 8, 2024. It is now read-only.

fix(global config): renamed default-config to typstfmt #118

Merged
merged 3 commits into from
Oct 31, 2023
Merged

fix(global config): renamed default-config to typstfmt #118

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
237ac18
fix(global config): renamed `default-config` to `typstfmt`
Andrew15-5 Oct 30, 2023
cd115c6
chore(global config): merged related `const`s
Andrew15-5 Oct 30, 2023
31ce52b
chore(formatting): forgot to run rustfmt
Andrew15-5 Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ use typstfmt_lib::{format, Config};

const VERSION: &str = env!("TYPSTFMT_VERSION");
const CONFIG_FILE_NAME: &str = "typstfmt.toml";
/// Note: used in [`confy`](https://crates.io/crates/confy) functions.
const APP_NAME: &str = "typstfmt";
const HELP: &str = r#"Format Typst code

usage: typstfmt [options] [file...]
Expand Down Expand Up @@ -154,7 +156,7 @@ fn main() -> Result<(), lexopt::Error> {
return Ok(());
}
Long("get-global-config-path") => {
let config_path = confy::get_configuration_file_path("typstfmt", None)
let config_path = confy::get_configuration_file_path(APP_NAME, APP_NAME)
.unwrap_or_else(|e| panic!("Error loading global configuration file: {e}"));
println!("{}", config_path.display());
return Ok(());
Expand Down Expand Up @@ -220,9 +222,9 @@ fn main() -> Result<(), lexopt::Error> {
});
Config::from_toml(&buf).unwrap_or_else(|e| panic!("Config file invalid: {e}.\nYou'll maybe have to delete it and use -C to create a default config file."))
} else {
let config_path = confy::get_configuration_file_path("typstfmt", None)
let config_path = confy::get_configuration_file_path(APP_NAME, APP_NAME)
.unwrap_or_else(|e| panic!("Error loading global configuration file: {e}"));
confy::load("typstfmt", None).unwrap_or_else(|e| {
confy::load(APP_NAME, APP_NAME).unwrap_or_else(|e| {
panic!(
"Error loading global configuration file at {}: {e}",
config_path.display()
Expand Down
Loading