rojo-rbx/rojo
1
0
Fork 1
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-04-25 15:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename TransformResult -> TransformFileResult in preparation for two-way syncing

Browse Source
This commit is contained in:
Lucien Greathouse
2017-12-20 22:01:38 -08:00
parent 0f78eb933a
commit b885cae086
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugin.rs
View File

@@ -2,7 +2,7 @@ use rbx::RbxItem;
use vfs::VfsItem; use vfs::VfsItem;
use core::Route; use core::Route;
pub enum TransformResult { pub enum TransformFileResult {
Value(Option<RbxItem>), Value(Option<RbxItem>),
Pass, Pass,
} }
@@ -13,7 +13,7 @@ pub enum FileChangeResult {
} }
pub trait Plugin { pub trait Plugin {
fn transform_file(&self, plugins: &PluginChain, vfs_item: &VfsItem) -> TransformResult; fn transform_file(&self, plugins: &PluginChain, vfs_item: &VfsItem) -> TransformFileResult;
fn handle_file_change(&self, route: &Route) -> FileChangeResult; fn handle_file_change(&self, route: &Route) -> FileChangeResult;
} }
@@ -31,8 +31,8 @@ impl PluginChain {
pub fn transform_file(&self, vfs_item: &VfsItem) -> Option<RbxItem> { pub fn transform_file(&self, vfs_item: &VfsItem) -> Option<RbxItem> {
for plugin in &self.plugins { for plugin in &self.plugins {
match plugin.transform_file(self, vfs_item) { match plugin.transform_file(self, vfs_item) {
TransformResult::Value(rbx_item) => return rbx_item, TransformFileResult::Value(rbx_item) => return rbx_item,
TransformResult::Pass => {}, TransformFileResult::Pass => {},
} }
} }

8
src/plugins/default_plugin.rs
View File

@@ -1,7 +1,7 @@
use std::collections::HashMap; use std::collections::HashMap;
use core::Route; use core::Route;
use plugin::{Plugin, PluginChain, TransformResult, FileChangeResult}; use plugin::{Plugin, PluginChain, TransformFileResult, FileChangeResult};
use rbx::{RbxItem, RbxValue}; use rbx::{RbxItem, RbxValue};
use vfs::VfsItem; use vfs::VfsItem;
@@ -17,7 +17,7 @@ impl DefaultPlugin {
} }
impl Plugin for DefaultPlugin { impl Plugin for DefaultPlugin {
fn transform_file(&self, plugins: &PluginChain, vfs_item: &VfsItem) -> TransformResult { fn transform_file(&self, plugins: &PluginChain, vfs_item: &VfsItem) -> TransformFileResult {
match vfs_item { match vfs_item {
&VfsItem::File { ref contents, ref name } => { &VfsItem::File { ref contents, ref name } => {
let mut properties = HashMap::new(); let mut properties = HashMap::new();
@@ -26,7 +26,7 @@ impl Plugin for DefaultPlugin {
value: contents.clone(), value: contents.clone(),
}); });
TransformResult::Value(Some(RbxItem { TransformFileResult::Value(Some(RbxItem {
name: name.clone(), name: name.clone(),
class_name: "StringValue".to_string(), class_name: "StringValue".to_string(),
children: Vec::new(), children: Vec::new(),
@@ -45,7 +45,7 @@ impl Plugin for DefaultPlugin {
} }
} }
TransformResult::Value(Some(RbxItem { TransformFileResult::Value(Some(RbxItem {
name: name.clone(), name: name.clone(),
class_name: "Folder".to_string(), class_name: "Folder".to_string(),
children: rbx_children, children: rbx_children,

16
src/plugins/script_plugin.rs
View File

@@ -3,7 +3,7 @@ use std::collections::HashMap;
use regex::Regex; use regex::Regex;
use core::Route; use core::Route;
use plugin::{Plugin, PluginChain, TransformResult, FileChangeResult}; use plugin::{Plugin, PluginChain, TransformFileResult, FileChangeResult};
use rbx::{RbxItem, RbxValue}; use rbx::{RbxItem, RbxValue};
use vfs::VfsItem; use vfs::VfsItem;
@@ -26,7 +26,7 @@ impl ScriptPlugin {
} }
impl Plugin for ScriptPlugin { impl Plugin for ScriptPlugin {
fn transform_file(&self, plugins: &PluginChain, vfs_item: &VfsItem) -> TransformResult { fn transform_file(&self, plugins: &PluginChain, vfs_item: &VfsItem) -> TransformFileResult {
match vfs_item { match vfs_item {
&VfsItem::File { ref contents, ref name } => { &VfsItem::File { ref contents, ref name } => {
let (class_name, rbx_name) = { let (class_name, rbx_name) = {
@@ -37,7 +37,7 @@ impl Plugin for ScriptPlugin {
} else if let Some(captures) = MODULE_PATTERN.captures(name) { } else if let Some(captures) = MODULE_PATTERN.captures(name) {
("ModuleScript".to_string(), captures.get(1).unwrap().as_str().to_string()) ("ModuleScript".to_string(), captures.get(1).unwrap().as_str().to_string())
} else { } else {
return TransformResult::Pass; return TransformFileResult::Pass;
} }
}; };
@@ -47,7 +47,7 @@ impl Plugin for ScriptPlugin {
value: contents.clone(), value: contents.clone(),
}); });
TransformResult::Value(Some(RbxItem { TransformFileResult::Value(Some(RbxItem {
name: rbx_name, name: rbx_name,
class_name: class_name, class_name: class_name,
children: Vec::new(), children: Vec::new(),
@@ -62,15 +62,15 @@ impl Plugin for ScriptPlugin {
match maybe_item { match maybe_item {
Some(v) => v, Some(v) => v,
None => return TransformResult::Pass, None => return TransformFileResult::Pass,
} }
}; };
let mut rbx_item = match self.transform_file(plugins, init_item) { let mut rbx_item = match self.transform_file(plugins, init_item) {
TransformResult::Value(Some(item)) => item, TransformFileResult::Value(Some(item)) => item,
_ => { _ => {
eprintln!("Inconsistency detected in ScriptPlugin!"); eprintln!("Inconsistency detected in ScriptPlugin!");
return TransformResult::Pass; return TransformFileResult::Pass;
}, },
}; };
@@ -90,7 +90,7 @@ impl Plugin for ScriptPlugin {
} }
} }
TransformResult::Value(Some(rbx_item)) TransformFileResult::Value(Some(rbx_item))
}, },
} }
} }