solargraph 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34392923b4d66bd6306a6216e363aca3a504ff3b
-  data.tar.gz: 8025196be58e10a71a5d61bfe79d629598e3543f
+  metadata.gz: bd8da15d1c0d25c8c95d4da12a4cba4c4b312ed0
+  data.tar.gz: 0cb4e3d5705c8b6339db2b2d144748068aec4d96
 SHA512:
-  metadata.gz: 701214492f652110bff2a97f08a3fcc832600f3d8aac88f8d8d71cdb258b17c4fc32340ac7cc0c011856180d8698a8a67fa0ce705a81adb8b753e536a975e8e1
-  data.tar.gz: 8ece31aa4ee0e7918c32ef96df4d98cb4e2354035170eb65671003e0fcbdafb60509b6c71fc64ae58d22c1ea6385469430efb988e71f21000d70b2f375d0653a
+  metadata.gz: 0e785fbea311d6778f7452897fdacb3cd9d7a5e5038db0bc12c3d30e51bf0f99d816f73308e7b379c856e6a8f434a6bc402f6786e849b7dfd93c745e5454f2f5
+  data.tar.gz: d24ac0e448bc7796cf8c92f63727699a3ea8c5cb1f0de50069f787de68ec9b0576fa2362666c1a74d2a82d6f5437e8d9dc04f6ccb66978c632ff376eb380dd96

data/lib/solargraph/api_map.rb

@@ -24,10 +24,10 @@ module Solargraph
     attr_reader :required
 
     def initialize workspace = nil
-      @workspace = workspace
+      @workspace = workspace.gsub(/\\/, '/') unless workspace.nil?
       clear
       unless @workspace.nil?
-        extra = File.join(workspace, '.solargraph')
+        extra = File.join(@workspace, '.solargraph')
         if File.exist?(extra)
           append_file(extra)
         end
@@ -252,7 +252,10 @@ module Solargraph
       if @yardoc_files.nil?
         @yardoc_files = []
         yard_options[:include].each { |glob|
-          @yardoc_files.concat Dir[File.join workspace, glob]
+          #@yardoc_files.concat Dir[File.join workspace, glob]
+          Dir[File.join workspace, glob].each { |f|
+            @yardoc_files.push File.absolute_path(f)
+          }
         }
       end
       @yardoc_files.include?(file)
@@ -351,10 +354,8 @@ module Solargraph
           meths.delete_if{ |m| m.insert != p }
           return nil if meths.empty?
           type = nil
-          unless meths[0].documentation.nil?
-            match = meths[0].documentation.all.match(/@return \[([a-z0-9:_]*)/i)
-            type = find_fully_qualified_namespace(match[1]) unless match.nil?
-          end
+          match = meths[0].return_type
+          type = find_fully_qualified_namespace(match) unless match.nil?
         end
         scope = :instance
         top = false
@@ -362,15 +363,6 @@ module Solargraph
       type
     end
 
-    def get_method_return_value namespace, root, method, scope = :instance
-      meths = get_methods(namespace, root).delete_if{ |m| m.insert != method }
-      meths.each { |m|
-        r = get_return_tag(m)
-        return r unless r.nil?
-      }
-      nil
-    end
-
     def get_namespace_type namespace, root = ''
       type = nil
       fqns = find_fully_qualified_namespace(namespace, root)
@@ -411,6 +403,8 @@ module Solargraph
       list.children.each { |c|
         if c.type == :arg
           args.push c.children[0]
+        elsif c.type == :kwoptarg
+          args.push "#{c.children[0]}:"
         end
       }
       args
@@ -430,12 +424,6 @@ module Solargraph
         elsif type == :module
           meths += yard_map.get_instance_methods('Module')
         end
-        # TODO: Look out for repeats. Consider not doing this at all.
-        #sc = get_superclass(namespace, root)
-        #until sc.nil?
-        #  meths += yard.get_instance_methods(sc, root)
-        #  sc = get_superclass(sc)
-        #end
       end
       meths
     end
@@ -529,6 +517,7 @@ module Solargraph
       skip.push fqns
       nodes = get_namespace_nodes(fqns)
       nodes.each { |n|
+        f = get_filename_for(n)
         unless yardoc_has_file?(get_filename_for(n))
           if n.kind_of?(AST::Node)
             if n.type == :class and !n.children[1].nil?

data/lib/solargraph/code_map.rb

@@ -221,7 +221,8 @@ module Solargraph
         fqns = @api_map.find_fully_qualified_namespace(signature, ns_here)
         if fqns.nil?
           # It's a method call
-          type = @api_map.infer_signature_type(signature, ns_here, scope: :class)
+          sig_scope = (scope.type == :def ? :instance : :class)
+          type = @api_map.infer_signature_type(signature, ns_here, scope: sig_scope)
           result.concat @api_map.get_instance_methods(type) unless type.nil?
         else
           if fqns == ns_here
@@ -271,24 +272,6 @@ module Solargraph
       obj
     end
 
-    # @todo Candidate for deprecation
-    def get_instance_method_return_value namespace, root, method
-      meths = @api_map.get_instance_methods(namespace, root).delete_if{ |m| m.insert != method }
-      meths.each { |m|
-        r = get_return_tag(m)
-        return r unless r.nil?
-      }
-      nil
-    end
-
-    def get_return_tag suggestion
-        unless suggestion.documentation.nil?
-          match = suggestion.documentation.all.match(/@return \[([a-z0-9:_]*)/i)
-          return match[1]
-        end
-        nil
-    end
-
     def get_signature_at index
       brackets = 0
       squares = 0

data/lib/solargraph/suggestion.rb

@@ -30,6 +30,22 @@ module Solargraph
       label
     end
 
+    def return_type
+      if code_object.nil?
+        unless documentation.nil?
+          match = documentation.all.match(/@return \[([a-z0-9:_]*)/i)
+          return match[1]
+        end
+      else
+        o = code_object.tag(:overload)
+        unless o.nil?
+          r = o.tag(:return)
+          return r.types[0] unless r.nil?
+        end
+      end
+      nil
+    end
+
     def to_json args={}
       obj = {
         label: @label,

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

data/lib/solargraph/yard_map.rb

@@ -57,12 +57,7 @@ module Solargraph
         yard = YARD::Registry.load! y
         unless yard.nil?
           obj = yard.at query
-          #found.push YARD::Templates::Engine.render(format: :html, object: obj) unless obj.nil?
-          unless obj.nil?
-            # HACK: Fix return tags in core documentation
-            fix_return! obj if obj.kind_of?(YARD::CodeObjects::MethodObject) and y.include?('.solargraph')
-            found.push obj
-          end
+          found.push obj unless obj.nil?
         end
       }
       found
@@ -126,15 +121,9 @@ module Solargraph
         yard = YARD::Registry.load! y
         unless yard.nil?
           ns = nil
-          #if scope == ''
-          #  ns = yard.at(namespace)
-          #else
-            ns = find_first_resolved_namespace(yard, namespace, scope)
-          #end
+          ns = find_first_resolved_namespace(yard, namespace, scope)
           unless ns.nil? or !ns.kind_of?(YARD::CodeObjects::NamespaceObject)
             ns.meths(scope: :class, visibility: visibility).each { |m|
-              # HACK: Fix return tags in core documentation
-              fix_return! m if y.include?('.solargraph')
               n = m.to_s.split(/[\.#]/).last
               label = "#{n}"
               args = get_method_args(m)
@@ -160,15 +149,9 @@ module Solargraph
         yard = YARD::Registry.load! y
         unless yard.nil?
           ns = nil
-          #if scope == ''
-          #  ns = yard.at(namespace)
-          #else
-            ns = find_first_resolved_namespace(yard, namespace, scope)
-          #end
+          ns = find_first_resolved_namespace(yard, namespace, scope)
           unless ns.nil?
             ns.meths(scope: :instance, visibility: visibility).each { |m|
-              # HACK: Fix return tags in core documentation
-              fix_return! m if y.include?('.solargraph')
               n = m.to_s.split(/[\.#]/).last
               if n.to_s.match(/^[a-z]/i) and (namespace == 'Kernel' or !m.to_s.start_with?('Kernel#')) and !m.docstring.to_s.include?(':nodoc:')
                 label = "#{n}"
@@ -206,25 +189,14 @@ module Solargraph
     def get_method_args meth
       args = []
       meth.parameters.each { |a|
-        args.push a[0]
-      }
-      args
-    end
-
-    def fix_return! meth
-      return unless meth.tag(:return).nil?
-      return unless meth.docstring.all.include?('@return')
-      text = ''
-      meth.docstring.all.lines.each { |line|
-        if line.strip.start_with?('@return')
-          text += line.strip
-        else
-          text += line
+        p = a[0]
+        unless a[1].nil?
+          p += ' =' unless p.end_with?(':')
+          p += " #{a[1]}"
         end
-        text += "\n"
+        args.push p
       }
-      doc = YARD::Docstring.new(text, meth)
-      meth.docstring = doc
+      args
     end
 
     def find_first_resolved_namespace yard, namespace, scope

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -92,6 +92,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  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: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement