steep 0.51.0 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 502d495f9b623c5d90a041a1e0bb7854be76251a8ac0f3567c1c91911eb641ee
-  data.tar.gz: 7845d6d26f38ceae87407d507f3f67b8d35bae18ecdd5f4ee9fdb841d434a4ad
+  metadata.gz: f6846cc048d7515ef655b81cf7f399e5852a96c390d90c7f859c07cc6a5c0f94
+  data.tar.gz: fecb8b0b0be4e338f3ccf0375064f39167693c0b25b68e3b4ea2f103f117260f
 SHA512:
-  metadata.gz: e2e61987da5ef5d78381affeb2f4fbb8b84dd2a6fede0baa60c68f54a3464e3cb7eea0e2822f22a66d62f1de3b9f8b223cd6399dceb927397a3dab0bed3fea5d
-  data.tar.gz: ee91ba6b1a4d8f35ec1fbc157efd2fb54f27b11e398af09a7ef3d4f403ae0ae2fab3258404316c6ded646f688b61ff38b47a514fec83cd9fe1b4fcf136fdc441
+  metadata.gz: 9c08fa692eda8915ef4ce4fe725aecb2a9823c2da188900a3811fdf1d02c6b0369dae8755aed83fe9cc80a376c3309df29efcf849681cd2a9a249559ff6c3ae2
+  data.tar.gz: 77953f34eb6ab001dfee4f03e0ec1250f1128fedae9e5b427e0037b97b6b809c5bb8ae4c94d9d93f3af3a702de7dd33a182399fe2b7a81ba8ac0d2708c422579

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 0.52.0 (2022-04-05)
+
+* Add `steep binstub` command ([\#527](https://github.com/soutaro/steep/pull/527))
+* Let hover and completion work in heredoc ([\#528](https://github.com/soutaro/steep/pull/528))
+* Better constant typing ([\#529](https://github.com/soutaro/steep/pull/529))
+
 ## 0.51.0 (2022-04-01)
 
 * Completion for constant ([\#524](https://github.com/soutaro/steep/pull/524))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    steep (0.51.0)
+    steep (0.52.0)
       activesupport (>= 5.1)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
@@ -51,7 +51,7 @@ GEM
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.3.0)
+    rbs (2.3.1)
     stackprof (0.2.19)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

data/lib/steep/cli.rb

@@ -18,7 +18,7 @@ module Steep
     end
 
     def self.available_commands
-      [:init, :check, :validate, :annotations, :version, :project, :watch, :langserver, :stats]
+      [:init, :check, :validate, :annotations, :version, :project, :watch, :langserver, :stats, :binstub]
     end
 
     def process_global_options
@@ -208,6 +208,75 @@ module Steep
       end.run
     end
 
+    def process_binstub
+      path = Pathname("bin/steep")
+      force = false
+
+      OptionParser.new do |opts|
+        opts.banner = <<BANNER
+Usage: steep binstub [options]
+
+Generate a binstub to execute Steep with setting up Bundler and rbenv/rvm.
+Use the executable for LSP integration setup.
+
+Options:
+BANNER
+        handle_logging_options opts
+
+        opts.on("-o PATH", "--output=PATH", "The path of the executable file (defaults to `bin/steep`)") do |v|
+          path = Pathname(v)
+        end
+
+        opts.on("--[no-]force", "Overwrite file (defaults to false)") do
+          force = true
+        end
+      end.parse!(argv)
+
+      path.parent.mkpath
+
+      gemfile_path =
+        if defined?(Bundler)
+          Bundler.default_gemfile.relative_path_from(Pathname.pwd + path.parent)
+        else
+          Pathname("../Gemfile")
+        end
+
+      if path.file?
+        if force
+          stdout.puts Rainbow("#{path} already exists. Overwriting...").yellow
+        else
+          stdout.puts Rainbow(''"⚠️ #{path} already exists. Bye! 👋").red
+          return 0
+        end
+      end
+
+      template = <<TEMPLATE
+#!/usr/bin/env bash
+
+BINSTUB_DIR=$(cd $(dirname $0); pwd)
+GEMFILE=${BINSTUB_DIR}/#{gemfile_path}
+
+STEEP="bundle exec --gemfile=${GEMFILE} steep"
+
+if type "rbenv" > /dev/null 2>&1; then
+  STEEP="rbenv exec ${STEEP}"
+else
+  if type "rvm" > /dev/null 2>&1; then
+    STEEP="rvm ${REPO_ROOT} do ${STEEP}"
+  fi
+fi
+
+exec $STEEP $@
+TEMPLATE
+
+      path.write(template)
+      path.chmod(0755)
+
+      stdout.puts Rainbow("Successfully generated executable #{path} 🎉").blue
+
+      0
+    end
+
     def process_version
       stdout.puts Steep::VERSION
       0

data/lib/steep/source.rb

@@ -301,13 +301,42 @@ module Steep
       end
     end
 
-    def find_nodes(line:, column:, node: self.node, position: nil, parents: [])
-      return [] unless node
+    def each_heredoc_node(node = self.node, parents = [], &block)
+      if block
+        case node.type
+        when :dstr, :str
+          if node.location.is_a?(Parser::Source::Map::Heredoc)
+            yield [node, *parents]
+          end
+        end
 
-      position ||= (line-1).times.sum do |i|
-        node.location.expression.source_buffer.source_line(i+1).size + 1
-      end + column
+        parents.unshift(node)
+        Source.each_child_node(node) do |child|
+          each_heredoc_node(child, parents, &block)
+        end
+        parents.shift()
+      else
+        enum_for :each_heredoc_node, node
+      end
+    end
 
+    def find_heredoc_nodes(line, column, position)
+      each_heredoc_node() do |nodes|
+        node = nodes[0]
+
+        range = node.location.heredoc_body&.yield_self do |r|
+          r.begin_pos..r.end_pos
+        end
+
+        if range && (range === position)
+          return nodes
+        end
+      end
+
+      nil
+    end
+
+    def find_nodes_loc(node, position, parents)
       range = node.location.expression&.yield_self do |r|
         r.begin_pos..r.end_pos
       end
@@ -317,7 +346,7 @@ module Steep
           parents.unshift node
 
           Source.each_child_node(node) do |child|
-            ns = find_nodes(line: line, column: column, node: child, position: position, parents: parents) and return ns
+            ns = find_nodes_loc(child, position, parents) and return ns
           end
 
           parents
@@ -325,6 +354,24 @@ module Steep
       end
     end
 
+    def find_nodes(line:, column:)
+      return [] unless node
+
+      position = (line-1).times.sum do |i|
+        node.location.expression.source_buffer.source_line(i+1).size + 1
+      end + column
+
+      if nodes = find_heredoc_nodes(line, column, position)
+        Source.each_child_node(nodes[0]) do |child|
+          find_nodes_loc(child, position, nodes) and break
+        end
+
+        nodes
+      else
+        find_nodes_loc(node, position, [])
+      end
+    end
+
     def self.delete_defs(node, allow_list)
       case node.type
       when :def

data/lib/steep/type_construction.rb

@@ -2731,6 +2731,14 @@ module Steep
 
               return [type, constr, name]
             end
+          when AST::Types::Any
+            # Couldn't detect the type of the parent constant
+            # Skip reporting error for this node.
+            if node
+              _, constr = add_typing(node, type: parent_type)
+            end
+
+            return [parent_type, constr, nil]
           end
         end
 
@@ -2744,6 +2752,10 @@ module Steep
           end
         end
 
+        if node
+          _, constr = add_typing(node, type: AST::Builtin.any_type)
+        end
+
         [AST::Builtin.any_type, constr, nil]
       end
     end

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.51.0"
+  VERSION = "0.52.0"
 end

data/smoke/diagnostics/test_expectations.yml

@@ -557,16 +557,6 @@
     severity: ERROR
     message: 'Cannot find the declaration of constant: `FOO`'
     code: Ruby::UnknownConstant
-  - range:
-      start:
-        line: 4
-        character: 7
-      end:
-        line: 4
-        character: 10
-    severity: ERROR
-    message: 'Cannot find the declaration of constant: `BAR`'
-    code: Ruby::UnknownConstant
   - range:
       start:
         line: 6

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.52.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser