solargraph 0.14.2 → 0.14.3

data/lib/solargraph/server.rb

@@ -1,13 +1,12 @@
 require 'sinatra/base'
 require 'thread'
 require 'yard'
-require 'puma'
 
 module Solargraph
   class Server < Sinatra::Base
 
     set :port, 7657
-    set :server, :puma
+    set :server, :webrick
 
     @@api_hash = {}
     @@semaphore = Mutex.new
@@ -24,18 +23,30 @@ module Solargraph
     post '/prepare' do
       content_type :json
       STDERR.puts "Preparing #{params['workspace']}"
-      Server.prepare_workspace params['workspace']
-      { "status" => "ok"}.to_json
+      begin
+        Server.prepare_workspace params['workspace']
+        { "status" => "ok"}.to_json
+      rescue Exception => e
+        STDERR.puts e
+        STDERR.puts e.backtrace.join("\n")
+        { "status" => "err", "message" => e.message + "\n" + e.backtrace.join("\n") }.to_json
+      end
     end
 
     post '/update' do
       content_type :json
-      # @type [Solargraph::ApiMap]
-      api_map = @@api_hash[params['workspace']]
-      unless api_map.nil?
-        api_map.update params['filename']
+      begin
+        # @type [Solargraph::ApiMap]
+        api_map = get_api_map(params['workspace'])
+        unless api_map.nil?
+          api_map.update params['filename']
+        end
+        { "status" => "ok"}.to_json
+      rescue Exception => e
+        STDERR.puts e
+        STDERR.puts e.backtrace.join("\n")
+        { "status" => "err", "message" => e.message + "\n" + e.backtrace.join("\n") }.to_json
       end
-      { "status" => "ok"}.to_json
     end
 
     post '/suggest' do
@@ -43,10 +54,7 @@ module Solargraph
       begin
         sugg = []
         workspace = params['workspace']
-        api_map = nil
-        @@semaphore.synchronize {
-          api_map = @@api_hash[workspace]
-        }
+        api_map = get_api_map(workspace)
         with_all = params['all'] == '1' ? true : false
         code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: api_map, cursor: [params['line'].to_i, params['column'].to_i])
         offset = code_map.get_offset(params['line'].to_i, params['column'].to_i)
@@ -64,11 +72,10 @@ module Solargraph
       begin
         sugg = []
         workspace = params['workspace'] || nil
-        @@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)
-          sugg = code_map.signatures_at(offset)
-        }
+        api_map = get_api_map(workspace)
+        code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: api_map, cursor: [params['line'].to_i, params['column'].to_i])
+        offset = code_map.get_offset(params['line'].to_i, params['column'].to_i)
+        sugg = code_map.signatures_at(offset)
         { "status" => "ok", "suggestions" => sugg }.to_json
       rescue Exception => e
         STDERR.puts e
@@ -79,16 +86,20 @@ module Solargraph
 
     post '/resolve' do
       content_type :json
-      workspace = params['workspace'] || nil
-      result = []
-      @@semaphore.synchronize {
-        api_map = @@api_hash[workspace]
+      begin
+        workspace = params['workspace'] || nil
+        result = []
+        api_map = get_api_map(workspace)
         unless api_map.nil?
           # @todo Get suggestions that match the path
           result.concat api_map.get_path_suggestions(params['path'])
         end
-      }
-      { "status" => "ok", "suggestions" => result.map{|s| s.as_json(all: true)} }.to_json
+        { "status" => "ok", "suggestions" => result.map{|s| s.as_json(all: true)} }.to_json
+      rescue Exception => e
+        STDERR.puts e
+        STDERR.puts e.backtrace.join("\n")
+        { "status" => "err", "message" => e.message + "\n" + e.backtrace.join("\n") }.to_json
+      end
     end
 
     post '/hover' do
@@ -96,11 +107,10 @@ module Solargraph
       begin
         sugg = []
         workspace = params['workspace'] || nil
