solargraph 0.23.5 → 0.23.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c281911d4b36b81d86b88a11979ee08e9c974cd10cbe83e1d07a03cf3f52185
-  data.tar.gz: 65d1fe2602ac1ac9b9272aaf52a0a4772edd5897465b29d370ee6ebc15cedb44
+  metadata.gz: c5b6ac3cd79425340ddf486c9b3447115553a374a3c782d8c8a103825b4461b9
+  data.tar.gz: 4561568bb8075f955777c2a17a2a19a91c14b198df6c8f5798168b01abdeac19
 SHA512:
-  metadata.gz: d1c5981b4b14c3651833ddc5589c8002ede7d7d690519ee70d8a8e82a59bbfaecdcd6576b0d6706b29d6d92bda3f1a5c990a23286114d81b84ec49b99ca9bb8e
-  data.tar.gz: 0c75eb3da1835a7cd35ee8a594554ec0e6638c4afbe471aa27f05c7233df0841b47d5e313fb53d319b56af6fc46fd1876756dc9b8ace48476ca4e9353c23dba1
+  metadata.gz: 489953a5c791e8475b217b4033a502196a1d0aa0112f5d778ce2dba9ed488e773b867fb596ca02a1f81a6143b426d54007ab0448f979d1c9ad98344034fa96a1
+  data.tar.gz: 390e4c2bf98f7733232f551749114229afb6e4f7271ac1792e2034cd223de6e0b636ab001281ad225b7f8267b0a8e1e48e927be0a88bab63a4ded3c7779e3bc3

data/lib/solargraph/api_map/probe.rb

@@ -48,7 +48,7 @@ module Solargraph
       def infer_signature_type signature, context_pin, locals
         pins = infer_signature_pins(signature, context_pin, locals)
         pins.each do |pin|
-          return pin.return_type unless pin.return_type.nil?
+          return qualify(pin.return_type, pin.named_context) unless pin.return_type.nil?
           type = resolve_pin_type(pin, locals - [pin])
           return qualify(type, pin.named_context) unless type.nil?
         end

data/lib/solargraph/api_map/source_to_yard.rb

@@ -32,15 +32,10 @@ module Solargraph
               code_object_map[pin.path].instance_mixins.push code_object_map[ref.name] unless code_object_map[ref.name].nil? or code_object_map[pin.path].nil?
             end
           end
-          s.attribute_pins.each do |pin|
-            code_object_map[pin.path] ||= YARD::CodeObjects::MethodObject.new(code_object_at(pin.namespace), pin.name, :instance)
-            code_object_map[pin.path].docstring = pin.docstring unless pin.docstring.nil?
-            code_object_map[pin.path].files.push pin.location.filename
-            #code_object_map[pin.path].parameters = []
-          end
           s.method_pins.each do |pin|
             code_object_map[pin.path] ||= YARD::CodeObjects::MethodObject.new(code_object_at(pin.namespace), pin.name, pin.scope)
             code_object_map[pin.path].docstring = pin.docstring unless pin.docstring.nil?
+            code_object_map[pin.path].visibility = pin.visibility || :public
             code_object_map[pin.path].files.push pin.location.filename
             code_object_map[pin.path].parameters = pin.parameters.map do |p|
               n = p.match(/^[a-z0-9_]*:?/i)[0]

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

@@ -4,7 +4,11 @@ module Solargraph
       class Initialize < Base
         def process
           host.configure params['initializationOptions']
