solargraph 0.24.0 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 102d3ab02b96835a5e3efc7a5ec5f07b2bd53c94660d16905f6c7264e6ac520a
-  data.tar.gz: 29aab3c067c6e9e95eeb5cf108ae5f71560f325aa02612bb69957840706e9d43
+  metadata.gz: c068cbe7c4d090f33124e8a8ab52a9f956992aab3c5db9e5f41ba41f65642be3
+  data.tar.gz: 1798f2d5c48fa1d794c7441102154d464ce4cb8a75ea77d759c9eea27dbfc492
 SHA512:
-  metadata.gz: eed6ec2beee0afb8bcb8fc976f1d1487b5d79cd44acc1c27c89751f896da3ede2f8ec33da4d14278ea597e3308c3770cf6952d57dabf19de67d759b0a1464c1a
-  data.tar.gz: c7e7b79cf903a07e1237598a3d0f645aff86602128703af72531ee12d8bb7c1bf85a9445a097aec9f90ac8bd5dab9a9fcb24aa95fc6935250f24d017e8b85872
+  metadata.gz: 1aac2a042e292cf73c3bb70559b9a67d7a0d1c75537f669b20cfffd1bb1a41a820c67f9c4a845e23bce24cc5f1384a3dad7055a91b138f910ff4099633834f3f
+  data.tar.gz: f204e7cbee66ffa0e5a5d0a0086e8415e222a13a576b6a394ca840cf5a7f9401fe9570953db9770274262b1524b820f17c020c711b65c9dac1cc44b157d464dc

data/lib/solargraph.rb

@@ -1,3 +1,4 @@
+require 'yard'
 require 'solargraph/version'
 require 'rubygems/package'
 require 'yard-solargraph'
@@ -44,3 +45,5 @@ module Solargraph
 end
 
 Solargraph::YardMap::CoreDocs.require_minimum
+# Change YARD log IO to avoid sending unexpected messages to STDOUT
+YARD::Logger.instance.io = STDERR

data/lib/solargraph/api_map.rb

@@ -338,8 +338,9 @@ module Solargraph
             if result.empty?
               pins.each do |pin|
                 type = pin.return_type
-                unless type.nil?
-                  namespace, scope = extract_namespace_and_scope(type)
+                unless type.nil? or type == 'void'
+                  docns, scope = extract_namespace_and_scope(type)
+                  namespace = qualify(docns, pin.namespace)
                   result.concat get_methods(namespace, scope: scope)
                   break
                 end

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

@@ -40,7 +40,7 @@ module Solargraph
                 items.push pin.completion_item.merge({
                   textEdit: {
                     range: completion.range.to_hash,
-                    newText: pin.name
+                    newText: pin.name.sub(/=$/, ' = ')
                   },
                   sortText: "#{pin.name}#{idx.to_s.rjust(4, '0')}"
                 })

data/lib/solargraph/pin/base.rb

@@ -100,7 +100,7 @@ module Solargraph
       #
       # @return [String]
       def return_scope
-        return nil if complex_types.empty?
+        return nil if return_complex_types.empty?
         @return_scope ||= return_complex_types.first.scope
       end
 

data/lib/solargraph/source.rb

@@ -34,6 +34,7 @@ module Solargraph
 
     attr_reader :path_macros
 
+    # @return [Integer]
     attr_accessor :version
 
     # Get the time of the last synchronization.
@@ -207,6 +208,8 @@ module Solargraph
     end
 
     # @param updater [Source::Updater]
+    # @param reparse [Boolean]
+    # @return [void]
     def synchronize updater, reparse = true
       raise 'Invalid synchronization' unless updater.filename == filename
       original_code = @code
@@ -244,6 +247,8 @@ module Solargraph
       }
     end
 
+    # @param location [Solargraph::Source::Location]
+    # @return [Solargraph::Pin::Base]
     def locate_pin location
       return nil unless location.start_with?("#{filename}:")
       @all_pins.select{|pin| pin.location == location}.first
@@ -256,6 +261,7 @@ module Solargraph
       Fragment.new(self, line, column)
     end
 
+    # @return [Boolean]
     def parsed?
       @parsed
     end
@@ -297,6 +303,7 @@ module Solargraph
       end
     end
 
+    # @return [void]
     def parse
       node, comments = inner_parse(@fixed, filename)
       @node = node

data/lib/solargraph/source/mapper.rb

@@ -1,5 +1,3 @@
-require 'tempfile'
-
 module Solargraph
   class Source
     # The Mapper generates pins and other data for Sources.
@@ -59,10 +57,12 @@ module Solargraph
         frag.strip.gsub(/,$/, '')
       end
 
+      # @return [String]
       def filename
         @filename
       end
 
+      # @return [Array<Solargraph::Pin::Base>]
       def pins
         @pins ||= []
       end
@@ -332,6 +332,8 @@ module Solargraph
         nil
       end
 
+      # @param node [Parser::AST::Node]
+      # @return [Solargraph::Source::Location]
       def get_node_location(node)
         if node.nil?
           st = Position.new(0, 0)
@@ -342,8 +344,11 @@ module Solargraph
         end
         range = Range.new(st, en)
         Location.new(filename, range)
-      end  
+      end
 
+      # @param node [Parser::AST::Node]
+      # @param comments [Array]
+      # @return [Hash]
       def associate_comments node, comments
         return nil if comments.nil?
         comment_hash = Parser::Source::Comment.associate_locations(node, comments)
@@ -366,8 +371,7 @@ module Solargraph
               ctxt += "#{p[num..-1]}\n"
             end
           }
-          parse = nil
-          suppress_stdout { parse = YARD::Docstring.parser.parse(ctxt) }
+          parse = YARD::Docstring.parser.parse(ctxt)
           unless parse.directives.empty?
             @directives[k] ||= []
             @directives[k].concat parse.directives
@@ -377,17 +381,19 @@ module Solargraph
         yard_hash
       end
 
+      # @param node [Parser::AST::Node]
+      # @return [Solargraph::Pin::Namespace]
       def namespace_for(node)
         position = Source::Position.new(node.loc.line - 1, node.loc.column)
         @pins.select{|pin| pin.kind == Pin::NAMESPACE and pin.location.range.contain?(position)}.last
       end
 
+      # @return [void]
       def process_directives
         @directives.each_pair do |k, v|
           v.each do |d|
             ns = namespace_for(k.node)
-            docstring = nil
-            suppress_stdout { docstring = YARD::Docstring.parser.parse(d.tag.text).to_docstring }
+            docstring = YARD::Docstring.parser.parse(d.tag.text).to_docstring
             if d.tag.tag_name == 'attribute'
               t = (d.tag.types.nil? || d.tag.types.empty?) ? nil : d.tag.types.flatten.join('')
               if t.nil? or t.include?('r')
@@ -453,26 +459,6 @@ module Solargraph
         }
         args
       end
-
-      # Suppress writing data to STDOUT during execution of a block.
-      #
-      # @example
-      #   suppress_stdout { puts 'This will not get printed' }
-      #
-      def suppress_stdout
-        original_stdout = STDOUT.clone
-        # @todo It would be better to redirect to /dev/null or StringIO if
-        #   there's a cross-platform solution for it.
-        tempfile = Tempfile.new('tmp')
-        STDOUT.reopen tempfile
-        begin
-          yield
-        ensure
-          STDOUT.reopen original_stdout
-          tempfile.close
-          tempfile.unlink
-        end
-      end
     end
   end
 end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.24.0'
+  VERSION = '0.24.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser