solargraph 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10495d0e5d7c64f8529c0064a10c5a46de6618da
-  data.tar.gz: f96a938b6f90628d25221150b7bfbdca07a7bc39
+  metadata.gz: 3fd196523191df8e781673c9b4f4ec9680132b60
+  data.tar.gz: c341f7ecf19bb780648b125234d411891d6048e7
 SHA512:
-  metadata.gz: f072292781a9e234c51b2de18531cd00e350569a6a28b4fbe4e8041d0dbdadba5429032d2f93a11faa963c7b7665cdd56049a1a62173372aac16ecdad165103d
-  data.tar.gz: 8fd69162b003ddfaeb338c0369b8285cf2828e6b250dafb030ee0d8b6efddc0db8c3e94d1d313a4b00f15bf97d27d8dd7b6c57418450691029af308c8960570b
+  metadata.gz: 22635ccfb51ffcff3638ec6cac95dc550824060a74e41aedf4f11e67e2da45b320e801c789fa5d1634614e8f7838a2a4260a24711bd3ee290b2d80365ba6f2b1
+  data.tar.gz: 6767110f8eccb4268f21b73a06f2854fc2b957da3caf3067e9ae0433a4251eb9d252e9d937c27d6926a416777e287911475a97bb8c10a5791954535022749dff

data/lib/solargraph/api_map.rb

@@ -495,15 +495,13 @@ module Solargraph
       if workspace.nil?
         STDERR.puts "No workspace specified for yardoc update."
       else
-        Thread.new do
-          Dir.chdir(workspace) do
-            STDERR.puts "Updating the yardoc for #{workspace}..."
-            cmd = "yardoc -e #{Solargraph::YARD_EXTENSION_FILE}"
-            STDERR.puts "Update yardoc with #{cmd}"
-            STDERR.puts `#{cmd}`
-            unless $?.success?
-              STDERR.puts "There was an error processing the workspace yardoc."
-            end
+        Dir.chdir(workspace) do
+          STDERR.puts "Updating the yardoc for #{workspace}..."
+          cmd = "yardoc -e #{Solargraph::YARD_EXTENSION_FILE}"
+          STDERR.puts "Update yardoc with #{cmd}"
+          STDERR.puts `#{cmd}`
+          unless $?.success?
+            STDERR.puts "There was an error processing the workspace yardoc."
           end
         end
       end
@@ -635,7 +633,7 @@ module Solargraph
             n.children.each { |c|
               if c.kind_of?(AST::Node) and c.type == :send and [:public, :protected, :private].include?(c.children[1])
                 current_scope = c.children[1]
-              elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :include
+              elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :include and n.type == :class
                 fqmod = find_fully_qualified_namespace(const_from(c.children[2]), root)
                 meths += get_instance_methods(fqmod) unless fqmod.nil? or skip.include?(fqmod)
               else
@@ -665,9 +663,11 @@ module Solargraph
           end
         end
         # This is necessary to get included modules from workspace definitions
-        get_include_strings_from(n).each { |i|
-          meths += inner_get_instance_methods(i, fqns, skip, visibility)
-        }
+        if n.type == :class
+          get_include_strings_from(n).each { |i|
+            meths += inner_get_instance_methods(i, fqns, skip, visibility)
+          }
+        end
       }
       meths.uniq
     end
@@ -715,10 +715,14 @@ module Solargraph
     def get_constant_nodes(node, fqns)
       result = []
       node.children.each do |n|
-        if n.kind_of?(AST::Node) and n.type == :casgn
-          cmnt = get_comment_for(n)
-          type = infer_assignment_node_type(n, fqns)
-          result.push Suggestion.new(n.children[1].to_s, kind: Suggestion::CONSTANT, documentation: cmnt, return_type: type)
+        if n.kind_of?(AST::Node)
+          if n.type == :casgn
+            cmnt = get_comment_for(n)
+            type = infer_assignment_node_type(n, fqns)
+            result.push Suggestion.new(n.children[1].to_s, kind: Suggestion::CONSTANT, documentation: cmnt, return_type: type)
+          else
+            result.concat get_constant_nodes(n, fqns) unless n.type == :class or n.type == :module
+          end
         end
       end
       result
@@ -763,6 +767,7 @@ module Solargraph
     # @return [String] The fully qualified namespace for the signature's type
     #   or nil if a type could not be determined
     def inner_infer_signature_type signature, namespace, scope: :instance
+      orig = namespace
       namespace = clean_namespace_string(namespace)
       return nil if signature.nil?
       signature.gsub!(/\.$/, '')
@@ -808,6 +813,13 @@ module Solargraph
           sub = infer_signature_type(parts.join('.'), type, scope: :instance)
           return sub unless sub.to_s == ''
         end
+        if top and scope == :instance and p == '[]' and !orig.nil?
+          if orig.start_with?('Array<')
+            match = orig.match(/Array<([a-z0-9:_]*)/i)[1]
+            type = match
+            next
+          end
+        end
         unless p == 'new' and scope != :instance
           if scope == :instance
             visibility = [:public]

data/lib/solargraph/code_map.rb

@@ -266,12 +266,21 @@ module Solargraph
       phrase = phrase_at(index)
       signature = get_signature_at(index)
       namespace = namespace_at(index)
-      if signature.include?('.')
+      if signature.include?('.') or @code[index - signature.length - 1] == '.'
         # Check for literals first
-        type = infer_literal_node_type(node_at(index - 2))
+        nearest = @code[0, index].rindex('.')
+        revised = signature[0..nearest-index-1]
+        revised = revised[2..-1] if revised.start_with?('[]')
+        cursed = get_signature_index_at(index)
+        frag = @code[cursed..index]
+        literal = nil
+        if frag.start_with?('.')
+          literal = node_at(cursed - 1)
+        else
+          literal = node_at(cursed + 1)
+        end
+        type = infer_literal_node_type(literal)
         if type.nil?
-          nearest = @code[0, index].rindex('.')
-          revised = signature[0..nearest-index-1]
           type = infer_signature_at(nearest) unless revised.empty?
           if !type.nil?
             result.concat api_map.get_instance_methods(type) unless type.nil?
@@ -280,7 +289,14 @@ module Solargraph
             result.concat api_map.get_methods(fqns) unless fqns.nil?
           end
         else
-          result.concat api_map.get_instance_methods(type)
+          rest = revised
+          rest = rest[1..-1] if rest.start_with?('.')
+          if rest.nil? or rest.empty?
+            result.concat api_map.get_instance_methods(type)
+          else
+            intype = api_map.infer_signature_type(rest, type, scope: :instance)
+            result.concat api_map.get_instance_methods(intype)
+          end
         end
       elsif signature.start_with?('@@')
         result.concat get_class_variables_at(index)
@@ -298,18 +314,23 @@ module Solargraph
           result = api_map.namespaces_in(ns, namespace)
         end
       else
-        current_namespace = namespace_at(index)
-        parts = current_namespace.to_s.split('::')
-        result += get_snippets_at(index) if with_snippets
-        result += get_local_variables_and_methods_at(index)
-        result += ApiMap.get_keywords
-        while parts.length > 0
-          ns = parts.join('::')
-          result += api_map.namespaces_in(ns, namespace)
-          parts.pop
+        type = infer_literal_node_type(node_at(index - 2))
+        if type.nil?
+          current_namespace = namespace_at(index)
+          parts = current_namespace.to_s.split('::')
+          result += get_snippets_at(index) if with_snippets
+          result += get_local_variables_and_methods_at(index)
+          result += ApiMap.get_keywords
+          while parts.length > 0
+            ns = parts.join('::')
+            result += api_map.namespaces_in(ns, namespace)
+            parts.pop
+          end
+          result += api_map.namespaces_in('')
+          result += api_map.get_instance_methods('Kernel')
+        else
+          result.concat api_map.get_instance_methods(type)
         end
-        result += api_map.namespaces_in('')
-        result += api_map.get_instance_methods('Kernel')
       end
       result = reduce_starting_with(result, word_at(index)) if filtered
       result.uniq{|s| s.path}.sort{|a,b| a.label <=> b.label}
@@ -478,11 +499,9 @@ module Solargraph
     # A signature is a method call that can start with a constant, method, or
     # variable and does not include any method arguments. Examples:
     #
