hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-23 14:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

json5

Browse source
This commit is contained in:
Joe 2026-01-22 21:27:34 -06:00
parent 074e62951f
commit cd63b5c9c0
84 changed files with 743 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/project.rs
View file

@ -16,7 +16,7 @@ use crate::{
};
/// Represents 'default' project names that act as `init` files
pub static DEFAULT_PROJECT_NAMES: [&str; 2] = ["default.project.json", "default.project.jsonc"];
pub static DEFAULT_PROJECT_NAMES: [&str; 3] = ["default.project.json", "default.project.jsonc", "default.project.json5"];
/// Error type returned by any function that handles projects.
#[derive(Debug, Error)]
@ -48,7 +48,8 @@ enum Error {
#[error("Error parsing Rojo project in path {}", .path.display())]
Json {
source: serde_json::Error,
#[source]
source: anyhow::Error,
path: PathBuf,
},
}
@ -145,7 +146,7 @@ impl Project {
pub fn is_project_file(path: &Path) -> bool {
path.file_name()
.and_then(|name| name.to_str())
.map(|name| name.ends_with(".project.json") || name.ends_with(".project.jsonc"))
.map(|name| name.ends_with(".project.json") || name.ends_with(".project.jsonc") || name.ends_with(".project.json5"))
.unwrap_or(false)
}
@ -234,10 +235,7 @@ impl Project {
fallback_name: Option<&str>,
) -> Result<Self, Error> {
let mut project: Self = json::from_slice(contents).map_err(|e| Error::Json {
source: serde_json::Error::io(std::io::Error::new(
std::io::ErrorKind::InvalidData,
e.to_string(),
)),
source: e,
path: project_file_location.clone(),
})?;
project.file_location = project_file_location;