solargraph 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42c517ebca7551450b32dd8fded6d41d354e3f0e
-  data.tar.gz: 811178710bc8fc5ad25c6595b36472c6d8236936
+  metadata.gz: 02c54193138513541a17e784338430260259b223
+  data.tar.gz: f464a3a964e88b6f82d250e065d92e0062c3a135
 SHA512:
-  metadata.gz: 049374bd1b7e3e5907df5bd722029e409b6359b96cdc08835a7e1179aae5b85989d378c93ccb4b952daeceac4534afe61ce5d499b367250e3623947f668c73c6
-  data.tar.gz: d4060fed1fcc0943c4d8939df046c4c83e1059ed93b20f4b7bfb45c614c554792bee0c7c0543d15f274d6d640203b11827620cb64e48baa37e18d170c610416f
+  metadata.gz: b548477ca4dc01db1785654d68d779a1ae3e29fb29c7702efc006ce2abfd8101df8735395328bb11db9a19abfc568d93896fadc392c8eb9af4126450fb7df162
+  data.tar.gz: dd27df9547f7dddfff89b98af23cf61d9dfaeb5937f790885c30607b7ccc7f3d5151132fb1affa8183b4f766d257731129b504a1dbcc43c1791deec07f719a7c

data/lib/solargraph/api_map.rb

@@ -405,10 +405,15 @@ module Solargraph
       }
       return args if list.nil?
       list.children.each { |c|
+        STDERR.puts "Args child is #{c.type}"
         if c.type == :arg
           args.push c.children[0]
-        elsif c.type == :kwoptarg
+        elsif c.type == :optarg
+          args.push "#{c.children[0]} = _"
+        elsif c.type == :kwarg
           args.push "#{c.children[0]}:"
+        elsif c.type == :kwoptarg
+          args.push "#{c.children[0]}: _"
         end
       }
       args
@@ -475,18 +480,17 @@ module Solargraph
       if workspace.nil?
         STDERR.puts "No workspace specified for yardoc update."
       else
-        Dir.chdir(workspace) do
-          Thread.new {
-            STDERR.puts "Updating the yardoc..."
-            globs = yard_options[:include] - yard_options[:exclude]
+        Thread.new {
+          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
+        }
       end
     end
 

data/lib/solargraph/code_map.rb

@@ -5,19 +5,15 @@ module Solargraph
     attr_accessor :node
     attr_reader :code
     attr_reader :parsed
+    attr_reader :filename
     attr_reader :workspace
 
     include NodeMethods
 
     def initialize code: '', filename: nil, workspace: nil, api_map: nil
-      unless workspace.nil?
-        workspace = workspace.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
-      end
-      if workspace.nil? and !filename.nil?
-        filename = filename.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
-        workspace = CodeMap.find_workspace(filename)
-      end
       @workspace = workspace
+      # HACK: Adjust incoming filename's path separator for yardoc file comparisons
+      filename = filename.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless filename.nil? or File::ALT_SEPARATOR.nil?
       @filename = filename
       @api_map = api_map
       @code = code.gsub(/\r/, '')
@@ -68,24 +64,6 @@ module Solargraph
       @api_map ||= ApiMap.new(workspace)
     end
 
-    def self.find_workspace filename
-      return nil if filename.nil?
-      dirname = filename
-      lastname = nil
-      result = nil
-      until dirname == lastname
-        if File.file?("#{dirname}/Gemfile")
-          result = dirname
-          break
-        end
-        lastname = dirname
-        dirname = File.dirname(dirname)
-      end
-      result ||= File.dirname(filename)
-      result.gsub!(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
-      result
-    end
-
     # Get the offset of the specified line and column.
     # The offset (also called the "index") is typically used to identify the
     # cursor's location in the code when generating suggestions.

data/lib/solargraph/server.rb

@@ -20,7 +20,7 @@ module Solargraph
       content_type :json
       begin
         sugg = []
-        workspace = params['workspace'] || CodeMap.find_workspace(params['filename'])
+        workspace = params['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])

data/lib/solargraph/suggestion.rb

@@ -21,7 +21,7 @@ module Solargraph
       @insert = insert || @label
       @detail = detail
       @code_object = code_object
-      @documentation = @helper.html_markup_rdoc(documentation.to_s) unless documentation.nil?
+      @documentation = documentation
       @location = location
       @arguments = arguments
     end
@@ -37,8 +37,14 @@ module Solargraph
     def return_type
       if code_object.nil?
         unless documentation.nil?
-          match = documentation.match(/@return \[([a-z0-9:_]*)/i)
-          return match[1] unless match.nil?
+          if documentation.kind_of?(YARD::Docstring)
+            t = documentation.tag(:return)
+            return nil if t.nil?
+            return t.types[0]
+          else
+            match = documentation.match(/@return \[([a-z0-9:_]*)/i)
+            return match[1] unless match.nil?
+          end
         end
       else
         o = code_object.tag(:overload)
@@ -55,10 +61,10 @@ module Solargraph
     def documentation
       if @documentation.nil?
         unless @code_object.nil?
-          @documentation = @helper.html_markup_rdoc(@code_object.docstring.to_s) unless @code_object.docstring.nil?
+          @documentation = @code_object.docstring unless @code_object.docstring.nil?
         end
       end
-      @documentation.to_s
+      @documentation
     end
 
     def to_json args={}
@@ -71,7 +77,7 @@ module Solargraph
         location: (@location.nil? ? nil : @location.to_s),
         arguments: @arguments,
         return_type: return_type,
-        documentation: documentation
+        documentation: @helper.html_markup_rdoc(documentation.to_s)
       }
       obj.to_json(args)
     end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.8.5'
+  VERSION = '0.8.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser