started working on UMPL support

Author: mendelsshop

git-function-history-lib/Cargo.toml

@@ -31,3 +31,4 @@ cached = {version = "0.42.0", optional = true}
 gitoxide-core = "0.22.0"
 git-repository = { version = "0.33.0", default-features = false, features = ["max-performance-safe"] }
 git-features = { version = "0.26.1", features = ["zlib", "once_cell"] }
+umpl = "1.0.2"

git-function-history-lib/src/languages/mod.rs

@@ -5,7 +5,7 @@ use std::{
     fmt::{self},
 };
 // TODO: lisp/scheme js, java?(https://github.com/tanin47/javaparser.rs) php?(https://docs.rs/tagua-parser/0.1.0/tagua_parser/)
-use self::{python::PythonFunction, ruby::RubyFunction, rust::RustFunction};
+use self::{python::PythonFunction, ruby::RubyFunction, rust::RustFunction, umpl::UMPLFunction};
 
 // #[cfg(feature = "c_lang")]
 // use self::c::CFunction;
@@ -26,6 +26,8 @@ pub enum Language {
     Go,
     /// the Ruby language
     Ruby,
+    /// UMPL
+    UMPL,
     /// all available languages
     All,
 }
@@ -43,6 +45,8 @@ pub enum LanguageFilter {
     Go(go::GoFilter),
     /// ruby filter
     Ruby(ruby::RubyFilter),
+    /// umpl filter
+    UMPL(umpl::UMPLFilter),
 }
 
 impl Language {
@@ -75,10 +79,11 @@ impl Language {
             #[cfg(feature = "unstable")]
             Self::Go => "go",
             Self::Ruby => "ruby",
+            Self::UMPL => "umpl",
             #[cfg(feature = "unstable")]
-            Self::All => "python, rust, go, or ruby",
+            Self::All => "python, rust, go, ruby, or umpl",
             #[cfg(not(feature = "unstable"))]
-            Self::All => "python, rust, or ruby",
+            Self::All => "python, rust, ruby, or umpl",
         }
     }
 
@@ -92,10 +97,11 @@ impl Language {
             #[cfg(feature = "unstable")]
             Self::Go => &["go"],
             Self::Ruby => &["rb"],
+            Self::UMPL => &["umpl"],
             #[cfg(feature = "unstable")]
-            Self::All => &["py", "pyw", "rs", "go", "rb"],
+            Self::All => &["py", "pyw", "rs", "go", "rb", "umpl"],
             #[cfg(not(feature = "unstable"))]
-            Self::All => &["py", "pyw", "rs", "rb"],
+            Self::All => &["py", "pyw", "rs", "rb", "umpl"],
         }
     }
 }
@@ -110,6 +116,7 @@ impl fmt::Display for Language {
             #[cfg(feature = "unstable")]
             Self::Go => write!(f, "go"),
             Self::Ruby => write!(f, "ruby"),
+            Self::UMPL => write!(f, "umpl"),
             Self::All => write!(f, "all"),
         }
     }
@@ -123,6 +130,7 @@ pub mod go;
 pub mod python;
 pub mod ruby;
 pub mod rust;