-        @@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)
-          sugg = code_map.resolve_object_at(offset)
-        }
+        api_map = get_api_map(workspace)
+        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)
+        sugg = code_map.resolve_object_at(offset)
         { "status" => "ok", "suggestions" => sugg }.to_json
       rescue Exception => e
         STDERR.puts e
@@ -111,7 +121,7 @@ module Solargraph
 
     get '/search' do
       workspace = params['workspace']
-      api_map = @@api_hash[workspace]
+      api_map = get_api_map(workspace)
       required = []
       unless api_map.nil?
         required.concat api_map.required
@@ -123,7 +133,7 @@ module Solargraph
 
     get '/document' do
       workspace = params['workspace']
-      api_map = @@api_hash[workspace]
+      api_map = get_api_map(workspace)
       required = []
       unless api_map.nil?
         required.concat api_map.required
@@ -137,6 +147,20 @@ module Solargraph
       exit
     end
 
+    # @return [Solargraph::ApiMap]
+    def self.get_api_map workspace
+      api_map = nil
+      @@semaphore.synchronize {
+        api_map = @@api_hash[workspace]
+      }
+      api_map
+    end
+
+    # @return [Solargraph::ApiMap]
+    def get_api_map workspace
+      Server.get_api_map workspace
+    end
+
     def htmlify text
       rdoc_to_html text
     end
@@ -154,9 +178,9 @@ module Solargraph
     class << self
       def prepare_workspace directory
         Thread.new do
+          api_map = Solargraph::ApiMap.new(directory)
+          api_map.yard_map
           @@semaphore.synchronize do
-            api_map = Solargraph::ApiMap.new(directory)
-            api_map.yard_map
             @@api_hash[directory] = api_map
           end
         end

data/lib/solargraph/shell.rb

@@ -56,13 +56,15 @@ module Solargraph
     option :files, type: :string, aliases: :f, desc: 'The public files directory', default: nil
     def server
       port = options[:port]
-      port = available_port if port.zero?
+      # This line should not be necessary with WEBrick
+      #port = available_port if port.zero?
       Solargraph::Server.set :port, port
       Solargraph::Server.set :views, options[:views] unless options[:views].nil?
       Solargraph::Server.set :public_folder, options[:files] unless options[:files].nil?
       my_pid = nil
       Solargraph::Server.run! do
-        STDERR.puts "Solargraph server pid=#{Process.pid} port=#{port}"
+        # This line should not be necessary with WEBrick
+        #STDERR.puts "Solargraph server pid=#{Process.pid} port=#{port}"
         my_pid = Process.pid
         Signal.trap("INT") do
           Solargraph::Server.stop!

data/lib/solargraph/suggestion.rb

@@ -121,7 +121,7 @@ module Solargraph
 
     # @param pin [Solargraph::Pin::Base]
     def self.pull pin, return_type = nil
-      Suggestion.new(pin.name, insert: pin.name.gsub(/=/, ' = '), kind: pin.kind, docstring: pin.docstring, detail: pin.namespace, arguments: pin.parameters, path: pin.path, return_type: return_type, location: pin.location)
+      Suggestion.new(pin.name, insert: pin.name.gsub(/=/, ' = '), kind: pin.kind, docstring: pin.docstring, detail: pin.namespace, arguments: pin.parameters, path: pin.path, return_type: return_type || pin.return_type, location: pin.location)
     end
   end
 

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.14.2'
+  VERSION = '0.14.3'
 end

data/lib/solargraph/yard_map.rb

@@ -20,9 +20,9 @@ module Solargraph
       used = []
       @required = required
       @namespace_yardocs = {}
-      if @required.include?('bundler/setup')
-        yardocs.concat bundled_gem_yardocs
-      else
+      #if @required.include?('bundler/setup') or @required.include?('bundler/require')
+      #  yardocs.concat bundled_gem_yardocs
+      #else
         @required.each do |r|
           if workspace.nil? or !File.exist?(File.join workspace, 'lib', "#{r}.rb")
             g = r.split('/').first
@@ -39,7 +39,7 @@ module Solargraph
             end
           end
         end