-          host.prepare params['rootPath']
+          if params['rootUri']
+            host.prepare UriHelpers.uri_to_file(params['rootUri'])
+          else
+            host.prepare params['rootPath']
+          end
           result = {
             capabilities: {
               textDocumentSync: 2, # @todo What should this be?

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

@@ -4,7 +4,9 @@ module Solargraph
       module TextDocument
         class DidSave < Base
           def process
-            host.save params
+            # @todo The server might not need to do anything in response to
+            #   this notification. See https://github.com/castwide/solargraph/issues/73
+            # host.save params
           end
         end
       end

data/lib/solargraph/pin/attribute.rb

@@ -38,6 +38,11 @@ module Solargraph
         @return_type
       end
 
+      def visibility
+        # @todo Check attribute visibility
+        :public
+      end
+
       def parameters
         # Since attributes are generally equivalent to methods, treat
         # them as methods without parameters

data/lib/solargraph/pin/yard_object.rb

@@ -42,7 +42,6 @@ module Solargraph
       end
 
       def return_type
-        # @todo Get the return type
         if @return_type.nil?
           if code_object.kind_of?(YARD::CodeObjects::ClassObject)
             @return_type ||= "Class<#{path}>"
@@ -51,7 +50,7 @@ module Solargraph
           if code_object.kind_of?(YARD::CodeObjects::ModuleObject)
             @return_type ||= "Module<#{path}>"
             return @return_type
-          end        
+          end
           if Solargraph::CoreFills::CUSTOM_RETURN_TYPES.has_key?(path)
             @return_type = Solargraph::CoreFills::CUSTOM_RETURN_TYPES[path]
           else

data/lib/solargraph/source.rb

@@ -49,10 +49,13 @@ module Solargraph
 
     attr_reader :domains
 
+    # @return [Array<Solargraph::Pin::Base>]
     attr_reader :locals
 
     include NodeMethods
 
+    # @param code [String]
+    # @param filename [String]
     def initialize code, filename = nil
       begin
         @code = code
@@ -141,6 +144,7 @@ module Solargraph
       symbol_pins
     end
 
+    # @param name [String]
     # @return [Array<Source::Location>]
     def references name
       inner_node_references(name, node).map do |n|
@@ -202,19 +206,7 @@ module Solargraph
       stack
     end
 
-    def inner_tree_at node, offset, stack
-      return if node.nil?
-      stack.unshift node
-      node.children.each do |c|
-        next unless c.is_a?(AST::Node)
-        next if c.loc.expression.nil?
-        if offset >= c.loc.expression.begin_pos and offset < c.loc.expression.end_pos
-          inner_tree_at(c, offset, stack)
-          break
-        end
-      end
-    end
-
+    # @param updater [Source::Updater]
     def synchronize updater
       raise 'Invalid synchronization' unless updater.filename == filename
       original_code = @code
@@ -236,12 +228,15 @@ module Solargraph
       end
     end
 
+    # @param query [String]
+    # @return [Array<Solargraph::Pin::Base>]
     def query_symbols query
       return [] if query.empty?
       down = query.downcase
       all_symbols.select{|p| p.path.downcase.include?(down)}
     end
 
+    # @return [Array<Solargraph::Pin::Base>]
     def all_symbols
       @all_symbols ||= pins.select{ |pin|
         [Pin::ATTRIBUTE, Pin::CONSTANT, Pin::METHOD, Pin::NAMESPACE].include?(pin.kind) and !pin.name.empty?
@@ -286,6 +281,19 @@ module Solargraph
       result
     end
 
+    def inner_tree_at node, offset, stack
+      return if node.nil?
+      stack.unshift node
+      node.children.each do |c|
+        next unless c.is_a?(AST::Node)
+        next if c.loc.expression.nil?
+        if offset >= c.loc.expression.begin_pos and offset < c.loc.expression.end_pos
+          inner_tree_at(c, offset, stack)
+          break
+        end
+      end
+    end
+
     def parse
       node, comments = inner_parse(@fixed, filename)
       @node = node
@@ -318,12 +326,15 @@ module Solargraph
     end
 
     class << self
+      # @param filename [String]
       # @return [Solargraph::Source]
       def load filename
         code = File.read(filename)
         Source.load_string(code, filename)
       end
 
+      # @param code [String]
+      # @param filename [String]
       # @return [Solargraph::Source]
       def load_string code, filename = nil
         Source.new code, filename

data/lib/solargraph/source/fragment.rb

@@ -319,7 +319,7 @@ module Solargraph
                 brackets += 1
               elsif char == '['
                 squares += 1
-                signature = ".[]#{signature}" if squares == 0 and @code[index-2] != '%'
+                signature = ".[]#{signature}" if parens.zero? and brackets.zero? and squares.zero? and @code[index-2] != '%'
               end
               if brackets.zero? and parens.zero? and squares.zero?
                 break if ['"', "'", ',', ';', '%'].include?(char)

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.23.5'
+  VERSION = '0.23.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.23.5
+  version: 0.23.6
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -376,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Solargraph for Ruby