steep 1.10.0 → 2.0.0

data/lib/steep/diagnostic/ruby.rb

@@ -299,7 +299,7 @@ module Steep
         attr_reader :method_type
 
         def initialize(node:, method_type:)
-          loc = node.loc.begin.join(node.loc.end)
+          loc = node.loc.begin.join(node.loc.end) # steep:ignore NoMethod
           super(node: node, location: loc)
           @method_type = method_type
         end
@@ -313,7 +313,7 @@ module Steep
         attr_reader :method_type
 
         def initialize(node:, method_type:)
-          super(node: node, location: (node.type == :super || node.type == :zsuper) ? node.loc.keyword : node.loc.selector)
+          super(node: node, location: (node.type == :super || node.type == :zsuper) ? node.loc.keyword : node.loc.selector) # steep:ignore NoMethod
           @method_type = method_type
         end
 
@@ -349,7 +349,7 @@ module Steep
         include ResultPrinter
 
         def initialize(node:, expected:, actual:, result:)
-          super(node: node, location: node.loc.begin.join(node.loc.end))
+          super(node: node, location: node.loc.begin.join(node.loc.end)) # steep:ignore NoMethod
           @expected = expected
           @actual = actual
           @result = result
@@ -419,7 +419,7 @@ module Steep
           else
             raise "Unexpected node: #{node.type}"
           end
-          super(node: node, location: location)   # steep:ignore NoMethod
+          super(node: node, location: location)
 
           @name = name
         end
@@ -446,7 +446,7 @@ module Steep
                  when :defs
                    node.children[2]
                  end #: Parser::AST::Node?
-          super(node: node, location: args&.loc&.expression || node.loc.name)
+          super(node: node, location: args&.loc&.expression || node.loc.name) # steep:ignore NoMethod
           @method_type = method_type
         end
 
@@ -512,7 +512,7 @@ module Steep
         include ResultPrinter
 
         def initialize(node:, expected:, actual:, result:)
-          super(node: node, location: node.loc.name)
+          super(node: node, location: node.loc.name) # steep:ignore NoMethod
           @expected = expected
           @actual = actual
           @result = result
@@ -607,7 +607,7 @@ module Steep
         attr_reader :kind
 
         def initialize(node:, name:)
-          super(node: node, location: node.loc.name)
+          super(node: node, location: node.loc.name) # steep:ignore NoMethod
           @name = name
           @kind = :constant
         end
@@ -647,7 +647,7 @@ module Steep
         attr_reader :name
 
         def initialize(node:, name:)
-          super(node: node, location: node.loc.name)
+          super(node: node, location: node.loc.name) # steep:ignore NoMethod
           @name = name
         end
 
@@ -944,6 +944,33 @@ module Steep
         end
       end
 
+      class LibraryRBSError < Base
+        attr_reader :error
+
+        def initialize(error:, location:)
+          @error = error
+          super(node: nil, location: location)
+        end
+
+        def header_line
+          "Type checking failed due to error in library RBS file"
+        end
+
+        def detail_lines
+          lines = [] #: Array[String]
+          lines << error.header_line
+          if error.location
+            lines << "(#{error.location.buffer.name.to_s}:#{error.location.start_line}:#{error.location.start_column})"
+          end
+
+          if detail = error.detail_lines
+            lines << "" << detail
+          end
+
+          lines.join("\n")
+        end
+      end
+
       class InvalidIgnoreComment < Base
         attr_reader :comment
 
@@ -957,6 +984,16 @@ module Steep
         end
       end
 
+      class RedundantIgnoreComment < Base
+        def initialize(location:)
+          super(node: nil, location: location)
+        end
+
+        def header_line
+          "Redundant ignore comment"
+        end
+      end
+
       class UnannotatedEmptyCollection < Base
         def header_line
           node or raise
@@ -1075,6 +1112,7 @@ module Steep
             InsufficientPositionalArguments => :error,
             InsufficientTypeArgument => :hint,
             InvalidIgnoreComment => :warning,
+            RedundantIgnoreComment => :warning,
             MethodArityMismatch => :error,
             MethodBodyTypeMismatch => :error,
             MethodDefinitionInUndeclaredModule => :information,