-      end
+      #end
       yardocs.push File.join(Dir.home, '.solargraph', 'cache', '2.0.0', 'yardoc')
       #yardocs.push File.join(Dir.home, '.solargraph', 'cache', '2.0.0', 'yardoc-stdlib')
       yardocs.uniq!
@@ -122,19 +122,22 @@ module Solargraph
       consts.each { |c|
         detail = nil
         kind = nil
+        return_type = nil
         if c.kind_of?(YARD::CodeObjects::ClassObject)
           detail = 'Class'
           kind = Suggestion::CLASS
+          return_type = "Class<#{c.to_s}>"
         elsif c.kind_of?(YARD::CodeObjects::ModuleObject)
           detail = 'Module'
           kind = Suggestion::MODULE
+          return_type = "Module<#{c.to_s}>"
         elsif c.kind_of?(YARD::CodeObjects::ConstantObject)
           detail = 'Constant'
           kind = Suggestion::CONSTANT
         else
           next
         end
-        result.push Suggestion.new(c.to_s.split('::').last, detail: detail, kind: kind, docstring: c.docstring)
+        result.push Suggestion.new(c.to_s.split('::').last, detail: c.to_s, kind: kind, docstring: c.docstring, return_type: return_type)
       }
       cache.set_constants(namespace, scope, result)
       result

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.3
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-26 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -86,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -208,6 +194,7 @@ files:
 - lib/solargraph/pin/instance_variable.rb
 - lib/solargraph/pin/local_variable.rb
 - lib/solargraph/pin/method.rb
+- lib/solargraph/pin/namespace.rb
 - lib/solargraph/pin/plugin/method.rb
 - lib/solargraph/pin/symbol.rb
 - lib/solargraph/plugin.rb
@@ -228,7 +215,6 @@ files:
 - lib/solargraph/views/search.erb
 - lib/solargraph/yard_map.rb
 - lib/solargraph/yard_map/cache.rb
-- lib/solargraph/yard_methods.rb
 - lib/yard-solargraph.rb
 - yardoc/2.0.0.tar.gz
 homepage: http://solargraph.org

data/lib/solargraph/yard_methods.rb

@@ -1,56 +0,0 @@
-module Solargraph
-  module YardMethods
-    def yard_options
-      if @yard_options.nil?
-        @yard_options = {
-          include: [],
-          exclude: [],
-          flags: []
-        }
-        unless workspace.nil?
-          yardopts_file = File.join(workspace, '.yardopts')
-          if File.exist?(yardopts_file)
-            yardopts = File.read(yardopts_file)
-            yardopts.lines.each { |line|
-              arg = line.strip
-              if arg.start_with?('--exclude')
-                @yard_options[:exclude].concat arg.split(/[\s]+/)[1..-1]
-              elsif arg.start_with?('-')
-                @yard_options[:flags].push arg
-              else
-                @yard_options[:include].push arg
-              end
-            }
-          end
-        end
-        @yard_options[:include].concat ['app/**/*.rb', 'lib/**/*.rb'] if @yard_options[:include].empty?
-      end
-      @yard_options
-    end
-
-    def yard_files
-      if @yard_files.nil?
-        @yard_files = []
-        yard_options[:include].each do |glob|
-          if File.file?(glob)
-            @yard_files.push File.realpath(glob)
-          elsif File.directory?(glob)
-            @yard_files.concat Dir["#{glob}/**/*"].map{ |f| File.realpath(f) }
-          else
-            @yard_files.concat Dir[glob].map{ |f| File.realpath(f) }
-          end
-        end
-        yard_options[:exclude].each do |glob|
-          if File.file?(glob)
-            @yard_files.delete File.realpath(glob)
-          elsif File.directory?(glob)
-            @yard_files -= Dir["#{glob}/**/*"].map{ |f| File.realpath(f) }
-          else
-            @yard_files -= Dir[glob].map{ |f| File.realpath(f) }
-          end
-        end
-      end
-      @yard_files
-    end
-  end
-end