From 5c2bf65eaa6a1de2f3dbc1d6c118ad6f246a1a53 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Fri, 4 Jan 2019 14:30:00 -0800 Subject: [PATCH] protocol/config: ignoreUnknown -> ignoreUnknownInstances --- plugin/src/Session.lua | 2 +- server/src/project.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugin/src/Session.lua b/plugin/src/Session.lua index 5d789533..ce8de667 100644 --- a/plugin/src/Session.lua +++ b/plugin/src/Session.lua @@ -74,7 +74,7 @@ end local function shouldClearUnknown(id, instanceMetadataMap) if instanceMetadataMap[id] then - return not instanceMetadataMap[id].ignoreUnknown + return not instanceMetadataMap[id].ignoreUnknownInstances else return true end diff --git a/server/src/project.rs b/server/src/project.rs index ab79e3d5..61cce205 100644 --- a/server/src/project.rs +++ b/server/src/project.rs @@ -25,8 +25,8 @@ enum SourceProjectNode { #[serde(rename = "$properties", default = "HashMap::new")] properties: HashMap, - #[serde(rename = "$ignoreUnknown", default = "yeah")] - ignore_unknown: bool, + #[serde(rename = "$ignoreUnknownInstances", default = "yeah")] + ignore_unknown_instances: bool, #[serde(flatten)] children: HashMap, @@ -40,7 +40,7 @@ enum SourceProjectNode { impl SourceProjectNode { pub fn into_project_node(self, project_file_location: &Path) -> ProjectNode { match self { - SourceProjectNode::Instance { class_name, mut children, properties, ignore_unknown } => { + SourceProjectNode::Instance { class_name, mut children, properties, ignore_unknown_instances } => { let mut new_children = HashMap::new(); for (node_name, node) in children.drain() { @@ -52,7 +52,7 @@ impl SourceProjectNode { children: new_children, properties, metadata: InstanceProjectNodeMetadata { - ignore_unknown, + ignore_unknown_instances, }, }) }, @@ -137,13 +137,13 @@ pub struct ProjectSaveError; #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct InstanceProjectNodeMetadata { - pub ignore_unknown: bool, + pub ignore_unknown_instances: bool, } impl Default for InstanceProjectNodeMetadata { fn default() -> InstanceProjectNodeMetadata { InstanceProjectNodeMetadata { - ignore_unknown: true, + ignore_unknown_instances: true, } } }