+pub mod umpl;
 
 /// trait that all languages functions must implement
 pub trait FunctionTrait: fmt::Debug + fmt::Display {
@@ -324,6 +332,7 @@ make_file!(RustFile, RustFunction, Rust);
 #[cfg(feature = "unstable")]
 make_file!(GoFile, GoFunction, Go);
 make_file!(RubyFile, RubyFunction, Ruby);
+make_file!(UMPLFile, UMPLFunction, UMPL);
 
 #[cfg(test)]
 mod lang_tests {

git-function-history-lib/src/languages/umpl.rs

@@ -0,0 +1,62 @@
+use umpl;
+
+use std::{error::Error, fmt};
+
+use crate::impl_function_trait;
+
+use super::FunctionTrait;
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct UMPLFunction {
+    pub (crate) lines:  (usize, usize),
+    pub (crate) name:   String,
+    pub (crate) body:   String,
+}
+
+impl fmt::Display for UMPLFunction {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        todo!()
+    }
+}
+
+impl FunctionTrait for UMPLFunction {
+    impl_function_trait!(UMPLFunction);
+
+    fn get_total_lines(&self) -> (usize, usize) {
+        todo!()
+    }
+
+    fn get_tops(&self) -> Vec<(String, usize)> {
+        todo!()
+    }
+
+    fn get_bottoms(&self) -> Vec<(String, usize)> {
+        todo!()
+    }
+}
+
+pub(crate) fn find_function_in_file(
+    file_contents: &str,
+    name: &str,
+) -> Result<Vec<UMPLFunction>, Box<dyn Error>> {
+    // parse the file contents
+    let lexed = umpl::lexer::Lexer::new(file_contents.to_string());
+    let tokens = lexed.scan_tokens();
+    let mut parsed = umpl::parser::Parser::new(tokens);
+    let ast = parsed.parse();
+    for node in ast {
+
+    }
+    Err("")?
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum UMPLFilter {
+
+    
+}
+
+impl UMPLFilter {
+    pub fn matches(&self, function: &UMPLFunction) -> bool {
+        false
+    }
+}

git-function-history-lib/src/lib.rs

@@ -38,7 +38,7 @@ macro_rules! get_item_from_oid_option {
 #[cfg(feature = "cache")]
 use cached::proc_macro::cached;
 use chrono::{DateTime, NaiveDateTime, Utc};
-use languages::{rust, LanguageFilter, PythonFile, RubyFile, RustFile};
+use languages::{rust, LanguageFilter, PythonFile, RubyFile, RustFile, UMPLFile};
 #[cfg(feature = "parallel")]
 use rayon::prelude::{IntoParallelIterator, IntoParallelRefIterator, ParallelIterator};
 
@@ -381,6 +381,11 @@ fn traverse_tree(
                                 continue;
                             }
                         }
+                        Language::UMPL=> {
+                            if !ends_with_cmp_no_case(&file, "ump") {
+                                continue;
+                            }
+                        }
                         Language::All => {
                             cfg_if::cfg_if! {
                                 // if #[cfg(feature = "c_lang")] {
@@ -550,6 +555,10 @@ fn find_function_in_file_with_commit(
             let functions = languages::ruby::find_function_in_file(fc, name)?;
             FileType::Ruby(RubyFile::new(file_path.to_string(), functions))
         }
+        Language::UMPL => {
+            let functions = languages::umpl::find_function_in_file(fc, name)?;
+            FileType::UMPL(UMPLFile::new(file_path.to_string(), functions))
+        }
         Language::All => match file_path.split('.').last() {
             Some("rs") => {
                 let functions = rust::find_function_in_file(fc, name)?;

git-function-history-lib/src/types.rs

@@ -8,7 +8,7 @@ use std::{
 };
 
 use crate::{
-    languages::{FileTrait, FunctionTrait, PythonFile, RubyFile, RustFile},
+    languages::{FileTrait, FunctionTrait, PythonFile, RubyFile, RustFile, UMPLFile},
     Filter,
 };
 
@@ -27,6 +27,7 @@ pub enum FileType {
     #[cfg(feature = "unstable")]
     Go(GoFile),
     Ruby(RubyFile),
+    UMPL(UMPLFile),
 }
 
 impl FileTrait for FileType {
@@ -39,6 +40,7 @@ impl FileTrait for FileType {
             #[cfg(feature = "unstable")]
             Self::Go(file) => file.get_file_name(),
             Self::Ruby(file) => file.get_file_name(),
+            Self::UMPL(file) => file.get_file_name(),
         }
     }
     fn get_functions(&self) -> Vec<Box<dyn FunctionTrait>> {
@@ -50,6 +52,7 @@ impl FileTrait for FileType {
             #[cfg(feature = "unstable")]
             Self::Go(file) => file.get_functions(),
             Self::Ruby(file) => file.get_functions(),
+            Self::UMPL(file) => file.get_functions(),
         }
     }
 
@@ -63,6 +66,7 @@ impl FileTrait for FileType {
                 let filtered = file.filter_by(filter)?;
                 Ok(Self::Python(filtered))
             }
+
             // #[cfg(feature = "c_lang")]
             // Self::C(file) => {
             //     let filtered = file.filter_by(filter)?;
@@ -77,6 +81,10 @@ impl FileTrait for FileType {
                 let filtered = file.filter_by(filter)?;
                 Ok(Self::Ruby(filtered))
             }
+            Self::UMPL(file) => {
+                let filtered = file.filter_by(filter)?;
+                Ok(Self::UMPL(filtered))
+            }
         }
     }
 
@@ -89,6 +97,7 @@ impl FileTrait for FileType {
             #[cfg(feature = "unstable")]
             Self::Go(file) => file.get_current(),
             Self::Ruby(file) => file.get_current(),
+            Self::UMPL(file) => file.get_current(),
         }
     }
 
@@ -101,6 +110,7 @@ impl FileTrait for FileType {
             #[cfg(feature = "unstable")]
             Self::Go(file) => file.get_language(),
             Self::Ruby(file) => file.get_language(),
+            Self::UMPL(file) => file.get_language(),
         }
     }
 }
@@ -115,6 +125,7 @@ impl fmt::Display for FileType {
             #[cfg(feature = "unstable")]
             Self::Go(file) => write!(f, "{file}"),
             Self::Ruby(file) => write!(f, "{file}"),
+            Self::UMPL(file) => write!(f, "{file}"),
         }
     }
 }