Code cleanup

Author: dduugg

lib/yard-sorbet/handlers/struct_prop_handler.rb

@@ -34,24 +34,21 @@ def decorate_object(object, prop)
         object.docstring = docstring.to_raw
       end
 
-      # Get the default prop value
-      sig { returns(T.nilable(String)) }
-      def default_value
-        statement.traverse { break _1 if _1.type == :label && _1.source == 'default:' }&.parent&.[](1)&.source
-      end
-
       sig { returns(T::Boolean) }
       def immutable?
-        return true if statement.method_name(true) == :const
+        statement.method_name(true) == :const || kw_arg('immutable') == 'true'
+      end
 
-        kw_args = statement.parameters(false).last
-        kw_args.any? { _1.jump(:label).source == 'immutable:' && _1.jump(:kw).source == 'true' }
+      # @return the value passed to the keyword argument, or nil
+      sig { params(keyword: String).returns(T.nilable(String)) }
+      def kw_arg(keyword)
+        statement.parameters(false)[2]&.find { _1.jump(:label).source == "#{keyword}:" }&.[](1)&.source
       end
 
       sig { params(name: String).returns(TStructProp) }
       def make_prop(name)
         TStructProp.new(
-          default: default_value,
+          default: kw_arg('default'),
           doc: statement.docstring.to_s,
           prop_name: name,
           source: statement.source,