Skip to content

Commit

Permalink
refactor: split language for datatype match
Browse files Browse the repository at this point in the history
  • Loading branch information
@phodal
phodal committed Feb 23, 2021
1 parent 270f1da commit 1bc12ed
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 29 deletions.
46 changes: 23 additions & 23 deletions _fixtures/ctags/coco_class_tags
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@
!_TAG_OUTPUT_FILESEP slash /slash or backslash/
!_TAG_OUTPUT_MODE u-ctags /u-ctags or e-ctags/
!_TAG_PATTERN_LENGTH_LIMIT 96 /0 for no limit/
!_TAG_PROC_CWD /Users/fdhuang/consultant/devops/coco/ //
!_TAG_PROC_CWD coco/ //
!_TAG_PROGRAM_AUTHOR Universal Ctags Team //
!_TAG_PROGRAM_NAME Universal Ctags /Derived from Exuberant Ctags/
!_TAG_PROGRAM_URL https://ctags.io/ /official site/
!_TAG_PROGRAM_VERSION 5.9.0 /d532b5c/
ClassInfo /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^impl ClassInfo {$/;" implementation line:48 language:Rust
ClassInfo /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^pub struct ClassInfo {$/;" struct line:38 language:Rust
MemberInfo /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^impl MemberInfo {$/;" implementation line:10 language:Rust
MemberInfo /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^pub struct MemberInfo {$/;" struct line:4 language:Rust
MethodInfo /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^impl MethodInfo {$/;" implementation line:27 language:Rust
MethodInfo /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^pub struct MethodInfo {$/;" struct line:21 language:Rust
access /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub access: String,$/;" field line:23 language:Rust struct:MethodInfo
access /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub access: String,$/;" field line:6 language:Rust struct:MemberInfo
data_type /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub data_type: String,$/;" field line:7 language:Rust struct:MemberInfo
file /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub file: String,$/;" field line:41 language:Rust struct:ClassInfo
id /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub id: i32,$/;" field line:40 language:Rust struct:ClassInfo
lang /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub lang: String,$/;" field line:42 language:Rust struct:ClassInfo
members /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub members: Vec<MemberInfo>,$/;" field line:44 language:Rust struct:ClassInfo
methods /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub methods: Vec<MethodInfo>,$/;" field line:45 language:Rust struct:ClassInfo
name /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub name: String,$/;" field line:22 language:Rust struct:MethodInfo
name /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub name: String,$/;" field line:39 language:Rust struct:ClassInfo
name /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub name: String,$/;" field line:5 language:Rust struct:MemberInfo
new /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub fn new(class_name: &str) -> Self {$/;" method line:49 language:Rust implementation:ClassInfo
new /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub fn new(name: &str, access: &str, data_type: String) -> Self {$/;" method line:11 language:Rust implementation:MemberInfo
new /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub fn new(name: &str, access: &str, data_type: String) -> Self {$/;" method line:28 language:Rust implementation:MethodInfo
parents /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub parents: Vec<String>,$/;" field line:43 language:Rust struct:ClassInfo
return_type /Users/fdhuang/consultant/devops/coco/plugins/coco_struct_analysis/src/coco_struct.rs /^ pub return_type: String,$/;" field line:24 language:Rust struct:MethodInfo
ClassInfo src/coco_struct.rs /^impl ClassInfo {$/;" implementation line:48 language:Rust
ClassInfo src/coco_struct.rs /^pub struct ClassInfo {$/;" struct line:38 language:Rust
MemberInfo src/coco_struct.rs /^impl MemberInfo {$/;" implementation line:10 language:Rust
MemberInfo src/coco_struct.rs /^pub struct MemberInfo {$/;" struct line:4 language:Rust
MethodInfo src/coco_struct.rs /^impl MethodInfo {$/;" implementation line:27 language:Rust
MethodInfo src/coco_struct.rs /^pub struct MethodInfo {$/;" struct line:21 language:Rust
access src/coco_struct.rs /^ pub access: String,$/;" field line:23 language:Rust struct:MethodInfo
access src/coco_struct.rs /^ pub access: String,$/;" field line:6 language:Rust struct:MemberInfo
data_type src/coco_struct.rs /^ pub data_type: String,$/;" field line:7 language:Rust struct:MemberInfo
file src/coco_struct.rs /^ pub file: String,$/;" field line:41 language:Rust struct:ClassInfo
id src/coco_struct.rs /^ pub id: i32,$/;" field line:40 language:Rust struct:ClassInfo
lang src/coco_struct.rs /^ pub lang: String,$/;" field line:42 language:Rust struct:ClassInfo
members src/coco_struct.rs /^ pub members: Vec<MemberInfo>,$/;" field line:44 language:Rust struct:ClassInfo
methods src/coco_struct.rs /^ pub methods: Vec<MethodInfo>,$/;" field line:45 language:Rust struct:ClassInfo
name src/coco_struct.rs /^ pub name: String,$/;" field line:22 language:Rust struct:MethodInfo
name src/coco_struct.rs /^ pub name: String,$/;" field line:39 language:Rust struct:ClassInfo
name src/coco_struct.rs /^ pub name: String,$/;" field line:5 language:Rust struct:MemberInfo
new src/coco_struct.rs /^ pub fn new(class_name: &str) -> Self {$/;" method line:49 language:Rust implementation:ClassInfo
new src/coco_struct.rs /^ pub fn new(name: &str, access: &str, data_type: String) -> Self {$/;" method line:11 language:Rust implementation:MemberInfo
new src/coco_struct.rs /^ pub fn new(name: &str, access: &str, data_type: String) -> Self {$/;" method line:28 language:Rust implementation:MethodInfo
parents src/coco_struct.rs /^ pub parents: Vec<String>,$/;" field line:43 language:Rust struct:ClassInfo
return_type src/coco_struct.rs /^ pub return_type: String,$/;" field line:24 language:Rust struct:MethodInfo
31 changes: 25 additions & 6 deletions plugins/coco_struct_analysis/src/ctags_parser.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,16 @@ impl CtagsParser {
let language = &lang_capts["language"];
clazz.lang = language.to_string();

let without_keywords = CtagsParser::remove_keywords(line.to_string());
let match_type = RE_TYPE.captures(without_keywords.as_str());

let mut data_type = "".to_string();
if match_type.is_some() && (CtagsParser::datatype_supported(language)) {
let capts = match_type.unwrap();
data_type = (&capts["datatype"]).to_string();
match language {
"Java" | "C#" | "C++" => {
let without_keywords = CtagsParser::remove_keywords(line.to_string());
if let Some(capts) = RE_TYPE.captures(without_keywords.as_str()) {
data_type = (&capts["datatype"]).to_string();
}
}
"Rust" => {}
_ => {}
}

if tag_type.eq("member") || tag_type.eq("field") {
Expand Down Expand Up @@ -272,6 +275,21 @@ MethodIdentifier SubscriberRegistry.java /^ private static final class MethodId
assert_eq!("MethodIdentifier", first_method.return_type);
}

#[test]
pub fn should_build_rust_datatype() {
let str =
"MethodInfo src/coco_struct.rs /^pub struct MethodInfo {$/;\" struct line:21 language:Rust
name src/coco_struct.rs /^ pub name: String,$/;\" field line:22 language:Rust struct:MethodInfo";

let mut lines = vec![];
lines.push(str.lines());
let parser = CtagsParser::parse_str(lines);
let classes = parser.classes();

print!("{:?}", classes);
assert_eq!(1, classes.len());
}

#[test]
pub fn should_parse_java_file() {
let dir = tags_dir().join("java_tags");
Expand Down Expand Up @@ -309,6 +327,7 @@ MethodIdentifier SubscriberRegistry.java /^ private static final class MethodId
let parser = CtagsParser::parse(dir);
let classes = parser.classes();

println!("{:?}", classes);
assert_eq!(3, classes.len());
assert_eq!("ClassInfo", classes[0].name);
assert_eq!(7, classes[0].members.len());
Expand Down

0 comments on commit 1bc12ed

Please sign in to comment.