Merge pull request #2127 from ksss/mem-validate

Avoid double name resolution

Author: soutaro

lib/rbs/cli/validate.rb

@@ -52,7 +52,7 @@ def initialize(args:, options:)
         loader = options.loader()
         @env = Environment.from_loader(loader).resolve_type_names
         @builder = DefinitionBuilder.new(env: @env)
-        @validator = Validator.new(env: @env, resolver: Resolver::TypeNameResolver.new(@env))
+        @validator = Validator.new(env: @env)
         exit_error = false
         limit = nil #: Integer?
         OptionParser.new do |opts|

lib/rbs/validator.rb

@@ -6,13 +6,15 @@ class Validator
     attr_reader :resolver
     attr_reader :definition_builder
 
-    def initialize(env:, resolver:)
+    def initialize(env:, resolver: nil)
       @env = env
       @resolver = resolver
       @definition_builder = DefinitionBuilder.new(env: env)
     end
 
     def absolute_type(type, context:, &block)
+      return type unless resolver
+
       type.map_type_name do |type_name, _, type|
         resolver.resolve(type_name, context: context) || (block ? yield(type) : type_name)
       end

sig/validator.rbs

@@ -2,15 +2,15 @@ module RBS
   class Validator
     attr_reader env: Environment
 
-    attr_reader resolver: Resolver::TypeNameResolver
+    attr_reader resolver: Resolver::TypeNameResolver?
 
     attr_reader definition_builder: DefinitionBuilder
 
     attr_reader type_alias_dependency: TypeAliasDependency
 
     attr_reader type_alias_regularity: TypeAliasRegularity
 
-    def initialize: (env: Environment, resolver: Resolver::TypeNameResolver) -> void
+    def initialize: (env: Environment, ?resolver: Resolver::TypeNameResolver?) -> void
 
     # Validates the presence of type names and type application arity match.
     #