hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-22 04:51:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use rbx_reflection to allow type inference on projects (#130)

Browse source 
* Start dependency on rbx_reflection

* Alive and working, all tests pass

* Update CHANGELOG
This commit is contained in:
Lucien Greathouse 2019-02-26 22:51:21 -08:00 • committed by GitHub
parent be81de74cd
commit 93349ae2dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 43 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
server/src/rbx_snapshot.rs
View file

@ -15,6 +15,7 @@ use log::info;
use maplit::hashmap;
use rbx_dom_weak::{RbxTree, RbxValue, RbxInstanceProperties};
use serde_derive::{Serialize, Deserialize};
use rbx_reflection::{try_resolve_value, ValueResolveError};
use crate::{
imfs::{
@ -119,6 +120,19 @@ pub enum SnapshotError {
ProjectNodeInvalidTransmute {
partition_path: PathBuf,
},
PropertyResolveError {
#[fail(cause)]
inner: ValueResolveError,
},
}
impl From<ValueResolveError> for SnapshotError {
fn from(inner: ValueResolveError) -> SnapshotError {
SnapshotError::PropertyResolveError {
inner,
}
}
}
impl fmt::Display for SnapshotError {
@ -147,6 +161,7 @@ impl fmt::Display for SnapshotError {
writeln!(output, "")?;
writeln!(output, "Partition target ($path): {}", partition_path.display())
},
SnapshotError::PropertyResolveError { inner } => write!(output, "{}", inner),
}
}
}
@ -226,7 +241,8 @@ pub fn snapshot_project_node<'source>(
}
for (key, value) in &node.properties {
snapshot.properties.insert(key.clone(), value.clone());
let resolved_value = try_resolve_value(&snapshot.class_name, key, value)?;
snapshot.properties.insert(key.clone(), resolved_value);
}
if let Some(ignore_unknown_instances) = node.ignore_unknown_instances {