solargraph 0.33.0 → 0.33.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 158c70ae0a463e58b036390de759450ff08ef9021338fac799b572c2ca31c705
-  data.tar.gz: 5ff363662d8bca00cd0e66dc34845532d9d19e9812d5a04c6f9c8c18319ee609
+  metadata.gz: 2c8b3e2034dbbcdaafda5c6f9183261078f9f91902ef1c0fd6b8381de923119d
+  data.tar.gz: 520d5c332a8f6077b8aabefbf5ffa27a40c2d6472dd82e512cd84bccd739944f
 SHA512:
-  metadata.gz: dddd44984f04c8307e590cd96344dad5bf25e5765ca0a03d8de03028820ca7e58abc248d5dd9430ee9e6841de491f5a46a68a63f6b4db8b0508347fa2b3fd7b2
-  data.tar.gz: 9e394ad6f0558f8c194dd8efb667c58a3bc512ff65f98b11342e07270ed96f854a50904740b01bd23d0a4c31d4f944a82a8369a65802b1857425ea881a4d0058
+  metadata.gz: f967c5c5ae37b8c10417b953af1f663c3b6576602519990f32c5f43864d7318b86c5af14e0eabad85b6eba55147a722b7d4a178aab043e8ef8792c04aee77881
+  data.tar.gz: f6d7d2a0563226bfde47f077a0ac856bbc9fb24271c4bcd723a55901ca85cc547e9ce2fa4a128042d1d4f37346078aeb29d6c7fe92a3db1b0f7c7cf7d4faa6f7

data/lib/solargraph/api_map.rb

@@ -33,6 +33,7 @@ module Solargraph
         @cache.clear
         @store = Store.new(pins + YardMap.new.pins)
         @unresolved_requires = []
+        workspace_filenames.clear
       }
       self
     end
@@ -112,6 +113,8 @@ module Solargraph
         @source_map_hash = new_map_hash
         @store = new_store
         @unresolved_requires = yard_map.unresolved_requires
+        workspace_filenames.clear
+        workspace_filenames.concat bundle.workspace.filenames
       }
       self
     end
@@ -463,6 +466,10 @@ module Solargraph
       source_map_hash.keys.include?(filename)
     end
 
+    def workspaced? filename
+      workspace_filenames.include?(filename)
+    end
+
     # @param location [Location]
     def require_reference_at location
       map = source_map(location.filename)
@@ -493,6 +500,10 @@ module Solargraph
 
     private
 
+    def workspace_filenames
+      @workspace_filenames ||= []
+    end
+
     # @return [YardMap]
     def yard_map
       @yard_map ||= YardMap.new

data/lib/solargraph/diagnostics/type_check.rb

@@ -5,6 +5,7 @@ module Solargraph
     #
     class TypeCheck < Base
       def diagnose source, api_map
+        return [] unless args.include?('always') || api_map.workspaced?(source.filename)
         severity = (args.include?('strict') ? Diagnostics::Severities::ERROR : Diagnostics::Severities::WARNING)
         checker = Solargraph::TypeChecker.new(source.filename, api_map: api_map)
         result = checker.return_type_problems + checker.param_type_problems

data/lib/solargraph/pin/attribute.rb

@@ -4,6 +4,7 @@ module Solargraph
       # @return [::Symbol] :reader or :writer
       attr_reader :access
 
+      # @param access [::Symbol] :reader or :writer
       def initialize access: :reader, **splat
         super(splat)
         @access = access

data/lib/solargraph/pin/method.rb

@@ -1,3 +1,5 @@
+require 'htmlentities'
+
 module Solargraph
   module Pin
     class Method < BaseMethod
@@ -9,6 +11,8 @@ module Solargraph
       # @return [Parser::AST::Node]
       attr_reader :node
 
+      # @param args [Array<String>]
+      # @param node [Parser::AST::Node, nil]
       def initialize args: [], node: nil, **splat
         super(splat)
         @parameters = args

data/lib/solargraph/source/chain.rb

@@ -16,6 +16,7 @@ module Solargraph
       autoload :GlobalVariable,   'solargraph/source/chain/global_variable'
       autoload :Literal,          'solargraph/source/chain/literal'
       autoload :Head,             'solargraph/source/chain/head'
+      autoload :Or,               'solargraph/source/chain/or'
 
       @@inference_depth = 0
 
@@ -73,11 +74,14 @@ module Solargraph
         links.last.is_a?(Chain::Literal)
       end
 
-      # @return [Boolean]
       def undefined?
         links.any?(&:undefined?)
       end
 
+      def defined?
+        !undefined?
+      end
+
       # @return [Boolean]
       def constant?
         links.last.is_a?(Chain::Constant)

data/lib/solargraph/source/chain/or.rb

@@ -0,0 +1,21 @@
+module Solargraph
+  class Source
+    class Chain
+      class Or < Link
+        def word
+          '<or>'
+        end
+
+        # @param type [String]
+        def initialize links
+          @links = links
+        end
+
+        def resolve api_map, name_pin, locals
+          types = @links.map { |link| link.infer(api_map, name_pin, locals) }
+          [Solargraph::Pin::ProxyType.anonymous(Solargraph::ComplexType.try_parse(types.map(&:tag).uniq.join(', ')))]
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/source/node_chainer.rb

@@ -83,6 +83,12 @@ module Solargraph
         elsif [:class, :module, :def, :defs].include?(n.type)
           # @todo Undefined or what?
           result.push Chain::UNDEFINED_CALL
