Skip to content

Commit

Permalink
fix: fix puml format issue
Browse files Browse the repository at this point in the history
  • Loading branch information
phodal committed Feb 27, 2021
1 parent 560faca commit fc15b60
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions core_model/src/url_format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ pub fn json_filename(text: &str) -> String {
json_filename_suffix(text, None)
}

pub fn uml_filename(text: &str) -> String {
filename_suffix(text, None, Some("uml"))
pub fn puml_filename(text: &str) -> String {
filename_suffix(text, None, Some("puml"))
}

pub fn uri_to_path(url: &str) -> PathBuf {
Expand Down
2 changes: 1 addition & 1 deletion plugins/coco_struct_analysis/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ mod tests {
let classes: Vec<ClassInfo> = serde_json::from_str(&code).unwrap();
assert_eq!(9, classes.len());

let output_dir = base_dir.join("source.uml");
let output_dir = base_dir.join("source.puml");
let _file = File::open(output_dir).unwrap();
}
}
6 changes: 3 additions & 3 deletions plugins/coco_struct_analysis/src/plantuml_render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ impl PlantUmlRender {
}
content = format!("{}{}", content, methods.join(""));

rendered.push(format!("class {{\n{}}}", content));
rendered.push(format!("class {} {{\n{}}}", clazz.name, content));
}

let dep: Vec<String> = vec![];
Expand Down Expand Up @@ -53,7 +53,7 @@ mod tests {
classes.push(demo);

let str = PlantUmlRender::render(&classes);
assert_eq!("@startuml\n\nclass {\n}\n\n@enduml", str);
assert_eq!("@startuml\n\nclass Demo {\n}\n\n@enduml", str);
}

#[test]
Expand All @@ -71,7 +71,7 @@ mod tests {

let str = PlantUmlRender::render(&classes);
assert_eq!(
"@startuml\n\nclass {\n -demo\n -method()\n}\n\n@enduml",
"@startuml\n\nclass Demo {\n -demo\n -method()\n}\n\n@enduml",
str
);
}
Expand Down
6 changes: 3 additions & 3 deletions plugins/coco_struct_analysis/src/struct_analysis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pub fn execute(config: CocoConfig) {
let classes = run_ctags(&opt, &files);

let result = serde_json::to_string_pretty(&classes).unwrap();
write_to_uml_file(url_str, &classes);
write_to_puml_file(url_str, &classes);
write_to_json_file(url_str, &result);
}
}
Expand All @@ -57,8 +57,8 @@ fn write_to_json_file(url_str: &str, result: &String) {
fs::write(output_file, result).expect("cannot write file");
}

fn write_to_uml_file(url_str: &str, classes: &Vec<ClassInfo>) {
let file_name = url_format::uml_filename(url_str);
fn write_to_puml_file(url_str: &str, classes: &Vec<ClassInfo>) {
let file_name = url_format::puml_filename(url_str);
let output_file = Settings::struct_analysis().join(file_name);
let result = PlantUmlRender::render(classes);
fs::write(output_file, result).expect("cannot write file");
Expand Down

0 comments on commit fc15b60

Please sign in to comment.