@@ -1082,6 +1120,7 @@ module Steep
             MethodParameterMismatch => :error,
             MethodReturnTypeAnnotationMismatch => :hint,
             MultipleAssignmentConversionError => :hint,
+            LibraryRBSError => :error,
             NoMethod => :error,
             ProcHintIgnored => :hint,
             ProcTypeExpected => :hint,
@@ -1138,6 +1177,7 @@ module Steep
             InsufficientPositionalArguments => :error,
             InsufficientTypeArgument => :error,
             InvalidIgnoreComment => :warning,
+            RedundantIgnoreComment => :warning,
             MethodArityMismatch => :error,
             MethodBodyTypeMismatch => :error,
             MethodDefinitionInUndeclaredModule => :warning,
@@ -1201,6 +1241,7 @@ module Steep
             InsufficientPositionalArguments => :information,
             InsufficientTypeArgument => nil,
             InvalidIgnoreComment => :warning,
+            RedundantIgnoreComment => :hint,
             MethodArityMismatch => :information,
             MethodBodyTypeMismatch => :warning,
             MethodDefinitionInUndeclaredModule => :hint,
@@ -1208,6 +1249,7 @@ module Steep
             MethodParameterMismatch => :warning,
             MethodReturnTypeAnnotationMismatch => nil,
             MultipleAssignmentConversionError => nil,
+            LibraryRBSError => :error,
             NoMethod => :information,
             ProcHintIgnored => nil,
             ProcTypeExpected => nil,

data/lib/steep/diagnostic/signature.rb

@@ -276,7 +276,6 @@ module Steep
       class VariableDuplicationError < Base
         attr_reader :type_name
         attr_reader :variable_name
-        attr_reader :location
 
         def initialize(type_name:, variable_name:, location:)
           @type_name = type_name
@@ -344,19 +343,27 @@ module Steep
         end
 
         def header_line
-          "Cannot #{mixin_name} a class `#{member.name}` in the definition of `#{type_name}`"
+          member_name = case member
+                        when RBS::AST::Members::Include, RBS::AST::Members::Extend, RBS::AST::Members::Prepend
+                          member.name
+                        when RBS::AST::Ruby::Members::IncludeMember, RBS::AST::Ruby::Members::ExtendMember, RBS::AST::Ruby::Members::PrependMember
+                          member.module_name
+                        end
+          "Cannot #{mixin_name} a class `#{member_name}` in the definition of `#{type_name}`"
         end
 
         private
 
         def mixin_name
           case mem = member
-          when RBS::AST::Members::Prepend
+          when RBS::AST::Members::Prepend, RBS::AST::Ruby::Members::PrependMember
             "prepend"
-          when RBS::AST::Members::Include
+          when RBS::AST::Members::Include, RBS::AST::Ruby::Members::IncludeMember
             "include"
-          when RBS::AST::Members::Extend
+          when RBS::AST::Members::Extend, RBS::AST::Ruby::Members::ExtendMember
             "extend"
+          else
+            raise "Unknown mixin type: #{mem.class}"
           end
         end
       end
@@ -430,8 +437,12 @@ module Steep
               "module"
             when RBS::AST::Declarations::ClassAlias
               "class"
-            else
-              raise
+            when RBS::AST::Ruby::Declarations::ClassModuleAliasDecl
+              if decl.annotation.is_a?(RBS::AST::Ruby::Annotations::ClassAliasAnnotation)
+                "class"
+              else
+                "module"
+              end
             end
 
           "A #{expected_kind} `#{decl.new_name}` cannot be an alias of `#{decl.old_name}`"
@@ -504,6 +515,18 @@ module Steep
         end
       end
 
+      class InlineDiagnostic < Base
+        attr_reader :diagnostic
+
+        def initialize(diagnostic)
+          super(location: diagnostic.location)
+          @diagnostic = diagnostic
+        end
+
+        def header_line
+          diagnostic.message
+        end
+      end
 
       def self.from_rbs_error(error, factory:)
         case error
@@ -572,7 +595,7 @@ module Steep
         when RBS::SuperclassMismatchError
           Diagnostic::Signature::SuperclassMismatch.new(
             name: error.name,
-            location: error.entry.primary.decl.location
+            location: error.entry.primary_decl.location
           )
         when RBS::InvalidVarianceAnnotationError
           Diagnostic::Signature::InvalidVarianceAnnotation.new(