Make field mangling non-configurable as well.

Author: Dirbaio

java-spaghetti-gen/src/config/toml.rs

@@ -5,27 +5,20 @@ use std::{fs, io};
 
 use serde_derive::Deserialize;
 
-use crate::identifiers::FieldManglingStyle;
-
 fn default_proxy_path_prefix() -> String {
     "java_spaghetti/proxy".to_string()
 }
 
 /// The \[codegen\] section.
 #[derive(Debug, Clone, Deserialize)]
 pub struct CodeGen {
-    /// How fields should be named.
-    #[serde(default = "Default::default")]
-    pub field_naming_style: FieldManglingStyle,
-
     #[serde(default = "default_proxy_path_prefix")]
     pub proxy_path_prefix: String,
 }
 
 impl Default for CodeGen {
     fn default() -> Self {
         Self {
-            field_naming_style: Default::default(),
             proxy_path_prefix: default_proxy_path_prefix(),
         }
     }

java-spaghetti-gen/src/emit_rust/fields.rs

@@ -7,7 +7,7 @@ use quote::{format_ident, quote};
 use super::cstring;
 use super::known_docs_url::KnownDocsUrl;
 use crate::emit_rust::Context;
-use crate::identifiers::{FieldMangling, IdentifierManglingError};
+use crate::identifiers::{FieldMangling, IdentifierManglingError, mangle_field};
 use crate::parser_util::{Id, JavaClass, JavaField};
 
 pub struct Field<'a> {
@@ -17,15 +17,11 @@ pub struct Field<'a> {
 }
 
 impl<'a> Field<'a> {
-    pub fn new(context: &Context, class: &'a JavaClass, java: &'a cafebabe::FieldInfo<'a>) -> Self {
+    pub fn new(_context: &Context, class: &'a JavaClass, java: &'a cafebabe::FieldInfo<'a>) -> Self {
         Self {
             class,
             java: JavaField::from(java),
-            rust_names: context
-                .config
-                .codegen
-                .field_naming_style
-                .mangle(JavaField::from(java), None),
+            rust_names: mangle_field(JavaField::from(java)),
         }
     }
 

java-spaghetti-gen/src/identifiers/field_mangling_style.rs

@@ -1,5 +1,3 @@
-use serde_derive::Deserialize;
-
 use crate::identifiers::{IdentifierManglingError, javaify_identifier};
 use crate::parser_util::JavaField;
 
@@ -8,47 +6,15 @@ pub enum FieldMangling<'a> {
     GetSet(String, String),
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Hash)]
-pub struct FieldManglingStyle {
-    pub const_finals: bool,     // Default: true
-    pub getter_pattern: String, // Default: "{NAME}", might consider "get_{NAME}"
-    pub setter_pattern: String, // Default: "set_{NAME}"
-}
-
-impl Default for FieldManglingStyle {
-    fn default() -> Self {
-        Self {
-            const_finals: true,
-            getter_pattern: String::from("{NAME}"),
-            setter_pattern: String::from("set_{NAME}"),
-        }
-    }
-}
-
-impl FieldManglingStyle {
-    pub fn mangle<'a>(
-        &self,
-        field: JavaField<'a>,
-        renamed_to: Option<&str>,
-    ) -> Result<FieldMangling<'a>, IdentifierManglingError> {
-        let field_name = renamed_to.unwrap_or(field.name());
-        if let (Some(value), true) = (field.constant().as_ref(), self.const_finals) {
-            let name = if renamed_to.is_some() {
-                Ok(field_name.to_owned()) // Don't remangle renames
-            } else {
-                javaify_identifier(field_name)
-            }?;
-
-            Ok(FieldMangling::ConstValue(name, value.clone()))
-        } else {
-            Ok(FieldMangling::GetSet(
-                self.mangle_identifier(self.getter_pattern.replace("{NAME}", field_name).as_str())?,
-                self.mangle_identifier(self.setter_pattern.replace("{NAME}", field_name).as_str())?,
-            ))
-        }
-    }
-
-    fn mangle_identifier(&self, ident: &str) -> Result<String, IdentifierManglingError> {
-        javaify_identifier(ident)
+pub fn mangle_field<'a>(field: JavaField<'a>) -> Result<FieldMangling<'a>, IdentifierManglingError> {
+    let field_name = field.name();
+    if let Some(value) = field.constant().as_ref() {
+        let name = javaify_identifier(field_name)?;
+        Ok(FieldMangling::ConstValue(name, value.clone()))
+    } else {
+        Ok(FieldMangling::GetSet(
+            javaify_identifier(field_name)?,
+            javaify_identifier(&format!("set_{field_name}"))?,
+        ))
     }
 }