Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support trailing_positional parameters #115

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion lib/rbs/inline/ast/members.rb
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ def method_overloads #: Array[RBS::AST::Members::MethodDefinition::Overload]
required_positionals = [] #: Array[Types::Function::Param]
optional_positionals = [] #: Array[Types::Function::Param]
rest_positionals = nil #: Types::Function::Param?
trailing_positionals = [] #: Array[Types::Function::Param]
required_keywords = {} #: Hash[Symbol, Types::Function::Param]
optional_keywords = {} #: Hash[Symbol, Types::Function::Param]
rest_keywords = nil #: Types::Function::Param?
Expand Down Expand Up @@ -206,6 +207,17 @@ def method_overloads #: Array[RBS::AST::Members::MethodDefinition::Overload]
)
end

node.parameters.posts.each do |param|
case param
when Prism::RequiredParameterNode
trailing_positionals << Types::Function::Param.new(
name: param.name,
type: var_type_hash[param.name] || Types::Bases::Any.new(location: nil),
location: nil
)
end
end

node.parameters.keywords.each do |node|
if node.is_a?(Prism::RequiredKeywordParameterNode)
required_keywords[node.name] = Types::Function::Param.new(
Expand Down Expand Up @@ -258,7 +270,7 @@ def method_overloads #: Array[RBS::AST::Members::MethodDefinition::Overload]
required_positionals: required_positionals,
optional_positionals: optional_positionals,
rest_positionals: rest_positionals,
trailing_positionals: [],
trailing_positionals: trailing_positionals,
required_keywords: required_keywords,
optional_keywords: optional_keywords,
rest_keywords: rest_keywords,
Expand Down
15 changes: 15 additions & 0 deletions test/rbs/inline/writer_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,21 @@ def f: () -> String?
RBS
end

def test_method__args
output = translate(<<~RUBY)
class Foo
def foo(a, b = nil, *c, d, e:, f: nil, **g, &)
end
end
RUBY

assert_equal <<~RBS, output
class Foo
def foo: (untyped a, ?untyped b, *untyped c, untyped d, e: untyped, ?f: untyped, **untyped g) ?{ (?) -> untyped } -> untyped
end
RBS
end

def test_method__block
output = translate(<<~RUBY)
class Foo
Expand Down