steep 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5aa3a8e2257e84d0ed22ede78f6ddc038a43bada5127863bf308ec00e5cb2ca6
-  data.tar.gz: fc29cc0b62e9a9c0bfdf3e1a2093e50bb6a53c474ca5de9472a7297694f6f020
+  metadata.gz: e93086efe3704ac8b59a1450fda301b7ab91f409c13c53a679a2ed3b3419ca84
+  data.tar.gz: b00e2030a9ea2171b6f967c78f469204c903cb937d421e5dcab896021fce2919
 SHA512:
-  metadata.gz: 827e7bf852501b156d0f77b4120401ad02a5ed070335342d7b316f37c286f347cc183e2f1a68849c9f0d2f78cdd53d64a0a8151f2958d8b7562fda0afb256ccc
-  data.tar.gz: 72444df723fe5ffaf552e6e5e92e7318c71d5ed9b2d77048faa928368626423b59ed9046b4a16cc916819f4fef8343b5e1866f9715ed95c701770dc49ec6a47d
+  metadata.gz: 06023d31b509f58efdea8c8f0e13c49b38f3a4936debbe3a0d88bfd84b356e7a761506a8f105c035bd454a4b2f39ae6af13d16b84d29e6d0050d9d58d7062e82
+  data.tar.gz: '0601459d31ad8ca758c95c29215eb237b5bc50490b5133e574057ec1836396d9189c3dd22628244c1d8d432e0f945a746c280ae96ca20b768c063fbae0c696af'

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 0.33.0 (2020-10-13)
+
+* Make `!` typing flow sensitive ([#240](https://github.com/soutaro/steep/pull/240))
+
 ## 0.32.0 (2020-10-09)
 
 * Let type-case support interface types ([#237](https://github.com/soutaro/steep/pull/237))

data/lib/steep.rb

@@ -16,7 +16,6 @@ require 'uri'
 
 require "rbs"
 
-require "steep/ast/location"
 require "steep/ast/types/helper"
 require "steep/ast/types/any"
 require "steep/ast/types/instance"
@@ -39,7 +38,6 @@ require "steep/ast/types/logic"
 require "steep/ast/type_params"
 require "steep/ast/annotation"
 require "steep/ast/annotation/collection"
-require "steep/ast/buffer"
 require "steep/ast/builtin"
 require "steep/ast/types/factory"
 

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

@@ -342,44 +342,44 @@ module Steep
           end
         end
 
+        NilClassName = TypeName("::NilClass")
+
         def setup_primitives(method_name, method_type)
           if method_def = method_type.method_def
             defined_in = method_def.defined_in
             member = method_def.member
 
             if member.is_a?(RBS::AST::Members::MethodDefinition)
-              case
-              when defined_in == RBS::BuiltinNames::Object.name && member.instance?
-                case method_name
-                when :is_a?, :kind_of?, :instance_of?
+              case method_name
+              when :is_a?, :kind_of?, :instance_of?
+                if defined_in == RBS::BuiltinNames::Object.name && member.instance?
                   return method_type.with(
                     return_type: AST::Types::Logic::ReceiverIsArg.new(location: method_type.return_type.location)
                   )
-                when :nil?
-                  return method_type.with(
-                    return_type: AST::Types::Logic::ReceiverIsNil.new(location: method_type.return_type.location)
-                  )
                 end
 
-              when defined_in == AST::Builtin::NilClass.module_name && member.instance?
-                case method_name
-                when :nil?
+              when :nil?
+                case defined_in
+                when RBS::BuiltinNames::Object.name,
+                  NilClassName
                   return method_type.with(
                     return_type: AST::Types::Logic::ReceiverIsNil.new(location: method_type.return_type.location)
                   )
                 end
 
-              when defined_in == RBS::BuiltinNames::BasicObject.name && member.instance?
-                case method_name
-                when :!
+              when :!
+                case defined_in
+                when RBS::BuiltinNames::BasicObject.name,
+                  RBS::BuiltinNames::TrueClass.name,
+                  RBS::BuiltinNames::FalseClass.name
                   return method_type.with(
                     return_type: AST::Types::Logic::Not.new(location: method_type.return_type.location)
                   )
                 end
 
-              when defined_in == RBS::BuiltinNames::Module.name && member.instance?
-                case method_name
-                when :===
+              when :===
+                case defined_in
+                when RBS::BuiltinNames::Module.name
                   return method_type.with(
                     return_type: AST::Types::Logic::ArgIsReceiver.new(location: method_type.return_type.location)
                   )
@@ -409,7 +409,7 @@ module Steep
             else
               raise "Unexpected `self` type interface"
             end
-            
+
           when Name::Instance
             Interface::Interface.new(type: self_type, private: private).tap do |interface|
               definition = definition_builder.build_instance(type.name)

data/lib/steep/server/utils.rb

@@ -13,7 +13,7 @@ module Steep
         if range
           text = text.dup
 
-          buf = AST::Buffer.new(name: :_, content: text)
+          buf = RBS::Buffer.new(name: :_, content: text)
 
           start_pos = buf.loc_to_pos(range[:start].yield_self {|pos| [pos[:line]+1, pos[:character]] })
           end_pos = buf.loc_to_pos(range[:end].yield_self {|pos| [pos[:line]+1, pos[:character]] })

data/lib/steep/source.rb

@@ -65,11 +65,11 @@ module Steep
         parser.tokenize(buffer)
       end
 
-      buffer = AST::Buffer.new(name: path, content: source_code)
+      buffer = RBS::Buffer.new(name: path, content: source_code)
 
       comments.each do |comment|
         src = comment.text.gsub(/\A#\s*/, '')
-        location = AST::Location.new(buffer: buffer,
+        location = RBS::Location.new(buffer: buffer,
                                      start_pos: comment.location.expression.begin_pos + 1,
                                      end_pos: comment.location.expression.end_pos)
         annotation = AnnotationParser.new(factory: factory).parse(src, location: location)

data/lib/steep/type_inference/context_array.rb

@@ -29,7 +29,7 @@ module Steep
                   else
                     ""
                   end
-        buffer = AST::Buffer.new(name: source.path, content: content)
+        buffer = RBS::Buffer.new(name: source.path, content: content)
         new(buffer: buffer, context: context, range: range || 0..buffer.content.size)
       end
 

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.32.0"
+  VERSION = "0.33.0"
 end

data/smoke/regression/fun.rb

@@ -0,0 +1,8 @@
+class Fun
+  def foo(v)
+    !v.nil? && foo2(v)
+  end
+
+  def foo2(_)
+  end
+end

data/smoke/regression/fun.rbs

@@ -0,0 +1,4 @@
+class Fun
+  def foo: (Integer?) -> void
+  def foo2: (Integer) -> void
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -140,9 +140,7 @@ files:
 - lib/steep/annotation_parser.rb
 - lib/steep/ast/annotation.rb
 - lib/steep/ast/annotation/collection.rb
-- lib/steep/ast/buffer.rb
 - lib/steep/ast/builtin.rb
-- lib/steep/ast/location.rb
 - lib/steep/ast/type_params.rb
 - lib/steep/ast/types.rb
 - lib/steep/ast/types/any.rb
@@ -331,6 +329,8 @@ files:
 - smoke/regexp/b.rb
 - smoke/regression/Steepfile
 - smoke/regression/array.rb
+- smoke/regression/fun.rb
+- smoke/regression/fun.rbs
 - smoke/regression/hash.rb
 - smoke/regression/poly_new.rb
 - smoke/regression/poly_new.rbs
@@ -363,7 +363,7 @@ metadata:
   homepage_uri: https://github.com/soutaro/steep
   source_code_uri: https://github.com/soutaro/steep
   changelog_uri: https://github.com/soutaro/steep/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -378,8 +378,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Gradual Typing for Ruby
 test_files: []

data/lib/steep/ast/buffer.rb

@@ -1,51 +0,0 @@
-module Steep
-  module AST
-    class Buffer
-      attr_reader :name
-      attr_reader :content
-      attr_reader :lines
-      attr_reader :ranges
-
-      def initialize(name:, content:)
-        @name = name
-        @content = content
-
-        @lines = content.split(/\n/, -1)
-
-        @ranges = []
-        offset = 0
-        lines.each.with_index do |line, index|
-          if index == lines.size - 1
-            ranges << (offset..offset)
-          else
-            size = line.size
-            range = offset..(offset+size)
-            ranges << range
-            offset += size+1
-          end
-        end
-      end
-
-      def pos_to_loc(pos)
-        index = ranges.bsearch_index do |range|
-          pos <= range.end
-        end
-
-        if index
-          [index + 1, pos - ranges[index].begin]
-        else
-          [1, pos]
-        end
-      end
-
-      def loc_to_pos(loc)
-        line, column = loc
-        ranges[line - 1].begin + column
-      end
-
-      def source(range)
-        content[range]
-      end
-    end
-  end
-end

data/lib/steep/ast/location.rb

@@ -1,86 +0,0 @@
-module Steep
-  module AST
-    class Location
-      attr_reader :buffer
-      attr_reader :start_pos
-      attr_reader :end_pos
-
-      def initialize(buffer:, start_pos:, end_pos:)
-        @buffer = buffer
-        @start_pos = start_pos
-        @end_pos = end_pos
-      end
-
-      def inspect
-        "#<#{self.class}:#{self.__id__} @buffer=#{buffer.name}, @start_pos=#{start_pos}, @end_pos=#{end_pos}, source='#{source.lines.first}', start_line=#{start_line}, start_column=#{start_column}>"
-      end
-
-      def name
-        buffer.name
-      end
-
-      def start_line
-        start_loc[0]
-      end
-
-      def start_column
-        start_loc[1]
-      end
-
-      def end_line
-        end_loc[0]
-      end
-
-      def end_column
-        end_loc[1]
-      end
-
-      def start_loc
-        @start_loc ||= buffer.pos_to_loc(start_pos)
-      end
-
-      def end_loc
-        @end_loc ||= buffer.pos_to_loc(end_pos)
-      end
-
-      def source
-        @source ||= buffer.source(start_pos...end_pos)
-      end
-
-      def to_s
-        "#{start_line}:#{start_column}...#{end_line}:#{end_column}"
-      end
-
-      def ==(other)
-        other.is_a?(Location) &&
-          other.buffer == buffer &&
-          other.start_pos == start_pos &&
-          other.end_pos == end_pos
-      end
-
-      def +(other)
-        if other
-          raise "Invalid concat: buffer=#{buffer.name}, other.buffer=#{other.buffer.name}" unless other.buffer == buffer
-
-          self.class.new(buffer: buffer,
-                         start_pos: start_pos,
-                         end_pos: other.end_pos)
-        else
-          self
-        end
-      end
-
-      def self.concat(*locations)
-        locations.inject {|l1, l2|
-          l1 + l2
-        }
-      end
-
-      def pred?(loc)
-        loc.is_a?(Location) &&
-          loc.name == name &&
-          loc.start_pos == end_pos
-      end
-    end
-  end
-end