Skip to content

Commit c30d53e

Browse files
committed
Avoid double name resolution
1 parent e4b4d58 commit c30d53e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

lib/rbs/cli/validate.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def initialize(args:, options:)
5252
loader = options.loader()
5353
@env = Environment.from_loader(loader).resolve_type_names
5454
@builder = DefinitionBuilder.new(env: @env)
55-
@validator = Validator.new(env: @env, resolver: Resolver::TypeNameResolver.new(@env))
55+
@validator = Validator.new(env: @env)
5656
exit_error = false
5757
limit = nil #: Integer?
5858
OptionParser.new do |opts|

lib/rbs/validator.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ class Validator
66
attr_reader :resolver
77
attr_reader :definition_builder
88

9-
def initialize(env:, resolver:)
9+
def initialize(env:, resolver: nil)
1010
@env = env
1111
@resolver = resolver
1212
@definition_builder = DefinitionBuilder.new(env: env)
1313
end
1414

1515
def absolute_type(type, context:, &block)
16+
return type unless @resolver
17+
1618
type.map_type_name do |type_name, _, type|
1719
resolver.resolve(type_name, context: context) || (block ? yield(type) : type_name)
1820
end

0 commit comments

Comments
 (0)