mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-10-20 17:41:37 +00:00
Support .jsonc extension for all JSON files (#1159)
This commit is contained in:
parent
03410ced6d
commit
ea70d89291
46 changed files with 759 additions and 153 deletions
|
|
@ -1,5 +1,4 @@
|
|||
use std::{
|
||||
borrow::Cow,
|
||||
collections::HashSet,
|
||||
io,
|
||||
net::IpAddr,
|
||||
|
|
@ -101,15 +100,7 @@ impl ServeSession {
|
|||
|
||||
log::trace!("Starting new ServeSession at path {}", start_path.display());
|
||||
|
||||
let project_path = if Project::is_project_file(start_path) {
|
||||
Cow::Borrowed(start_path)
|
||||
} else {
|
||||
Cow::Owned(start_path.join("default.project.json"))
|
||||
};
|
||||
|
||||
log::debug!("Loading project file from {}", project_path.display());
|
||||
|
||||
let root_project = Project::load_exact(&vfs, &project_path, None)?;
|
||||
let root_project = Project::load_initial_project(&vfs, start_path)?;
|
||||
|
||||
let mut tree = RojoTree::new(InstanceSnapshot::new());
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue