solargraph 0.40.1 → 0.40.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e02cce6c25457bb0284d221d1a9bef97730b7d7be18129cdee0dcfa1aae9c02b
-  data.tar.gz: 5143879ae0f89fd7ca608646cfe96fccc1e6c15afd7940fc7948dff358f286f3
+  metadata.gz: eff7d664014ae6d25990957afb4328baafe88ff76ef892db8b3d50791860845e
+  data.tar.gz: 8038c884a63ce269f1a0faaf635e4c295fadd61c456ba2665c84a17b4f03a031
 SHA512:
-  metadata.gz: 7c868fd6c6bb344f532eeee02ef06f9b80df086b51a49e408f5c04961303524f36d6b27cfae37b200a92bf0b65e15a3e68be029aad66bf912dd1aa73b1f48714
-  data.tar.gz: 6a9cbcd839ab51d1c71d83a30a73464f337faffda715059e91de57a3519783793574901f23d738c83a49d1116d41268c4992fa304c08d8892e394e12bb5011c8
+  metadata.gz: a7b95e2ba342b191642a1d5ea228243a60b9211f6c05cab2acf09ddcaab3efb25cef488ca910964e0ac1c32edacc2f0ced4eef09fa819b03d2919af4ac734ca7
+  data.tar.gz: 6990c07591d43fdb583484c00fc5221d228850fa75e12b5cd2632413a21c1984f634ce2655371d9be7016a035e23fe622469418779bf3285f03a087a38c394ae

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.40.4 - March 3, 2021
+- Fix optarg and blockarg ordering
+- Override specialization for #initialize
+- Find definitions with cursor after double colon
+
+## 0.40.3 - February 7, 2021
+- Simplify and allow to configure rubocop formatter (#403)
+- Type checker shows tag in param type errors (#398)
+- Handle bare private_constant (#408)
+- Type checker handles splatted variables (#396)
+
+## 0.40.2 - January 18, 2021
+- Type checker ignores splatted calls in arity (#396)
+- Allow Parser 3.0 (#400)
+
 ## 0.40.1 - December 28, 2020
 - Use temp directory for RuboCop formatting (#397)
 - NodeMethods reads splatted hashes (#396)

data/lib/solargraph/api_map/store.rb

@@ -238,11 +238,16 @@ module Solargraph
         pins_by_class(Pin::Reference::Override).each do |ovr|
           pin = get_path_pins(ovr.name).first
           next if pin.nil?
+          new_pin = if pin.path.end_with?('#initialize')
+            get_path_pins(pin.path.sub(/#initialize/, '.new')).first
+          end
           (ovr.tags.map(&:tag_name) + ovr.delete).uniq.each do |tag|
             pin.docstring.delete_tags tag.to_sym
+            new_pin.docstring.delete_tags tag.to_sym if new_pin
           end
           ovr.tags.each do |tag|
             pin.docstring.add_tag(tag)
+            new_pin.docstring.add_tag(tag) if new_pin
           end
         end
       end

data/lib/solargraph/diagnostics/rubocop_helpers.rb

@@ -13,32 +13,13 @@ module Solargraph
       # @param code [String]
       # @return [Array(Array<String>, Array<String>)]
       def generate_options filename, code
-        args = ['-f', 'j']
-        rubocop_file = find_rubocop_file(filename)
-        args.push('-c', fix_drive_letter(rubocop_file)) unless rubocop_file.nil?
-        args.push filename
+        args = ['-f', 'j', filename]
         base_options = RuboCop::Options.new
         options, paths = base_options.parse(args)
         options[:stdin] = code
         [options, paths]
       end
 
-      # Find a RuboCop configuration file in a file's directory tree.
-      #
-      # @param filename [String]
-      # @return [String, nil]
-      def find_rubocop_file filename
-        return nil unless File.exist?(filename)
-        filename = File.realpath(filename)
-        dir = File.dirname(filename)
-        until File.dirname(dir) == dir
-          here = File.join(dir, '.rubocop.yml')
-          return here if File.exist?(here)
-          dir = File.dirname(dir)
-        end
-        nil
-      end
-
       # RuboCop internally uses capitalized drive letters for Windows paths,
       # so we need to convert the paths provided to the command.
       #

data/lib/solargraph/language_server/host.rb

@@ -494,6 +494,11 @@ module Solargraph
         library.read_text(filename)
       end
 
+      def formatter_config uri
+        library = library_for(uri)
+        library.workspace.config.formatter
+      end
+
       # @param uri [String]
       # @param line [Integer]
       # @param column [Integer]

data/lib/solargraph/language_server/message/text_document/formatting.rb

@@ -11,29 +11,58 @@ module Solargraph
         class Formatting < Base
           include Solargraph::Diagnostics::RubocopHelpers
 
+          class BlankRubocopFormatter < ::RuboCop::Formatter::BaseFormatter; end
+
           def process
-            filename = uri_to_file(params['textDocument']['uri'])
-            Dir.mktmpdir do |tempdir|
-              tempfile = File.join(tempdir, File.basename(filename))
-              rubocop_file = Diagnostics::RubocopHelpers.find_rubocop_file(filename)
-              original = host.read_text(params['textDocument']['uri'])
-              File.write tempfile, original
-              begin
-                args = ['-a', '-f', 'fi', tempfile]
-                args.unshift('-c', fix_drive_letter(rubocop_file)) unless rubocop_file.nil?
-                options, paths = RuboCop::Options.new.parse(args)
-                store = RuboCop::ConfigStore.new
-                redirect_stdout { RuboCop::Runner.new(options, store).run(paths) }
-                result = File.read(tempfile)
-                format original, result
-              rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e
-                set_error(Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}")
-              end
+            file_uri = params['textDocument']['uri']
+            config = config_for(file_uri)
+            original = host.read_text(file_uri)
+            args = cli_args(file_uri, config)
+
+            options, paths = RuboCop::Options.new.parse(args)
+            options[:stdin] = original
+            redirect_stdout do
+              RuboCop::Runner.new(options, RuboCop::ConfigStore.new).run(paths)
             end
+            result = options[:stdin]
+
+            format original, result
+          rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e
+            set_error(Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}")
           end
 
           private
 
+          def config_for(file_uri)
+            conf = host.formatter_config(file_uri)
+            return {} unless conf.is_a?(Hash)
+
+            conf['rubocop'] || {}
+          end
+
+          def cli_args file, config
+            args = [
+              config['cops'] == 'all' ? '--auto-correct-all' : '--auto-correct',
+              '--cache', 'false',
+              '--format', 'Solargraph::LanguageServer::Message::' \
+                          'TextDocument::Formatting::BlankRubocopFormatter',
+            ]
+
+            ['except', 'only'].each do |arg|
+              cops = cop_list(config[arg])
+              args += ["--#{arg}", cops] if cops
+            end
+
+            args += config['extra_args'] if config['extra_args']
+            args + [file]
+          end
+
+          def cop_list(value)
+            value = value.join(',') if value.respond_to?(:join)
+            return nil if value == '' || !value.is_a?(String)
+            value
+          end
+
           # @param original [String]
           # @param result [String]
           # @return [void]

data/lib/solargraph/parser/legacy/node_methods.rb

@@ -123,6 +123,10 @@ module Solargraph
           Parser.is_ast_node?(node.children[0]) && node.children[0].type == :kwsplat
         end
 
+        def splatted_call? node
+          Parser.is_ast_node?(node.children[0]) && node.children[0].type == :kwsplat && node.children[0].children[0].type != :hash
+        end
+
         # @todo Temporarily here for testing. Move to Solargraph::Parser.
         def call_nodes_from node
           return [] unless node.is_a?(::Parser::AST::Node)

data/lib/solargraph/parser/rubyvm/node_methods.rb

@@ -106,11 +106,18 @@ module Solargraph
         end
 
         def splatted_hash? node
+          splatted_node?(node) && node.children[0].children[1].type == :HASH
+        end
+
+        def splatted_node? node
           node?(node.children[0]) &&
             [:ARRAY, :LIST].include?(node.children[0].type) &&
             node.children[0].children[0].nil? &&
-            node?(node.children[0].children[1]) &&
-            node.children[0].children[1].type == :HASH
+            node?(node.children[0].children[1])
+        end
+
+        def splatted_call? node
+          splatted_node?(node) && node.children[0].children[1].type != :HASH
         end
 
         def node? node

data/lib/solargraph/parser/rubyvm/node_processors/args_node.rb

@@ -55,19 +55,19 @@ module Solargraph
                 )
                 region.closure.parameters.push locals.last
               end
-              if node.children.last
-                locals.push Solargraph::Pin::Parameter.new(
-                  location: region.closure.location,
-                  closure: region.closure,
-                  comments: comments_for(node),
-                  name: node.children.last.to_s,
-                  presence: region.closure.location.range,
-                  decl: :blockarg
-                )
-                region.closure.parameters.push locals.last
-              end
             end
             process_children
+            if node.children.last
+              locals.push Solargraph::Pin::Parameter.new(
+                location: region.closure.location,
+                closure: region.closure,
+                comments: comments_for(node),
+                name: node.children.last.to_s,
+                presence: region.closure.location.range,
+                decl: :blockarg
+              )
+              region.closure.parameters.push locals.last
+            end
           end
 
           private

data/lib/solargraph/parser/rubyvm/node_processors/opt_arg_node.rb

@@ -16,12 +16,7 @@ module Solargraph
               presence: region.closure.location.range,
               decl: :optarg
             )
-            idx = region.closure.parameters.find_index { |par| par.decl != :arg }
-            if idx
-              region.closure.parameters.insert idx, locals.last
-            else
-              region.closure.parameters.push locals.last
-            end
+            region.closure.parameters.push locals.last
             node.children[1] && NodeProcessor.process(node.children[1], region, pins, locals)
           end
         end

data/lib/solargraph/parser/rubyvm/node_processors/send_node.rb

@@ -226,7 +226,7 @@ module Solargraph
 
           # @return [void]
           def process_private_constant
-            # @todo Bare `private_constant` causes an error
+            return unless Parser.is_ast_node?(node.children.last)
             node.children.last.children[0..-2].each do |child|
               if [:LIT, :STR].include?(child.type)
                 cn = child.children[0].to_s

data/lib/solargraph/source.rb

@@ -175,7 +175,7 @@ module Solargraph
       synced
     end
 
-    # @param position [Position]
+    # @param position [Position, Array(Integer, Integer)]
     # @return [Source::Cursor]
     def cursor_at position
       Cursor.new(self, position)

data/lib/solargraph/source/source_chainer.rb

@@ -64,7 +64,7 @@ module Solargraph
           elsif end_of_phrase.strip == '::'
             chain.links.push Chain::UNDEFINED_CONSTANT
           end
-        elsif chain.links.last.is_a?(Source::Chain::Constant) && end_of_phrase.strip == '::'
+        elsif chain.links.last.is_a?(Source::Chain::Constant) && end_of_phrase.strip == '::' && !source.code[Position.to_offset(source.code, position)].match?(/[a-z]/i)
           chain.links.push Source::Chain::UNDEFINED_CONSTANT
         end
         chain

data/lib/solargraph/type_checker.rb

@@ -95,7 +95,7 @@ module Solargraph
           result.push Problem.new(pin.location, "Untyped method #{pin.path} could not be inferred")
         end
       elsif rules.validate_tags?
-        unless pin.node.nil? || declared.void? || macro_pin?(pin) || abstract?(pin)
+        unless pin.node.nil? || declared.void? || virtual_pin?(pin) || abstract?(pin)
           inferred = pin.probe(api_map).self_to(pin.full_context.namespace)
           if inferred.undefined?
             unless rules.ignore_all_undefined? || external?(pin)
@@ -111,7 +111,7 @@ module Solargraph
       result
     end
 
-    def macro_pin? pin
+    def virtual_pin? pin
       pin.location && source_map.source.comment_at?(pin.location.range.ending)
     end
 
@@ -129,10 +129,10 @@ module Solargraph
           end
         end
       end
-      params.each_pair do |name, tag|
-        type = tag.qualify(api_map, pin.full_context.namespace)
+      params.each_pair do |name, data|
+        type = data[:qualified]
         if type.undefined?
-          result.push Problem.new(pin.location, "Unresolved type #{tag} for #{name} param on #{pin.path}", pin: pin)
+          result.push Problem.new(pin.location, "Unresolved type #{data[:tagged]} for #{name} param on #{pin.path}", pin: pin)
         end
       end
       result
@@ -266,12 +266,12 @@ module Solargraph
                 result.concat kwarg_problems_for argchain, api_map, block_pin, locals, location, pin, params, idx
                 break
               else
-                ptype = params[par.name]
+                ptype = params.key?(par.name) ? params[par.name][:qualified] : ComplexType::UNDEFINED
                 if ptype.nil?
                   # @todo Some level (strong, I guess) should require the param here
                 else
                   argtype = argchain.infer(api_map, block_pin, locals)
-                  if argtype.defined? && ptype && !any_types_match?(api_map, ptype, argtype)
+                  if argtype.defined? && ptype.defined? && !any_types_match?(api_map, ptype, argtype)
                     result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{par.name} expected #{ptype}, received #{argtype}")
                   end
                 end
@@ -299,19 +299,19 @@ module Solargraph
           result.concat kwrestarg_problems_for(api_map, block_pin, locals, location, pin, params, kwargs)
         else
           if argchain
-            ptype = params[par.name]
-            if ptype.nil?
+            data = params[par.name]
+            if data.nil?
               # @todo Some level (strong, I guess) should require the param here
             else
+              ptype = data[:qualified]
+              next if ptype.undefined?
               argtype = argchain.infer(api_map, block_pin, locals)
               if argtype.defined? && ptype && !any_types_match?(api_map, ptype, argtype)
                 result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{par.name} expected #{ptype}, received #{argtype}")
               end
             end
-          else
-            if par.decl == :kwarg
-              result.push Problem.new(location, "Call to #{pin.path} is missing keyword argument #{par.name}")
-            end
+          elsif par.decl == :kwarg
+            result.push Problem.new(location, "Call to #{pin.path} is missing keyword argument #{par.name}")
           end
         end
       end
@@ -321,31 +321,34 @@ module Solargraph
     def kwrestarg_problems_for(api_map, block_pin, locals, location, pin, params, kwargs)
       result = []
       kwargs.each_pair do |pname, argchain|
-        ptype = params[pname.to_s]
-        if ptype.nil?
-          # Probably nothing to do here. All of these args should be optional.
-        else
-          argtype = argchain.infer(api_map, block_pin, locals)
-          if argtype.defined? && ptype && !any_types_match?(api_map, ptype, argtype)
-            result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{pname} expected #{ptype}, received #{argtype}")
-          end
+        next unless params.key?(pname.to_s)
+        ptype = params[pname.to_s][:qualified]
+        argtype = argchain.infer(api_map, block_pin, locals)
+        if argtype.defined? && ptype && !any_types_match?(api_map, ptype, argtype)
+          result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{pname} expected #{ptype}, received #{argtype}")
         end
       end
       result
     end
 
+    # @param [Pin::Method]
+    # @return [Hash]
     def param_hash(pin)
       tags = pin.docstring.tags(:param)
       return {} if tags.empty?
       result = {}
       tags.each do |tag|
         next if tag.types.nil? || tag.types.empty?
-        result[tag.name.to_s] = Solargraph::ComplexType.try_parse(*tag.types).qualify(api_map, pin.full_context.namespace)
+        result[tag.name.to_s] = {
+          tagged: tag.types.join(', '),
+          qualified: Solargraph::ComplexType.try_parse(*tag.types).qualify(api_map, pin.full_context.namespace)
+        }
       end
       result
     end
 
     # @param [Array<Pin::Method>]
+    # @return [Hash]
     def first_param_hash(pins)
       pins.each do |pin|
         result = param_hash(pin)
@@ -413,24 +416,28 @@ module Solargraph
       end
       settled_kwargs = 0
       unless unchecked.empty?
-        kwargs = convert_hash(unchecked.last.node)
-        if pin.parameters.any? { |param| [:kwarg, :kwoptarg].include?(param.decl) || param.kwrestarg? }
-          if kwargs.empty?
-            add_params += 1
-          else
-            unchecked.pop
-            pin.parameters.each do |param|
-              next unless param.keyword?
-              if kwargs.key?(param.name.to_sym)
-                kwargs.delete param.name.to_sym
-                settled_kwargs += 1
-              elsif param.decl == :kwarg
-                return [Problem.new(location, "Missing keyword argument #{param.name} to #{pin.path}")]
+        if Parser.is_ast_node?(unchecked.last.node) && splatted_call?(unchecked.last.node)
+          settled_kwargs = pin.parameters.count(&:keyword?)
+        else
+          kwargs = convert_hash(unchecked.last.node)
+          if pin.parameters.any? { |param| [:kwarg, :kwoptarg].include?(param.decl) || param.kwrestarg? }
+            if kwargs.empty?
+              add_params += 1
+            else
+              unchecked.pop
+              pin.parameters.each do |param|
+                next unless param.keyword?
+                if kwargs.key?(param.name.to_sym)
+                  kwargs.delete param.name.to_sym
+                  settled_kwargs += 1
+                elsif param.decl == :kwarg
+                  return [Problem.new(location, "Missing keyword argument #{param.name} to #{pin.path}")]
+                end
+              end
+              kwargs.clear if pin.parameters.any?(&:kwrestarg?)
+              unless kwargs.empty?
+                return [Problem.new(location, "Unrecognized keyword argument #{kwargs.keys.first} to #{pin.path}")]
               end
-            end
-            kwargs.clear if pin.parameters.any?(&:kwrestarg?)
-            unless kwargs.empty?
-              return [Problem.new(location, "Unrecognized keyword argument #{kwargs.keys.first} to #{pin.path}")]
             end
           end
         end
@@ -443,6 +450,9 @@ module Solargraph
         if unchecked.length == req + opt + 1 && unchecked.last.links.last.is_a?(Source::Chain::BlockVariable)
           return []
         end
+        if req + add_params + 1 == unchecked.length && splatted_call?(unchecked.last.node) && (pin.parameters.map(&:decl) & [:kwarg, :kwoptarg, :kwrestarg]).any?
+          return []
+        end
         return [Problem.new(location, "Too many arguments to #{pin.path}")]
       elsif unchecked.length < req - settled_kwargs && (arguments.empty? || !arguments.last.splat?)
         return [Problem.new(location, "Not enough arguments to #{pin.path}")]

data/lib/solargraph/type_checker/checks.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
 module Solargraph
   class TypeChecker
+    # Helper methods for performing type checks
+    #
     module Checks
       module_function
 
@@ -62,7 +66,7 @@ module Solargraph
       # @param inferred [ComplexType]
       # @return [Boolean]
       def duck_types_match? api_map, expected, inferred
-        raise ArgumentError, "Expected type must be duck type" unless expected.duck_type?
+        raise ArgumentError, 'Expected type must be duck type' unless expected.duck_type?
         expected.each do |exp|
           next unless exp.duck_type?
           quack = exp.to_s[1..-1]

data/lib/solargraph/type_checker/rules.rb

@@ -1,12 +1,16 @@
+# frozen_string_literal: true
+
 module Solargraph
   class TypeChecker
+    # Definitions of type checking rules to be performed at various levels
+    #
     class Rules
       LEVELS = {
         normal: 0,
         typed: 1,
         strict: 2,
         strong: 3
-      }
+      }.freeze
 
       # @return [Symbol]
       attr_reader :level

data/lib/solargraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.40.1'
+  VERSION = '0.40.4'
 end

data/lib/solargraph/workspace/config.rb

@@ -85,6 +85,13 @@ module Solargraph
         raw_data['reporters']
       end
 
+      # A hash of options supported by the formatter
+      #
+      # @return [Hash]
+      def formatter
+        raw_data['formatter']
+      end
+
       # An array of plugins to require.
       #
       # @return [Array<String>]
@@ -144,6 +151,14 @@ module Solargraph
           'require' => [],
           'domains' => [],
           'reporters' => %w[rubocop require_not_found],
+          'formatter' => {
+            'rubocop' => {
+              'cops' => 'safe',
+              'except' => [],
+              'only' => [],
+              'extra_args' =>[]
+            }
+          },
           'require_paths' => [],
           'plugins' => [],
           'max_files' => MAX_FILES

data/solargraph.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'jaro_winkler', '~> 1.5'
   s.add_runtime_dependency 'kramdown', '~> 2.3'
   s.add_runtime_dependency 'kramdown-parser-gfm', '~> 1.1'
-  s.add_runtime_dependency 'parser', '~> 2.3'
+  s.add_runtime_dependency 'parser', '~> 3.0'
   s.add_runtime_dependency 'reverse_markdown', '>= 1.0.5', '< 3'
   s.add_runtime_dependency 'rubocop', '>= 0.52'
   s.add_runtime_dependency 'thor', '~> 1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.40.1
+  version: 0.40.4
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement