solargraph 0.31.0 → 0.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e808b8b4e3550a64f5737991858a16cfb43c1d4d839fa0be4c7018d9740783f
-  data.tar.gz: 7a90449ea2b30e07234f89bfb468eaf0e33e28711799b15064a9ae9dbcf83bc3
+  metadata.gz: a170a254c51b9119d68f9542bb621eee41831b814e94d5f987eb2c7d78f412ba
+  data.tar.gz: 9beff1ee445b21b89dbbcee0d2a68bed60911940a8587a58c6c361aa0ca7ffad
 SHA512:
-  metadata.gz: d87b8b907a0c33376f138381ad1b70c8c49be1ce504aec7e098bcac84030f53c9c469ea87b3b0e2fdaebe04bc51cf0b338ac3074fa1064be47f87e60c82499c4
-  data.tar.gz: 5888e2114dfea0da7dd3681d800400f7393cb63804f8d4f043aac2f74b0bf9bce1f986f34ae9d85bcc9753e49f5c773ad7ec3791257fbe372f632f3deb81ee04
+  metadata.gz: 79d0c51c0b65bf9f10f816b3821aa463d4f767a6ef926a948574e7c33b6f24eb8be5eda8a93bb41ad8d8e56bd73800b57fcc1e79cf85cf05efcf5279bff34319
+  data.tar.gz: a6ddfcd658534c8f6c01d1b5f9ab25d13c9bc0abb2f437e783e6a89a280048d8886b8b105afc37f428ac25ecf403f9ad9e1a26dff5a7903c1eac28d04f10f953

data/lib/solargraph/language_server/host.rb

@@ -129,7 +129,7 @@ module Solargraph
       # @param uri [String] The file uri.
       # @return [void]
       def delete uri
-        sources.close uri
+        # sources.close uri # @todo It's possible for a deleted file to be open in an editor
         filename = uri_to_file(uri)
         libraries.each do |lib|
           # lib.delete filename
@@ -534,7 +534,10 @@ module Solargraph
       # @return [Array<Solargraph::Pin::Base>]
       def document_symbols uri
         library = library_for(uri)
-        library.document_symbols(uri_to_file(uri))
+        # At this level, document symbols should be unique; e.g., a
+        # module_function method should return the location for Module.method
+        # or Module#method, but not both.
+        library.document_symbols(uri_to_file(uri)).uniq(&:location)
       end
 
       # Send a notification to the client.

data/lib/solargraph/language_server/message/base.rb

@@ -73,6 +73,7 @@ module Solargraph
           response[:result] = nil if result.nil? and error.nil?
           json = response.to_json
           envelope = "Content-Length: #{json.bytesize}\r\n\r\n#{json}"
+          Solargraph.logger.debug envelope
           host.queue envelope
           host.clear id
         end

data/lib/solargraph/language_server/message/workspace/did_change_configuration.rb

@@ -3,6 +3,7 @@ require 'uri'
 module Solargraph::LanguageServer::Message::Workspace
   class DidChangeConfiguration < Solargraph::LanguageServer::Message::Base
     def process
+      return unless params['settings']
       update = params['settings']['solargraph']
       host.configure update
       register_from_options

data/lib/solargraph/language_server/transport/adapter.rb

@@ -1,11 +1,11 @@
+require 'backport'
+
 module Solargraph
   module LanguageServer
     module Transport
       # A common module for running language servers in Backport.
       #
       module Adapter
-        @@timer_is_running = false
-
         def opening
           @host = Solargraph::LanguageServer::Host.new
           @host.start

data/lib/solargraph/language_server/transport/data_reader.rb

@@ -52,7 +52,7 @@ module Solargraph
             msg = JSON.parse(@buffer)
             @message_handler.call msg unless @message_handler.nil?
           rescue JSON::ParserError => e
-            Solargraph::Logging.logger.info "Failed to parse request: #{e.message}"
+            Solargraph::Logging.logger.warn "Failed to parse request: #{e.message}"
             Solargraph::Logging.logger.debug "Buffer: #{@buffer}"
           ensure
             @buffer.clear

data/lib/solargraph/library.rb

@@ -207,7 +207,9 @@ module Solargraph
           found = source.references(pin.name)
           found.select! do |loc|
             referenced = definitions_at(loc.filename, loc.range.ending.line, loc.range.ending.character)
-            referenced.any?{|r| r == pin}
+            # HACK: The additional location comparison is necessary because
+            # Clip#define can return proxies for parameter pins
+            referenced.any?{|r| r == pin || r.location == pin.location}
           end
           # HACK: for language clients that exclude special characters from the start of variable names
           if strip && match = cursor.word.match(/^[^a-z0-9_]+/i)

data/lib/solargraph/source.rb

@@ -200,7 +200,8 @@ module Solargraph
     # @return [Boolean]
     def comment_at? position
       comment_ranges.each do |range|
-        return true if range.include?(position)
+        return true if range.include?(position) ||
+          (range.ending.line == position.line && range.ending.column < position.column)
         break if range.ending.line > position.line
       end
       false
@@ -257,7 +258,7 @@ module Solargraph
     end
 
     FOLDING_NODE_TYPES = %i[
-      class sclass module def defs if str dstr array while unless kwbegin hash
+      class sclass module def defs if str dstr array while unless kwbegin hash block
     ].freeze
 
     # Get an array of ranges that can be folded, e.g., the range of a class
@@ -334,9 +335,9 @@ module Solargraph
           num = cur if cur < num
         end
         # Include blank lines between comments
-        ctxt += ("\n" * (l.loc.first_line - last_line - 1)) unless last_line.nil?
+        ctxt += ("\n" * (l.loc.first_line - last_line - 1)) unless last_line.nil? || l.loc.first_line - last_line <= 0
         ctxt += "#{p[num..-1]}\n" if started
-        last_line = l.loc.last_line
+        last_line = l.loc.last_line if last_line.nil? || l.loc.last_line > last_line
       }
       ctxt
     end

data/lib/solargraph/source/source_chainer.rb

@@ -33,16 +33,14 @@ module Solargraph
         return Chain.new([Chain::Literal.new('Symbol')]) if phrase.start_with?(':') && !phrase.start_with?('::')
         begin
           return Chain.new([]) if phrase.end_with?('..')
-          if source.synchronized?
-            if !source.repaired? && source.parsed?
-              node = source.node_at(position.line, position.column)
-            else
-              node = nil
-              node = source.node_at(fixed_position.line, fixed_position.column) unless source.error_ranges.any?{|r| r.nil? || r.include?(fixed_position)}
-              node = Source.parse(fixed_phrase) if node.nil?
-            end
+          if !source.repaired? && source.parsed? && source.synchronized?
+            node = source.node_at(position.line, position.column)
           else
-            node = Source.parse(fixed_phrase)
+            node = nil
+            node = source.node_at(fixed_position.line, fixed_position.column) unless source.error_ranges.any?{|r| r.nil? || r.include?(fixed_position)}
+            # Exception for positions that chain literal nodes in unsynchronized sources
+            node = nil unless source.synchronized? || !infer_literal_node_type(node).nil?
+            node = Source.parse(fixed_phrase) if node.nil?
           end
         rescue Parser::SyntaxError
           return Chain.new([Chain::UNDEFINED_CALL])

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.31.0'
+  VERSION = '0.31.1'
 end

data/lib/solargraph/workspace/config.rb

@@ -45,7 +45,7 @@ module Solargraph
       #
       # @return [Array<String>]
       def included
-        return [] if directory.empty?
+        return [] if directory.empty? || directory == '*'
         @included ||= process_globs(@raw_data['include'])
       end
 
@@ -53,7 +53,7 @@ module Solargraph
       #
       # @return [Array<String>]
       def excluded
-        return [] if directory.empty?
+        return [] if directory.empty? || directory == '*'
         @excluded ||= process_exclusions(@raw_data['exclude'])
       end
 
@@ -61,6 +61,7 @@ module Solargraph
       #
       # @return [Array<String>]
       def calculated
+        Solargraph.logger.info "Indexing workspace files in #{directory}" unless @calculated || directory.empty? || directory == '*'
         @calculated ||= included - excluded
       end
 

data/lib/solargraph/yard_map/core_gen.rb

@@ -1,6 +1,8 @@
 require 'fileutils'
 require 'tmpdir'
 require 'pathname'
+require 'rubygems/package'
+require 'shellwords'
 
 module Solargraph
   class YardMap
@@ -17,28 +19,55 @@ module Solargraph
           path_name = Pathname.new(Dir.pwd).join(dest_dir).to_s
           FileUtils.mkdir_p path_name
           Dir.chdir(ruby_dir) do
-            `yardoc --plugin coregen -b #{File.join(path_name, 'yardoc')} -n *.c`
+            `yardoc --plugin coregen -b "#{File.join(path_name, 'yardoc')}" -n *.c`
             raise 'An error occurred generating the core yardoc.' unless $?.success?
-            `yardoc -b #{File.join(path_name, 'yardoc-stdlib')} -n lib ext`
+            # YARD::CLI::Yardoc.run('--plugin', 'coregen', '-b', "#{File.join(path_name, 'yardoc')}", '-n', File.join(ruby_dir, '*.c'))
+            `yardoc -b "#{File.join(path_name, 'yardoc-stdlib')}" -n lib ext`
             raise 'An error occurred generating the stdlib yardoc.' unless $?.success?
+            # YARD::CLI::Yardoc.run('-b', "#{File.join(path_name, 'yardoc-stdlib')}", '-n', File.join(ruby_dir, 'lib', '**', '*.rb'), File.join(ruby_dir, 'ext', '**', '*.c'), File.join(ruby_dir, 'ext', '**', '*.rb'))
           end
         end
 
-        # Generate a gzip of documentation from the specified Ruby source directory.
+        # Generate a gzip of documentation from the specified Ruby source
+        # directory.
+        #
+        # This method is designed to generate the directory architecture that
+        # YardMap core docs expect.
         #
         # @param ruby_dir [String] The Ruby source directory
-        # @param gzip_name [String] The gzip file name
+        # @param ver_name [String, nil] The version name
+        # @param dest_dir [String] The destination directory
         # @return [void]
-        def generate_gzip ruby_dir, gzip_name
+        def generate_gzip ruby_dir, ver_name = nil, dest_dir = Dir.pwd
           Dir.mktmpdir do |tmp|
-            gzip_name += '.tar.gz' unless gzip_name.end_with?('.tar.gz')
-            base_name = gzip_name[0..-8]
-            path_name = Pathname.new(Dir.pwd).join(base_name).to_s
-            generate_docs ruby_dir, tmp
-            `cd #{tmp} && tar -cf #{path_name}.tar *`
-            raise 'An error occurred generating the documentation tar.' unless $?.success?
-            `gzip #{path_name}.tar`
-            raise 'An error occurred generating the documentation gzip.' unless $?.success?
+            base_name = ver_name || begin
+              match = ruby_dir.match(/\d+\.\d+\.\d+$/)
+              raise "Unable to determine version name from #{ruby_dir}" if match.nil?
+              match[0]
+            end
+            path_name = Pathname.new(tmp).join(base_name).to_s
+            generate_docs ruby_dir, path_name
+            gzip path_name, Pathname.new(dest_dir).join("#{base_name}.tar.gz").to_s
+          end
+        end
+
+        private
+
+        # @param dir [String] The directory to compress
+        # @param dst [String] The destination file
+        def gzip dir, dst
+          File.open(dst, 'wb') do |file|
+            Zlib::GzipWriter.wrap(file) do |gzip|
+              Gem::Package::TarWriter.new(gzip) do |tar|
+                Dir["#{dir}/**/*"].each do |filename|
+                  next if File.directory?(filename)
+                  relname = File.join(File.basename(dir), filename[dir.length+1..-1])
+                  tar.add_file_simple(relname, 0o644, File.size(filename)) do |io|
+                    io.write File.read_binary(filename)
+                  end
+                end
+              end
+            end
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.31.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.3.4
+- !ruby/object:Gem::Dependency
+  name: jaro_winkler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -154,20 +168,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: jaro_winkler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement