steep 1.9.0.dev.2 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89c207623c288c2142cdcf7d7de7f404da4d160b5bc40c84210116a721ec4029
-  data.tar.gz: dfd95e726115676f4d293d312bd1f06afa6ea89336911e9887c8e4b5ee1167ff
+  metadata.gz: 522d134347810d1fbb030d139f616077fcc197aabe079bf14453305c9c9562bd
+  data.tar.gz: bd6a1a97a815c02ba20160d6bc1bd2166c1a02cdee3901c2a84fca2fe1b22d0b
 SHA512:
-  metadata.gz: c9800ef17d4108ff391642510701e12a0ec4e63035c74765ed1203fa9b62d964be10441d60890ab3c643dc8d0295dd2a68be5285126307f3cb401f517eaa799f
-  data.tar.gz: 3ef2c5d7bac4dd2d492df8e5c60322de6c06d9c33cec21e2a97e4608f235e41729f0383e0817cfd324213853cad4c34308b14f5a582eedda71d36828545d6840
+  metadata.gz: 254fb6ef3b682ea7866e2892755e183bcd8ed797f4209faf999f40cdcb140a67083c73684ba80273cbf2e563650a2213114c474a2e0d3e50cc6d0cdc5d05caf0
+  data.tar.gz: b5daeab25121a44e5e9ad4a353de77115f7f626c0f5ac9342c1fe0ac061eabf75cbf3fef26a3b651d0b4849a0c05d5c1eafe9027f72294af0974f7b051f9eb71

data/CHANGELOG.md

@@ -1,5 +1,87 @@
 # CHANGELOG
 
+## 1.9.1 (2024-12-09)
+
+### Type checker core
+
+* Make `implicitly-returns-nil` opt-in ([#1396](https://github.com/soutaro/steep/pull/1396))
+
+## 1.9.0 (2024-12-06)
+
+### Type checker core
+
+* Report diagnostic on unknown record key ([#1385](https://github.com/soutaro/steep/pull/1385))
+* Report annotation syntax error ([#1384](https://github.com/soutaro/steep/pull/1384))
+* emit UnreachableBranch to the "void" condition ([#1356](https://github.com/soutaro/steep/pull/1356))
+* Support &method(:name) call for block_pass ([#1276](https://github.com/soutaro/steep/pull/1276))
+* Emit SingletonTypeMismatch when class/module mismatch ([#1274](https://github.com/soutaro/steep/pull/1274))
+* refactor: Use Array#fetch instead of Array#[] to resolve type errors ([#1287](https://github.com/soutaro/steep/pull/1287))
+* refactor: Use Hash#fetch instead of Hash#[] to resolve type errors ([#1286](https://github.com/soutaro/steep/pull/1286))
+* Expand `array(splat(expr` node ([#1347](https://github.com/soutaro/steep/pull/1347))
+* Add `UnannotatedEmptyCollection` diagnostic ([#1338](https://github.com/soutaro/steep/pull/1338))
+* Update type checking strategy ([#1308](https://github.com/soutaro/steep/pull/1308))
+* Fix untyped hash typing ([#1299](https://github.com/soutaro/steep/pull/1299))
+* Support `implicitly-returns-nil` ([#1258](https://github.com/soutaro/steep/pull/1258))
+* Fix record shape ([#1265](https://github.com/soutaro/steep/pull/1265))
+* Remove unused rules ([#1238](https://github.com/soutaro/steep/pull/1238))
+
+### Commandline tool
+
+* Introduces a new `target.*` syntax for everything in the target ([#1387](https://github.com/soutaro/steep/pull/1387))
+* Symbolize target/group names ([#1364](https://github.com/soutaro/steep/pull/1364))
+* Update Steepfile template ([#1355](https://github.com/soutaro/steep/pull/1355))
+* Delete `target` from `--validate` option ([#1346](https://github.com/soutaro/steep/pull/1346))
+* Install rbs collection automatically ([#1345](https://github.com/soutaro/steep/pull/1345))
+
+### Language server
+
+* Add link to diagnostic manual ([#1388](https://github.com/soutaro/steep/pull/1388))
+* Stop accumulating diagnostics ([#1367](https://github.com/soutaro/steep/pull/1367))
+* Send server version to client ([#1341](https://github.com/soutaro/steep/pull/1341))
+* Add custom methods to trigger type check manually ([#1340](https://github.com/soutaro/steep/pull/1340))
+* Type check thread helpers ([#1335](https://github.com/soutaro/steep/pull/1335))
+* Use `URI::RFC2396_Parser` ([#1329](https://github.com/soutaro/steep/pull/1329))
+* Handle file deletion notification ([#1300](https://github.com/soutaro/steep/pull/1300))
+* Refactor communication between master and type check worker ([#1285](https://github.com/soutaro/steep/pull/1285))
+* Skip sending response to `$/steep/typecheck` request from `steep langserver` ([#1267](https://github.com/soutaro/steep/pull/1267))
+
+### Miscellaneous
+
+* Use rbs-3.7 ([#1383](https://github.com/soutaro/steep/pull/1383))
+* Move diagnostic docs ([#1370](https://github.com/soutaro/steep/pull/1370))
+* Add anchor ([#1359](https://github.com/soutaro/steep/pull/1359))
+* Update example to not use `^` as a hash function ([#1360](https://github.com/soutaro/steep/pull/1360))
+* doc: Add diagnostics for Ruby page ([#1249](https://github.com/soutaro/steep/pull/1249))
+* Update filename example in initial Steepfile ([#1230](https://github.com/soutaro/steep/pull/1230))
+* docs: Add document for steep:ignore comment ([#1353](https://github.com/soutaro/steep/pull/1353))
+* docs: Add document for type assertion and type application ([#1235](https://github.com/soutaro/steep/pull/1235))
+* Print test names in CI for investigation ([#1354](https://github.com/soutaro/steep/pull/1354))
+* Fix typo ([#1352](https://github.com/soutaro/steep/pull/1352))
+* Set up type checking tests ([#1339](https://github.com/soutaro/steep/pull/1339))
+* Fix typo ([#1248](https://github.com/soutaro/steep/pull/1248))
+
+## 1.8.3 (2024-10-29)
+
+### Type checker core
+
+* Fix untyped hash typing ([#1299](https://github.com/soutaro/steep/pull/1299), Backport in [#1301](https://github.com/soutaro/steep/pull/1301))
+
+### Language server
+
+* Handle file deletion notification ([#1300](https://github.com/soutaro/steep/pull/1300), Backport in [#1301](https://github.com/soutaro/steep/pull/1301))
+
+## 1.8.2 (2024-10-24)
+
+### Language server
+
+* Ignore `didChangeWatchedFiles notification` for open files ([#1290](https://github.com/soutaro/steep/pull/1290))
+
+## 1.8.1 (2024-10-08)
+
+### Language server
+
+* Skip sending response to `$/steep/typecheck` request from `steep langserver` ([#1268](https://github.com/soutaro/steep/pull/1268), backport [#1267](https://github.com/soutaro/steep/pull/1267))
+
 ## 1.8.0 (2024-09-30)
 
 ### Type checker core

data/README.md

@@ -120,7 +120,7 @@ class Email
   end
 
   def hash
-    self.class.hash ^ address.hash
+    [self.class, address].hash
   end
 end
 
@@ -144,7 +144,7 @@ class Phone
   end
 
   def hash
-    self.class.hash ^ country.hash ^ number.hash
+    [self.class, country, number].hash
   end
 end
 ```
@@ -201,11 +201,16 @@ Generally, these are by our design.
 
 `rbs prototype` offers options: `rbi` to generate prototype from Sorbet RBI and `runtime` to generate from runtime API.
 
-## Guides
+## Docs
 
-There are some guides in the `guide` directory. I know we need more comprehensive set of documentations. Just started writing docs.
+There are some documents in the `manul` and `guide` directories.
 
 * [Guides](guides)
+* [Manual](manual)
+
+The `doc` directory contains a few internal design docs.
+
+* [Internal docs](doc)
 
 ## Examples
 

data/Rakefile

@@ -48,6 +48,7 @@ task :changelog do
     "list",
     "--json",
     "url,title,number",
+    "--limit=100",
     "--search" ,
     "milestone:\"#{milestone}\" is:merged sort:updated-desc -label:Released"
   ]

data/Steepfile

@@ -49,3 +49,14 @@ target :test do
     library "rbs"
   end
 end
+
+target :bin do
+  unreferenced!
+
+  collection_config "rbs_collection.steep.yaml"
+
+  check "bin/generate-diagnostics-docs.rb"
+  signature "tmp/rbs-inline/bin"
+
+  library "rbs"
+end

data/bin/generate-diagnostics-docs.rb

@@ -0,0 +1,112 @@
+# rbs_inline: enabled
+
+require "rbs"
+require "steep"
+
+class RubyDiagnosticsVisitor < RBS::AST::Visitor
+  attr_reader :classes #: Hash[String, String]
+  attr_reader :templates #: Hash[Symbol, String]
+
+  def initialize #: void
+    @classes = {}
+    @templates = {}
+  end
+
+  # @rbs ...
+  def visit_declaration_class(node)
+    unless node.annotations.find { _1.string == "diagnostics--skip" }
+      if node.comment
+        name = node.name.to_s
+        classes[name] = node.comment.string
+      end
+    end
+
+    super
+  end
+
+  # @rbs ...
+  def visit_member_method_definition(node)
+    if node.annotations.find { _1.string == "diagnostics--template" }
+      if node.comment
+        templates[node.name] = node.comment.string
+      end
+    end
+  end
+
+  # @rbs (IO) -> void
+  def format_templates(io)
+    io.puts "## Configuration Templates"
+
+    io.puts <<~MD
+      Steep provides several templates to configure diagnostics for Ruby code.
+      You can use these templates or customize them to suit your needs via `#configure_code_diagnostics` method in `Steepfile`.
+
+      The following templates are available:
+
+    MD
+
+    io.puts "<dl>"
+    templates.keys.sort.each do |key|
+      body = templates.fetch(key)
+
+      io.puts "<dt><code>Ruby.#{key}</code></dt>"
+      io.puts "<dd>#{body}</dd>"
+    end
+    io.puts "</dl>"
+    io.puts
+  end
+
+  # @rbs (IO) -> void
+  def format_class(io)
+    classes.keys.sort.each do |key|
+      content = classes[key]
+
+      # io.puts "<h2 id='Ruby::#{key}'>Ruby::#{key}</h2>"
+      io.puts "<a name='Ruby::#{key}'></a>"
+      io.puts "## Ruby::#{key}"
+      io.puts
+      io.puts content
+      io.puts
+
+      configs = templates.keys
+
+      io.puts "### Severity"
+      io.puts
+      io.puts "| #{configs.map { "#{_1}" }.join(" | ")} |"
+      io.puts "| #{configs.map{"-"}.join(" | ")} |"
+
+      line = configs.map {|config|
+        hash = Steep::Diagnostic::Ruby.__send__(config) #: Hash[Class, untyped]
+        const =Steep::Diagnostic::Ruby.const_get(key.to_sym)
+        "#{hash[const] || "-"}"
+      }
+      io.puts "| #{line.join(" | ")} |"
+      io.puts
+    end
+  end
+
+  # @rbs (Pathname) { (instance) -> void } -> void
+  def self.visit_file(path, &block)
+    STDERR.puts "Reading #{path}..."
+    buffer = RBS::Buffer.new(name: path, content: path.read)
+    _, _dirs, decls = RBS::Parser.parse_signature(buffer)
+
+    visitor = new()
+    visitor.visit_all(decls)
+
+    yield visitor
+  end
+end
+
+diagnostic_dir = Pathname(__dir__ || raise) + "../sig/steep/diagnostic"
+output_dir = Pathname(__dir__ || raise) + "../manual"
+
+RubyDiagnosticsVisitor.visit_file(diagnostic_dir + "ruby.rbs") do |visitor|
+  STDERR.puts ">> Writing #{output_dir + "ruby-diagnostics.md"}..."
+  (output_dir + "ruby-diagnostics.md").open("w") do |io|
+    io.puts "# Ruby Code Diagnostics"
+    io.puts
+    visitor.format_templates(io)
+    visitor.format_class(io)
+  end
+end

data/lib/steep/ast/builtin.rb

@@ -66,6 +66,7 @@ module Steep
       NilClass = Type.new("::NilClass")
       Proc = Type.new("::Proc")
       Kernel = Type.new("::Kernel")
+      Method = Type.new("::Method")
 
       def self.nil_type
         AST::Types::Nil.instance

data/lib/steep/ast/ignore.rb

@@ -79,7 +79,7 @@ module Steep
             return :all
           end
 
-          if raw_diagnostics.size == 1 && raw_diagnostics[0].source == "all"
+          if raw_diagnostics.size == 1 && raw_diagnostics.fetch(0).source == "all"
             return :all
           end
 

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

@@ -409,6 +409,8 @@ module Steep
             ]
           when AST::Types::Any, AST::Types::Boolean, AST::Types::Top, AST::Types::Logic::Base
             [type, type]
+          when AST::Types::Bot, AST::Types::Void
+            [nil, nil]
           when AST::Types::Nil
             [nil, type]
           when AST::Types::Literal

data/lib/steep/cli.rb

@@ -128,10 +128,17 @@ module Steep
           end
 
           opts.on("--group=GROUP", "Specify target/group name to type check") do |arg|
-            # @type var group: String
+            # @type var arg: String
             target, group = arg.split(".")
             target or raise
-            command.active_group_names << [target.to_sym, group&.to_sym]
+            case group
+            when "*"
+              command.active_group_names << [target.to_sym, true]
+            when nil
+              command.active_group_names << [target.to_sym, nil]
+            else
+              command.active_group_names << [target.to_sym, group.to_sym]
+            end
           end
 
           opts.on("--[no-]type-check", "Type check Ruby code") do |v|

data/lib/steep/diagnostic/lsp_formatter.rb

@@ -43,11 +43,18 @@ module Steep
         if severity
           range = diagnostic.location&.as_lsp_range || raise("#{diagnostic.class} object (#{diagnostic.full_message}) instance must have `#location`")
 
+          if diagnostic.is_a?(Ruby::Base)
+            description = {
+              href: "https://github.com/soutaro/steep/tree/v#{VERSION}/manual/ruby-diagnostics.md##{URI.encode_uri_component(diagnostic.diagnostic_code)}"
+            } #: LSP::Interface::CodeDescription::json
+          end
+
           {
             message: diagnostic.full_message,
             code: diagnostic.diagnostic_code,
             severity: severity,
-            range: range
+            range: range,
+            codeDescription: description
           }
         end
       end

data/lib/steep/diagnostic/ruby.rb

@@ -409,6 +409,33 @@ module Steep
         end
       end
 
+      class ClassModuleMismatch < Base
+        attr_reader :name
+
+        def initialize(node:, name:)
+          case node.type
+          when :module, :class
+            location = node.loc.name # steep:ignore NoMethod
+          else
+            raise "Unexpected node: #{node.type}"
+          end
+          super(node: node, location: location)   # steep:ignore NoMethod
+
+          @name = name
+        end
+
+        def header_line
+          case node&.type
+          when :module
+            "#{name} is declared as a class in RBS"
+          when :class
+            "#{name} is declared as a module in RBS"
+          else
+            raise
+          end
+        end
+      end
+
       class MethodArityMismatch < Base
         attr_reader :method_type
 
@@ -794,6 +821,19 @@ module Steep
         end
       end
 
+      class AnnotationSyntaxError < Base
+        attr_reader :message
+
+        def initialize(message: ,location:)
+          super(node: nil, location: location)
+          @message = message
+        end
+
+        def header_line
+          "Type annotation has a syntax error: #{message}"
+        end
+      end
+
       class FalseAssertion < Base
         attr_reader :node, :assertion_type, :node_type
 
@@ -924,6 +964,19 @@ module Steep
         end
       end
 
+      class UnknownRecordKey < Base
+        attr_reader :key
+
+        def initialize(key:, node:)
+          super(node: node)
+          @key = key
+        end
+
+        def header_line
+          "Unknown key `#{key.inspect}` is given to a record type"
+        end
+      end
+
       ALL = ObjectSpace.each_object(Class).with_object([]) do |klass, array|
         if klass < Base
           array << klass
@@ -939,6 +992,7 @@ module Steep
       def self.default
         @default ||= _ = all_error.merge(
           {
+            AnnotationSyntaxError => :error,
             ArgumentTypeMismatch => :error,
             BlockBodyTypeMismatch => :warning,
             BlockTypeMismatch => :warning,
@@ -968,7 +1022,8 @@ module Steep
             ReturnTypeMismatch => :error,
             SetterBodyTypeMismatch => :information,
             SetterReturnTypeMismatch => :information,
-            SyntaxError => :hint,
+            ClassModuleMismatch => :error,
+            SyntaxError => :information,
             TypeArgumentMismatchError => :hint,
             UnannotatedEmptyCollection => :warning,
             UnexpectedBlockGiven => :warning,
@@ -983,6 +1038,7 @@ module Steep
             UnexpectedYield => :warning,
             UnknownConstant => :warning,
             UnknownGlobalVariable => :warning,
+            UnknownRecordKey => :information,
             UnknownInstanceVariable => :information,
             UnreachableBranch => :hint,
             UnreachableValueBranch => :hint,
@@ -996,6 +1052,7 @@ module Steep
       def self.strict
         @strict ||= _ = all_error.merge(
           {
+            AnnotationSyntaxError => :error,
             ArgumentTypeMismatch => :error,
             BlockBodyTypeMismatch => :error,
             BlockTypeMismatch => :error,
@@ -1025,7 +1082,8 @@ module Steep
             ReturnTypeMismatch => :error,
             SetterBodyTypeMismatch => :error,
             SetterReturnTypeMismatch => :error,
-            SyntaxError => :hint,
+            ClassModuleMismatch => :error,
+            SyntaxError => :information,
             TypeArgumentMismatchError => :error,
             UnannotatedEmptyCollection => :error,
             UnexpectedBlockGiven => :error,
@@ -1040,6 +1098,7 @@ module Steep
             UnexpectedYield => :error,
             UnknownConstant => :error,
             UnknownGlobalVariable => :error,
+            UnknownRecordKey => :warning,
             UnknownInstanceVariable => :error,
             UnreachableBranch => :information,
             UnreachableValueBranch => :warning,
@@ -1053,6 +1112,7 @@ module Steep
       def self.lenient
         @lenient ||= _ = all_error.merge(
           {
+            AnnotationSyntaxError => :error,
             ArgumentTypeMismatch => :information,
             BlockBodyTypeMismatch => :information,
             BlockTypeMismatch => :information,
@@ -1082,7 +1142,8 @@ module Steep
             ReturnTypeMismatch => :warning,
             SetterBodyTypeMismatch => nil,
             SetterReturnTypeMismatch => nil,
-            SyntaxError => :hint,
+            ClassModuleMismatch => nil,
+            SyntaxError => :information,
             TypeArgumentMismatchError => nil,
             UnannotatedEmptyCollection => :hint,
             UnexpectedBlockGiven => :hint,
@@ -1097,6 +1158,7 @@ module Steep
             UnexpectedYield => :information,
             UnknownConstant => :hint,
             UnknownGlobalVariable => :hint,
+            UnknownRecordKey => :hint,
             UnknownInstanceVariable => :hint,
             UnreachableBranch => :hint,
             UnreachableValueBranch => :hint,

data/lib/steep/diagnostic/signature.rb

@@ -456,7 +456,7 @@ module Steep
         end
 
         def header_line
-          "The default type of `#{param_name}` doesn't satisfy upper bound constarint: #{relation}"
+          "The default type of `#{param_name}` doesn't satisfy upper bound constraint: #{relation}"
         end
       end
 
@@ -468,7 +468,7 @@ module Steep
         when RBS::DuplicatedDeclarationError
           Diagnostic::Signature::DuplicatedDeclaration.new(
             type_name: error.name,
-            location: error.decls[0].location
+            location: error.decls.fetch(0).location
           )
         when RBS::GenericParameterMismatchError
           Diagnostic::Signature::GenericParameterMismatch.new(
@@ -494,7 +494,7 @@ module Steep
           Diagnostic::Signature::InvalidMethodOverload.new(
             class_name: error.type_name,
             method_name: error.method_name,
-            location: error.members[0].location
+            location: error.members.fetch(0).location
           )
         when RBS::DuplicatedMethodDefinitionError
           Diagnostic::Signature::DuplicatedMethodDefinition.new(
@@ -518,7 +518,7 @@ module Steep
           Diagnostic::Signature::RecursiveAlias.new(
             class_name: error.type.name,
             names: error.defs.map(&:name),
-            location: error.defs[0].original&.location
+            location: error.defs.fetch(0).original&.location
           )
         when RBS::RecursiveAncestorError
           Diagnostic::Signature::RecursiveAncestor.new(

data/lib/steep/drivers/annotations.rb

@@ -21,7 +21,7 @@ module Steep
 
         project.targets.each do |target|
           Steep.logger.tagged "target=#{target.name}" do
-            service = Services::SignatureService.load_from(target.new_env_loader())
+            service = Services::SignatureService.load_from(target.new_env_loader(), implicitly_returns_nil: target.implicitly_returns_nil)
 
             sigs = loader.load_changes(target.signature_pattern, changes: {})
             service.update(sigs)

data/lib/steep/drivers/check.rb

@@ -38,12 +38,12 @@ module Steep
         case group
         when Project::Target
           active_group_names.any? {|target_name, group_name|
-            target_name == group.name && group_name == nil
+            target_name == group.name && (group_name == nil || group_name == true)
           }
         when Project::Group
           active_group_names.any? {|target_name, group_name|
             target_name == group.target.name &&
-              (group_name == group.name || group_name.nil?)
+              (group_name == group.name || group_name == true)
           }
         end
       end
@@ -206,7 +206,7 @@ module Steep
 
       def load_files(files, target, group, params:)
         if type_check_code
-          files.each_group_source_path(group) do |path|
+          files.each_group_source_path(group, true) do |path|
             params[:code_paths] << [target.name.to_s, target.project.absolute_path(path).to_s]
           end
         end

data/lib/steep/drivers/diagnostic_printer.rb

@@ -82,7 +82,7 @@ module Steep
         start_pos = diagnostic[:range][:start]
         end_pos = diagnostic[:range][:end]
 
-        line = buffer.lines[start_pos[:line]]
+        line = buffer.lines.fetch(start_pos[:line])
 
         leading = line[0...start_pos[:character]] || ""
         if start_pos[:line] == end_pos[:line]

data/lib/steep/drivers/init.rb

@@ -12,9 +12,10 @@ module Steep
       #
       # target :lib do
       #   signature "sig"
+      #   ignore_signature "sig/test"
       #
       #   check "lib"                       # Directory name
-      #   check "Gemfile"                   # File name
+      #   check "path/to/source.rb"         # File name
       #   check "app/models/**/*.rb"        # Glob
       #   # ignore "lib/templates/*.rb"
       #
@@ -31,9 +32,11 @@ module Steep
       # end
 
       # target :test do
-      #   signature "sig", "sig-private"
+      #   unreferenced!                     # Skip type checking the `lib` code when types in `test` target is changed
+      #   signature "sig/test"              # Put RBS files for tests under `sig/test`
+      #   check "test"                      # Type check Ruby scripts under `test`
       #
-      #   check "test"
+      #   configure_code_diagnostics(D::Ruby.lenient)      # Weak type checking for test code
       #
       #   # library "pathname"              # Standard libraries
       # end

data/lib/steep/expectations.rb

@@ -203,7 +203,7 @@ module Steep
       array = [] #: Array[{ "file" => String, "diagnostics" => Array[untyped] }]
 
       diagnostics.each_key.sort.each do |key|
-        ds = diagnostics[key]
+        ds = diagnostics.fetch(key)
         array << {
           "file" => key.to_s,
           'diagnostics' => ds.sort_by(&:sort_key).map(&:to_hash)

data/lib/steep/interface/builder.rb

@@ -54,19 +54,20 @@ module Steep
         end
       end
 
-      attr_reader :factory, :object_shape_cache, :union_shape_cache, :singleton_shape_cache
+      attr_reader :factory, :object_shape_cache, :union_shape_cache, :singleton_shape_cache, :implicitly_returns_nil
 
-      def initialize(factory)
+      def initialize(factory, implicitly_returns_nil:)
         @factory = factory
         @object_shape_cache = {}
         @union_shape_cache = {}
         @singleton_shape_cache = {}
+        @implicitly_returns_nil = implicitly_returns_nil
       end
 
       def shape(type, config)
         Steep.logger.tagged "shape(#{type})" do
           if shape = raw_shape(type, config)
-            # Optimization that skips unnecesary substittuion
+            # Optimization that skips unnecessary substitution
             if type.free_variables.include?(AST::Types::Self.instance)
               shape
             else
@@ -172,7 +173,7 @@ module Steep
           if bound = config.upper_bound(type.name)
             new_config = Config.new(self_type: bound, variable_bounds: config.variable_bounds)
             sub = Substitution.build([], self_type: type)
-            # We have to use `self_shape` insead of `raw_shape` here.
+            # We have to use `self_shape` instead of `raw_shape` here.
             # Keep the `self` types included in the `bound`'s shape, and replace it to the type variable.
             self_shape(bound, new_config)&.subst(sub, type: type)
           end
@@ -826,6 +827,8 @@ module Steep
       end
 
       def add_implicitly_returns_nil(annotations, method_type)
+        return method_type unless implicitly_returns_nil
+        
         if annotations.find { _1.string == "implicitly-returns-nil" }
           return_type = method_type.type.return_type
           method_type = method_type.with(
@@ -838,4 +841,3 @@ module Steep
     end
   end
 end
-