+        elsif n.type == :and
+          result.concat generate_links(n.children.last)
+        elsif n.type == :or
+          result.push Chain::Or.new([NodeChainer.chain(n.children[0], @filename), NodeChainer.chain(n.children[1], @filename)])
+        elsif [:begin, :kwbegin].include?(n.type)
+          result.concat generate_links(n.children[0])
         else
           lit = infer_literal_node_type(n)
           result.push (lit ? Chain::Literal.new(lit) : Chain::Link.new)

data/lib/solargraph/source_map/mapper.rb

@@ -30,6 +30,9 @@ module Solargraph
         [[], []]
       end
 
+      # @param filename [String]
+      # @param code [String]
+      # @return [Array]
       def unmap filename, code
         s = Position.new(0, 0)
         e = Position.from_offset(code, code.length)
@@ -59,7 +62,15 @@ module Solargraph
         return unless comment =~ MACRO_REGEXP
         cmnt = remove_inline_comment_hashes(comment)
         parse = Solargraph::Source.parse_docstring(cmnt)
-        parse.directives.each { |d| process_directive(source_position, comment_position, d) }
+        last_line = 0
+        # @param d [YARD::Tags::Directive]
+        parse.directives.each do |d|
+          line_num = cmnt.lines[last_line..-1].find_index { |l| l.include?("@!#{d.tag.tag_name}") }
+          line_num += last_line
+          pos = Solargraph::Position.new(comment_position.line + line_num, comment_position.column)
+          process_directive(source_position, pos, d)
+          last_line = line_num + 1
+        end
       end
 
       # @param position [Position]
@@ -70,6 +81,9 @@ module Solargraph
         case directive.tag.tag_name
         when 'method'
           namespace = closure_at(source_position)
+          if namespace.location.range.start.line < comment_position.line
+            namespace = closure_at(comment_position)
+          end
           region = Region.new(source: @source, closure: namespace)
           src_node = Solargraph::Source.parse("def #{directive.tag.name};end", @filename, location.range.start.line)
           gen_pin = Solargraph::SourceMap::NodeProcessor.process(src_node, region).first.last
@@ -78,6 +92,7 @@ module Solargraph
           gen_pin.instance_variable_set(:@comments, docstring.all)
           @pins.push gen_pin
         when 'attribute'
+          return if directive.tag.name.nil?
           namespace = closure_at(source_position)
           t = (directive.tag.types.nil? || directive.tag.types.empty?) ? nil : directive.tag.types.flatten.join('')
           if t.nil? || t.include?('r')

data/lib/solargraph/type_checker.rb

@@ -45,8 +45,7 @@ module Solargraph
         pdefs = ParamDef.from(par.closure)
         if type.undefined?
           if par.return_type.undefined? && !pdefs.any? { |pd| pd.name == par.name && [:restarg, :kwrestarg].include?(pd.type) }
-            result.push Problem.new(
-              par.location, "#{par.closure.name} has undefined @param type for #{par.name}")
+            result.push Problem.new(par.location, "#{par.closure.name} has undefined @param type for #{par.name}")
           elsif !pdefs.any? { |pd| [:restarg, :kwrestarg].include?(pd.type) }
             result.push Problem.new(par.location, "#{par.closure.name} has unresolved @param type for #{par.name}")
           end
@@ -96,7 +95,7 @@ module Solargraph
       if tagged.undefined?
         if pin.return_type.undefined?
           probed = pin.probe(api_map)
-          return [Problem.new(pin.location, "#{pin.name} has undefined @return type", probed.to_s)]
+          return [Problem.new(pin.location, "#{pin.name} has undefined @return type", pin: pin, suggestion: probed.to_s)]
         else
           return [Problem.new(pin.location, "#{pin.name} has unresolved @return type #{pin.return_type}")]
         end
@@ -143,11 +142,14 @@ module Solargraph
           end
         end
         return [] if all
-        return [Problem.new(pin.location, "@return type `#{tagged.to_s}` does not match inferred type `#{probed.to_s}`", probed.to_s)]
+        return [Problem.new(pin.location, "@return type `#{tagged.to_s}` does not match inferred type `#{probed.to_s}`", pin: pin, suggestion: probed.to_s)]
       end
       []
     end
 
+    # @param node [Parser::AST::Node]
+    # @param skip_send [Boolean]
+    # @return [Array<Problem>]
     def check_send_args node, skip_send = false
       result = []
       if node.type == :send
@@ -231,6 +233,8 @@ module Solargraph
       result
     end
 
+    # @param pin [Pin::Base]
+    # @return [Hash]
     def param_tags_from pin
       # @todo Look for see references
       #   and dig through all the pins

data/lib/solargraph/type_checker/problem.rb

@@ -9,15 +9,20 @@ module Solargraph
       # @return [String]
       attr_reader :message
 
+      # @return [Pin::Base]
+      attr_reader :pin
+
       # @return [String, nil]
       attr_reader :suggestion
 
       # @param location [Solargraph::Location]
       # @param message [String]
+      # @param pin [Solargraph::Pin::Base, nil]
       # @param suggestion [String, nil]
-      def initialize location, message, suggestion = nil
+      def initialize location, message, pin: nil, suggestion: nil
         @location = location
         @message = message
+        @pin = pin
         @suggestion = suggestion
       end
     end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.33.0'
+  VERSION = '0.33.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.33.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -383,6 +383,7 @@ files:
 - lib/solargraph/source/chain/instance_variable.rb
 - lib/solargraph/source/chain/link.rb
 - lib/solargraph/source/chain/literal.rb
+- lib/solargraph/source/chain/or.rb
 - lib/solargraph/source/chain/variable.rb
 - lib/solargraph/source/change.rb
 - lib/solargraph/source/cursor.rb