steep 0.21.0 → 0.27.0

data/lib/steep/ast/types/self.rb

@@ -27,7 +27,7 @@ module Steep
         end
 
         def free_variables
-          Set.new
+          @fvs ||= Set.new([self])
         end
 
         def level

data/lib/steep/ast/types/top.rb

@@ -26,9 +26,7 @@ module Steep
           "⟙"
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [2]

data/lib/steep/ast/types/tuple.rb

@@ -30,9 +30,11 @@ module Steep
           "[#{types.join(", ")}]"
         end
 
-        def free_variables
-          types.each.with_object(Set.new) do |type, set|
-            set.merge(type.free_variables)
+        def free_variables()
+          @fvs ||= Set.new.tap do |set|
+            types.each do |type|
+              set.merge(type.free_variables)
+            end
           end
         end
 

data/lib/steep/ast/types/union.rb

@@ -11,6 +11,9 @@ module Steep
         end
 
         def self.build(types:, location: nil)
+          return AST::Types::Bot.new if types.empty?
+          return types.first if types.size == 1
+
           types.flat_map do |type|
             if type.is_a?(Union)
               type.types
@@ -29,7 +32,10 @@ module Steep
               type
             end
           end.compact.uniq.yield_self do |tys|
-            if tys.length == 1
+            case tys.size
+            when 0
+              AST::Types::Bot.new
+            when 1
               tys.first
             else
               new(types: tys.sort_by(&:hash), location: location)
@@ -58,8 +64,10 @@ module Steep
         end
 
         def free_variables
-          types.each.with_object(Set.new) do |type, set|
-            set.merge(type.free_variables)
+          @fvs ||= Set.new.tap do |set|
+            types.each do |type|
+              set.merge(type.free_variables)
+            end
           end
         end
 

data/lib/steep/ast/types/var.rb

@@ -44,8 +44,8 @@ module Steep
           end
         end
 
-        def free_variables
-          Set.new([name])
+        def free_variables()
+          @fvs ||= Set.new([name])
         end
 
         def level

data/lib/steep/ast/types/void.rb

@@ -26,9 +26,7 @@ module Steep
           "void"
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [0]

data/lib/steep/drivers/check.rb

@@ -60,6 +60,10 @@ module Steep
                   Steep.log_error source_file.status.error
                 end
               end
+            when Project::Target::SignatureOtherErrorStatus
+              Steep.log_error status.error
+            else
+              Steep.logger.error { "Unexpected status: #{status.class}" }
             end
           end
         end

data/lib/steep/interface/method_type.rb

@@ -211,10 +211,10 @@ module Steep
         end
       end
 
-      def free_variables
-        Set.new.tap do |fvs|
+      def free_variables()
+        @fvs ||= Set.new.tap do |set|
           each_type do |type|
-            fvs.merge type.free_variables
+            set.merge(type.free_variables)
           end
         end
       end
@@ -224,14 +224,29 @@ module Steep
       end
 
       def subst(s)
-        self.class.new(
-          required: required.map {|t| t.subst(s) },
-          optional: optional.map {|t| t.subst(s) },
-          rest: rest&.subst(s),
-          required_keywords: required_keywords.transform_values {|t| t.subst(s) },
-          optional_keywords: optional_keywords.transform_values {|t| t.subst(s) },
-          rest_keywords: rest_keywords&.subst(s)
-        )
+        return self if s.empty?
+        return self if empty?
+        return self if free_variables.disjoint?(s.domain)
+
+        rs = required.map {|t| t.subst(s) }
+        os = optional.map {|t| t.subst(s) }
+        r = rest&.subst(s)
+        rk = required_keywords.transform_values {|t| t.subst(s) }
+        ok = optional_keywords.transform_values {|t| t.subst(s) }
+        k = rest_keywords&.subst(s)
+
+        if rs == required && os == optional && r == rest && rk == required_keywords && ok == optional_keywords && k == rest_keywords
+          self
+        else
+          self.class.new(
+            required: required.map {|t| t.subst(s) },
+            optional: optional.map {|t| t.subst(s) },
+            rest: rest&.subst(s),
+            required_keywords: required_keywords.transform_values {|t| t.subst(s) },
+            optional_keywords: optional_keywords.transform_values {|t| t.subst(s) },
+            rest_keywords: rest_keywords&.subst(s)
+          )
+        end
       end
 
       def size
@@ -557,14 +572,19 @@ module Steep
       end
 
       def subst(s)
-        self.class.new(
-          type: type.subst(s),
-          optional: optional
-        )
+        ty = type.subst(s)
+        if ty == type
+          self
+        else
+          self.class.new(
+            type: ty,
+            optional: optional
+          )
+        end
       end
 
-      def free_variables
-        type.free_variables
+      def free_variables()
+        @fvs ||= type.free_variables
       end
 
       def to_s
@@ -617,10 +637,20 @@ module Steep
       end
 
       def free_variables
-        (params.free_variables + (block&.free_variables || Set.new) + return_type.free_variables) - Set.new(type_params)
+        @fvs ||= Set.new.tap do |set|
+          set.merge(params.free_variables)
+          if block
+            set.merge(block.free_variables)
+          end
+          set.merge(return_type.free_variables)
+          set.subtract(type_params)
+        end
       end
 
       def subst(s)
+        return self if s.empty?
+        return self if free_variables.disjoint?(s.domain)
+
         s_ = s.except(type_params)
 
         self.class.new(

data/lib/steep/interface/substitution.rb

@@ -26,7 +26,32 @@ module Steep
       end
 
       def self.empty
-        new(dictionary: {}, instance_type: AST::Types::Instance.new, module_type: AST::Types::Class.new, self_type: AST::Types::Self.new)
+        new(dictionary: {},
+            instance_type: INSTANCE_TYPE,
+            module_type: CLASS_TYPE,
+            self_type: SELF_TYPE)
+      end
+
+      def empty?
+        dictionary.empty? &&
+          instance_type.is_a?(AST::Types::Instance) &&
+          module_type.is_a?(AST::Types::Class) &&
+          self_type.is_a?(AST::Types::Self)
+      end
+
+      INSTANCE_TYPE = AST::Types::Instance.new
+      CLASS_TYPE = AST::Types::Class.new
+      SELF_TYPE = AST::Types::Self.new
+
+      def domain
+        set = Set.new
+
+        set.merge(dictionary.keys)
+        set << INSTANCE_TYPE unless instance_type.is_a?(AST::Types::Instance)
+        set << CLASS_TYPE unless instance_type.is_a?(AST::Types::Class)
+        set << SELF_TYPE unless instance_type.is_a?(AST::Types::Self)
+
+        set
       end
 
       def to_s
@@ -81,6 +106,11 @@ module Steep
             raise "Duplicated key on merge!: #{key}, #{a}, #{b}"
           end
         end
+
+        @instance_type = instance_type.subst(s)
+        @module_type = module_type.subst(s)
+        @self_type = self_type.subst(s)
+
         self
       end
 
@@ -92,7 +122,7 @@ module Steep
       end
 
       def add!(v, ty)
-        merge!(Substitution.new(dictionary: { v => ty }, instance_type: nil, module_type: nil, self_type: nil))
+        merge!(Substitution.new(dictionary: { v => ty }, instance_type: instance_type, module_type: module_type, self_type: self_type))
       end
     end
   end

data/lib/steep/project/target.rb

@@ -79,6 +79,7 @@ module Steep
       def self.test_pattern(patterns, path, ext:)
         patterns.any? do |pattern|
           p = pattern.end_with?(File::Separator) ? pattern : pattern + File::Separator
+          p.delete_prefix!('./')
           (path.to_s.start_with?(p) && path.extname == ext) || File.fnmatch(pattern, path.to_s)
         end
       end
@@ -160,7 +161,18 @@ module Steep
               else
                 yield env, check, Time.now
               end
+            rescue RBS::DuplicatedDeclarationError => exn
+              @status = SignatureValidationErrorStatus.new(
+                errors: [
+                  Signature::Errors::DuplicatedDefinitionError.new(
+                    name: exn.name,
+                    location: exn.decls[0].location
+                  )
+                ],
+                timestamp: Time.now
+              )
             rescue => exn
+              Steep.log_error exn
               @status = SignatureOtherErrorStatus.new(error: exn, timestamp: Time.now)
             end
           end
@@ -183,8 +195,10 @@ module Steep
         type_check_sources = []
 
         target_sources.each do |file|
-          if file.type_check(check, timestamp)
-            type_check_sources << file
+          Steep.logger.tagged("path=#{file.path}") do
+            if file.type_check(check, timestamp)
+              type_check_sources << file
+            end
           end
         end
 
@@ -205,7 +219,7 @@ module Steep
       def errors
         case status
         when TypeCheckStatus
-          source_files.each_value.flat_map(&:errors)
+          source_files.each_value.flat_map(&:errors).select { |error | options.error_to_report?(error) }
         else
           []
         end

data/lib/steep/server/base_worker.rb

@@ -12,6 +12,7 @@ module Steep
         @project = project
         @reader = reader
         @writer = writer
+        @shutdown = false
       end
 
       def handle_request(request)
@@ -28,7 +29,7 @@ module Steep
           Steep.logger.formatter.push_tags(*tags)
           Steep.logger.tagged "background" do
             while job = queue.pop
-              handle_job(job)
+              handle_job(job) unless @shutdown
             end
           end
         end
@@ -38,11 +39,11 @@ module Steep
             reader.read do |request|
               case request[:method]
               when "shutdown"
-                # nop
+                @shutdown = true
               when "exit"
                 break
               else
-                handle_request(request)
+                handle_request(request) unless @shutdown
               end
             end
           ensure

data/lib/steep/server/master.rb

@@ -23,6 +23,7 @@ module Steep
         @signature_worker = signature_worker
         @code_workers = code_workers
         @worker_to_paths = {}
+        @shutdown = false
       end
 
       def start
@@ -59,7 +60,7 @@ module Steep
         end
 
         while job = queue.pop
-          writer.write(job)
+          writer.write(job) unless @shutdown
         end
 
         writer.io.close
@@ -154,6 +155,7 @@ module Steep
 
         when "shutdown"
           queue << { id: id, result: nil }
+          @shutdown = true
 
         when "exit"
           queue << nil

data/lib/steep/server/signature_worker.rb

@@ -112,6 +112,9 @@ module Steep
                         target.signature_files.each_key.with_object({}) do |path, hash|
                           hash[path] = []
                         end
+                      when Project::Target::SignatureOtherErrorStatus
+                        Steep.log_error status.error
+                        {}
                       else
                         Steep.logger.info "Unexpected target status: #{status.class}"
                         {}

data/lib/steep/signature/errors.rb

@@ -19,6 +19,19 @@ module Steep
         end
       end
 
+      class DuplicatedDefinitionError < Base
+        attr_reader :name
+
+        def initialize(name:, location:)
+          @name = name
+          @location = location
+        end
+
+        def puts(io)
+          io.puts "#{loc_to_s}\sDuplicatedDefinitionError: name=#{name}"
+        end
+      end
+
       class UnknownTypeNameError < Base
         attr_reader :name
 
@@ -48,6 +61,21 @@ module Steep
           io.puts "#{loc_to_s}\tInvalidTypeApplicationError: name=#{name}, expected=[#{params.join(", ")}], actual=[#{args.join(", ")}]"
         end
       end
+
+      class InvalidMethodOverloadError < Base
+        attr_reader :class_name
+        attr_reader :method_name
+
+        def initialize(class_name:, method_name:, location:)
+          @class_name = class_name
+          @method_name = method_name
+          @location = location
+        end
+
+        def puts(io)
+          io.puts "#{loc_to_s}\tInvalidMethodOverloadError: class_name=#{class_name}, method_name=#{method_name}"
+        end
+      end
     end
   end
 end

data/lib/steep/signature/validator.rb

@@ -53,6 +53,7 @@ module Steep
         validate_decl
         validate_const
         validate_global
+        validate_alias
       end
 
       def validate_type(type)
@@ -99,6 +100,7 @@ module Steep
         env.constant_decls.each do |name, entry|
           rescue_validation_errors do
             Steep.logger.debug "Validating constant `#{name}`..."
+            builder.ensure_namespace!(name.namespace, location: entry.decl.location)
             validate_type entry.decl.type
           end
         end
@@ -117,7 +119,9 @@ module Steep
         env.alias_decls.each do |name, entry|
           rescue_validation_errors do
             Steep.logger.debug "Validating alias `#{name}`..."
-            validate_type(entry.decl.type)
+            builder.expand_alias(name).tap do |type|
+              validate_type(type)
+            end
           end
         end
       end
@@ -136,6 +140,12 @@ module Steep
           name: factory.type_name(exn.type_name),
           location: exn.location
         )
+      rescue RBS::InvalidOverloadMethodError => exn
+        @errors << Errors::InvalidMethodOverloadError.new(
+          class_name: factory.type_name(exn.type_name),
+          method_name: exn.method_name,
+          location: exn.members[0].location
+        )
       end
     end
   end