-    #   Code                  Signature
-    #   -----------------------------------------
-    #   String.new            String.new
-    #   @x.bar                @x.bar
-    #   y.split(', ').length  y.split.length
+    # * String.new -> String.new
+    # * @x.bar -> @x.bar
+    # * y.split(', ').length -> y.split.length
     #
     # @param index [Integer]
     # @return [String]
@@ -507,10 +526,11 @@ module Solargraph
           brackets += 1
         elsif char == '['
           squares += 1
+          signature = ".[]#{signature}" if squares == 0 and @code[index-2] != '%'
         end
         if brackets == 0 and parens == 0 and squares == 0
-          break if ['"', "'", ',', ' ', "\t", "\n"].include?(char)
-          signature = char + signature if char.match(/[a-z0-9:\._@]/i)
+          break if ['"', "'", ',', ' ', "\t", "\n", ';', '%'].include?(char)
+          signature = char + signature if char.match(/[a-z0-9:\._@]/i) and @code[index - 1] != '%'
           if char == '@'
             signature = "@#{signature}" if @code[index-1, 1] == '@'
             break
@@ -518,9 +538,49 @@ module Solargraph
         end
         index -= 1
       end
+      signature = signature[1..-1] if signature.start_with?('.')
+      #signature = signature[2..-1] if signature.start_with?('[]')
       signature
     end
 
+    def get_signature_index_at index
+      brackets = 0
+      squares = 0
+      parens = 0
+      signature = ''
+      index -=1
+      while index >= 0
+        break if brackets > 0 or parens > 0 or squares > 0
+        char = @code[index, 1]
+        if char == ')'
+          parens -=1
+        elsif char == ']'
+          squares -=1
+        elsif char == '}'
+          brackets -= 1
+        elsif char == '('
+          parens += 1
+        elsif char == '{'
+          brackets += 1
+        elsif char == '['
+          squares += 1
+          signature = ".[]#{signature}" if squares == 0
+        end
+        if brackets == 0 and parens == 0 and squares == 0
+          break if ['"', "'", ',', ' ', "\t", "\n", ';'].include?(char)
+          signature = char + signature if char.match(/[a-z0-9:\._@]/i)
+          if char == '@'
+            signature = "@#{signature}" if @code[index-1, 1] == '@'
+            break
+          end
+        end
+        index -= 1
+      end
+      signature = signature[1..-1] if signature.start_with?('.')
+      signature = signature[2..-1] if signature.start_with?('[]')
+      index + 1
+    end
+
     def get_snippets_at(index)
       result = []
       Snippets.definitions.each_pair { |name, detail|

data/lib/solargraph/server.rb

@@ -25,7 +25,7 @@ module Solargraph
       begin
         sugg = []
         workspace = params['workspace']
-        Server.prepare_workspace workspace unless @@api_hash.has_key?(workspace)
+        #Server.prepare_workspace workspace unless @@api_hash.has_key?(workspace)
         @@semaphore.synchronize {
           code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: @@api_hash[workspace], cursor: [params['line'].to_i, params['column'].to_i])
           offset = code_map.get_offset(params['line'].to_i, params['column'].to_i)
@@ -122,12 +122,10 @@ module Solargraph
 
       def prepare_workspace directory
         api_map = Solargraph::ApiMap.new(directory)
+        api_map.update_yardoc
         @@semaphore.synchronize {
           @@api_hash[directory] = api_map
         }
-        Thread.new {
-          api_map.update_yardoc
-        }
       end
     end
 

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.11.1'
+  VERSION = '0.11.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -120,7 +120,35 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-description: IDE tools for code analysis and autocompletion
+- !ruby/object:Gem::Dependency
+  name: debase
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug-ide
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: IDE tools for code completion and inline documentation
 email: admin@castwide.com
 executables:
 - solargraph
@@ -149,7 +177,7 @@ files:
 - lib/solargraph/yard_methods.rb
 - lib/yard-solargraph.rb
 - yardoc/2.0.0.tar.gz
-homepage: http://castwide.com
+homepage: http://solargraph.org
 licenses:
 - MIT
 metadata: {}