Improve readability at cost of concise code

Author: imreddyTeja

src/MatrixFields/field_name_dict.jl

@@ -359,40 +359,13 @@ function field_offset_and_type(
         )
     elseif S <: Geometry.AdjointAxisVector
         return field_offset_and_type(name_pair, T, fieldtype(S, 1), key_error)
-    else
-        child_name, remaining_field_chain =
-            if name_pair[1] != @name() &&
-               extract_first(name_pair[1]) in fieldnames(S)
-                @inline (
-                    extract_first(name_pair[1]),
-                    (drop_first(name_pair[1]), name_pair[2]),
-                )
-            elseif name_pair[2] != @name() &&
-                   extract_first(name_pair[2]) in fieldnames(S)
-                @inline (
-                    extract_first(name_pair[2]),
-                    (name_pair[1], drop_first(name_pair[2])),
-                )
-            elseif !any(isequal(@name()), name_pair) # implicit tensor structure
-                (remaining_offset, end_type, apply_zero) =
-                    field_offset_and_type(
-                        (drop_first(name_pair[1]), drop_first(name_pair[2])),
-                        T,
-                        S,
-                        key_error,
-                    )
-                return (
-                    remaining_offset,
-                    end_type,
-                    extract_first(name_pair[1]) == extract_first(name_pair[2]) ?
-                    apply_zero : true,
-                )
-            else
-                throw(key_error)
-            end
-        child_type = fieldtype(S, child_name)
+    elseif name_pair[1] != @name() &&
+           extract_first(name_pair[1]) in fieldnames(S)
+
+        remaining_field_chain = (drop_first(name_pair[1]), name_pair[2])
+        child_type = fieldtype(S, extract_first(name_pair[1]))
         field_index = unrolled_filter(
-            i -> fieldname(S, i) == child_name,
+            i -> fieldname(S, i) == extract_first(name_pair[1]),
             1:fieldcount(S),
         )[1]
         (remaining_offset, end_type, apply_zero) = field_offset_and_type(
@@ -406,7 +379,41 @@ function field_offset_and_type(
             end_type,
             apply_zero,
         )
+    elseif name_pair[2] != @name() &&
+           extract_first(name_pair[2]) in fieldnames(S)
 
+        remaining_field_chain = name_pair[1], drop_first(name_pair[2])
+        child_type = fieldtype(S, extract_first(name_pair[2]))
+        field_index = unrolled_filter(
+            i -> fieldname(S, i) == extract_first(name_pair[2]),
+            1:fieldcount(S),
+        )[1]
+        (remaining_offset, end_type, apply_zero) = field_offset_and_type(
+            remaining_field_chain,
+            T,
+            child_type,
+            key_error,
+        )
+        return (
+            DataLayouts.fieldtypeoffset(T, S, field_index) + remaining_offset,
+            end_type,
+            apply_zero,
+        )
+    elseif !any(isequal(@name()), name_pair) # implicit tensor structure
+        (remaining_offset, end_type, apply_zero) = field_offset_and_type(
+            (drop_first(name_pair[1]), drop_first(name_pair[2])),
+            T,
+            S,
+            key_error,
+        )
+        return (
+            remaining_offset,
+            end_type,
+            extract_first(name_pair[1]) == extract_first(name_pair[2]) ?
+            apply_zero : true,
+        )
+    else
+        throw(key_error)
     end
 end
 if hasfield(Method, :recursion_relation)