solargraph 0.20.0 → 0.21.0

data/lib/solargraph/source/mapper.rb

@@ -249,9 +249,14 @@ module Solargraph
                   end
                 else
                   c.children.each do |u|
-                    here = get_node_start_position(c)
-                    blk = get_block_pin(here)
-                    @locals.push Solargraph::Pin::MethodParameter.new(get_node_location(u), fqn || '', "#{u.children[0]}", docstring_for(c), blk)
+                    # here = get_node_start_position(c)
+                    # blk = get_block_pin(here)
+                    # @locals.push Solargraph::Pin::MethodParameter.new(get_node_location(u), fqn || '', "#{u.children[0]}", docstring_for(c), blk)
+                    here = get_node_start_position(u)
+                    context = get_named_path_pin(here)
+                    block = get_block_pin(here)
+                    presence = Source::Range.new(here, block.location.range.ending)
+                    @locals.push Solargraph::Pin::MethodParameter.new(get_node_location(u), fqn, u.children[0].to_s, docstring_for(c), resolve_node_signature(u.children[1]), infer_literal_node_type(u.children[1]), context, block, presence)
                   end
                 end
               elsif c.type == :block

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.20.0'
+  VERSION = '0.21.0'
 end

data/lib/solargraph/workspace.rb

@@ -121,10 +121,10 @@ module Solargraph
       source_hash.clear
       unless directory.nil?
         size = config.calculated.length
-        raise WorkspaceTooLargeError.new(size) if size > MAX_WORKSPACE_SIZE
+        raise WorkspaceTooLargeError.new(size) if config.max_files > 0 and size > config.max_files
+
         config.calculated.each do |filename|
-          src = Solargraph::Source.load(filename)
-          source_hash[filename] = src
+          source_hash[filename] = Solargraph::Source.load(filename)
         end
       end
       @stime = Time.now

data/lib/solargraph/workspace/config.rb

@@ -13,7 +13,7 @@ module Solargraph
       def initialize workspace = nil
         @workspace = workspace
         include_globs = ['**/*.rb']
-        exclude_globs = ['spec/**/*', 'test/**/*']
+        exclude_globs = ['spec/**/*', 'test/**/*', 'vendor/**/*']
         unless @workspace.nil?
           sfile = File.join(@workspace, '.solargraph.yml')
           if File.file?(sfile)
@@ -26,10 +26,11 @@ module Solargraph
         @raw_data ||= {}
         @raw_data['include'] ||= include_globs
         @raw_data['exclude'] ||= exclude_globs
-        @raw_data['reporters'] ||= []
+        @raw_data['require'] ||= []
         @raw_data['domains'] ||= []
-        @raw_data['required'] ||= []
+        @raw_data['reporters'] ||= %w[rubocop require_not_found]
         @raw_data['plugins'] ||= []
+        @raw_data['max_files'] ||= Workspace::MAX_WORKSPACE_SIZE
         included
         excluded
       end
@@ -63,7 +64,7 @@ module Solargraph
       end
 
       def required
-        raw_data['required']
+        raw_data['require']
       end
 
       def plugins
@@ -74,8 +75,8 @@ module Solargraph
         raw_data['reporters']
       end
 
-      def require_paths
-        @require_paths ||= generate_require_paths
+      def max_files
+        raw_data['max_files']
       end
 
       private
@@ -110,9 +111,6 @@ module Solargraph
       def glob_to_directory glob
         glob.gsub(/(\/\*|\/\*\*\/\*\*?)$/, '')
       end
-
-      def generate_require_paths
-      end
     end
   end
 end

data/lib/solargraph/yard_map.rb

@@ -1,5 +1,4 @@
 require 'yard'
-require 'bundler'
 
 module Solargraph
   class YardMap
@@ -26,7 +25,7 @@ module Solargraph
       @required = required.clone
       @namespace_yardocs = {}
       @gem_paths = {}
-      process_gem_paths
+      process_requires
       yardocs.push CoreDocs.yardoc_file
       yardocs.uniq!
       yardocs.delete_if{ |y| y.start_with? workspace.directory } unless workspace.nil? or workspace.directory.nil?
@@ -92,7 +91,7 @@ module Solargraph
       found
     end
 
-    # @return [Array<Suggestion>]
+    # @return [Array<Solargraph::Pin::Base>]
     def get_constants namespace , scope = ''
       cached = cache.get_constants(namespace, scope)
       return cached unless cached.nil?
@@ -113,26 +112,22 @@ module Solargraph
         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: c.to_s, kind: kind, docstring: c.docstring, return_type: return_type, location: object_location(c))
         result.push Pin::YardObject.new(c, object_location(c))
       }
       cache.set_constants(namespace, scope, result)
       result
     end
 
-    # @return [Array<Suggestion>]
+    # @return [Array<Solargraph::Pin::Base>]
     def get_methods namespace, scope = '', visibility: [:public]
       return [] if namespace == '' and scope == ''
       cached = cache.get_methods(namespace, scope, visibility)
@@ -160,7 +155,7 @@ module Solargraph
       meths
     end
 
-    # @return [Array<Suggestion>]
+    # @return [Array<Solargraph::Pin::Base>]
     def get_instance_methods namespace, scope = '', visibility: [:public]
       return [] if namespace == '' and scope == ''
       cached = cache.get_instance_methods(namespace, scope, visibility)
@@ -173,14 +168,14 @@ module Solargraph
             ns = nil
             ns = find_first_resolved_object(yard, namespace, scope)
             unless ns.nil?
-              ns.meths(scope: :instance, visibility: visibility).each { |m|
+              ns.meths(scope: :instance, visibility: visibility).each do |m|
                 n = m.to_s.split(/[\.#]/).last
                 # HACK: Special treatment for #initialize
                 next if n == 'initialize' and !visibility.include?(:private)
                 if (namespace == 'Kernel' or !m.to_s.start_with?('Kernel#')) and !m.docstring.to_s.include?(':nodoc:')
                   meths.push Pin::YardObject.new(m, object_location(m))
                 end
-              }
+              end
               if ns.kind_of?(YARD::CodeObjects::ClassObject) and namespace != 'Object'
                 unless ns.nil?
                   meths += get_instance_methods(ns.superclass.to_s)
@@ -267,52 +262,22 @@ module Solargraph
       get_constants '', ''
     end
 
-    def process_gem_paths
-      if !has_bundle? or workspace.nil? or ENV['BUNDLE_GEMFILE'] == File.join(workspace.directory, 'Gemfile')
-        # Trust the current environment if Bundler is not being used or the
-        # workspace's Gemfile was loaded
-        process_requires
-      else
-        # Temporarily load the workspace in a clean environment to identify
-        # its gems
-        processed = false
-        Bundler.with_clean_env do
-          Bundler.environment.chdir(workspace.directory) do
-            begin
-              Bundler.reset!
-              process_requires
-              processed = true
-            rescue Exception => e
-              STDERR.puts "#{e.class}: #{e.message}"
-            end
-          end
-        end
-        Bundler.reset!
-        process_requires unless processed
-      end
-    end
-
     def process_requires
       tried = []
       unresolved_requires.clear
       required.each do |r|
-        next if !workspace.nil? and workspace.would_require?(r)
         begin
-          name = r.split('/').first
-          next if name.nil?
-          spec = Gem::Specification.find_by_name(name)
-          if spec.nil?
-            unresolved_requires.push r
-            next
-          end
+          spec = Gem::Specification.find_by_path(r) || Gem::Specification.find_by_name(r.split('/').first)
           ver = spec.version.to_s
           ver = ">= 0" if ver.empty?
           add_gem_dependencies spec
+          next if !workspace.nil? and workspace.would_require?(r)
           yd = YARD::Registry.yardoc_file_for_gem(spec.name, ver)
           @gem_paths[spec.name] = spec.full_gem_path
           unresolved_requires.push r if yd.nil?
           yardocs.unshift yd unless yd.nil? or yardocs.include?(yd)
         rescue Gem::LoadError => e
+          next if !workspace.nil? and workspace.would_require?(r)
           unresolved_requires.push r
         end
       end
@@ -364,9 +329,5 @@ module Solargraph
       end
       nil
     end
-
-    def has_bundle?
-      !workspace.nil? and !workspace.directory.nil? and File.exist?(File.join workspace.directory, 'Gemfile')
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -44,20 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.4
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -72,20 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -189,39 +161,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.52'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -236,34 +208,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: debase
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: ruby-debug-ide
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
 description: IDE tools for code completion and inline documentation
 email: admin@castwide.com
 executables:
@@ -331,6 +275,7 @@ files:
 - lib/solargraph/language_server/request.rb
 - lib/solargraph/language_server/symbol_kinds.rb
 - lib/solargraph/language_server/transport.rb
+- lib/solargraph/language_server/transport/data_reader.rb
 - lib/solargraph/language_server/transport/socket.rb
 - lib/solargraph/language_server/uri_helpers.rb
 - lib/solargraph/library.rb
@@ -366,7 +311,6 @@ files:
 - lib/solargraph/plugin/canceler.rb
 - lib/solargraph/plugin/process.rb
 - lib/solargraph/plugin/runtime.rb
-- lib/solargraph/server.rb
 - lib/solargraph/server_methods.rb
 - lib/solargraph/shell.rb
 - lib/solargraph/source.rb
@@ -378,7 +322,6 @@ files:
 - lib/solargraph/source/position.rb
 - lib/solargraph/source/range.rb
 - lib/solargraph/source/updater.rb
-- lib/solargraph/suggestion.rb
 - lib/solargraph/version.rb
 - lib/solargraph/views/_method.erb
 - lib/solargraph/views/_name_type_tag.erb
@@ -405,7 +348,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/solargraph/server.rb

@@ -1,212 +0,0 @@
-require 'sinatra/base'
-require 'thread'
-require 'yard'
-require 'open3'
-require 'shellwords'
-
-module Solargraph
-  class Server < Sinatra::Base
-
-    set :port, 7657
-    set :server, :webrick
-
-    # @@api_hash = {}
-    @@semaphore = Mutex.new
-
-    @@library = Solargraph::Library.new
-
-    after do
-      GC.start
-    end
-
-    def self.wait
-      @@semaphore.lock
-      @@semaphore.unlock
-    end
-
-    post '/diagnostics' do
-      content_type :json
-      severities = {
-        'refactor' => 4,
-        'convention' => 3,
-        'warning' => 2,
-        'error' => 1,
-        'fatal' => 1
-      }
-      begin
-        filename = params['filename']
-        text = params['text']
-        o, e, s = Open3.capture3("bundle exec rubocop -f j -s #{Shellwords.escape(filename)}", stdin_data: text)
-        STDERR.puts e unless e.nil? or e.empty?
-        resp = JSON.parse(o)
-        diagnostics = []
-        if resp['summary']['offense_count'] > 0
-          resp['files'].each do |file|
-            file['offenses'].each do |off|
-              diag = {
-                range: {
-                  start: {
-                    line: off['location']['start_line'] - 1,
-                    character: off['location']['start_column'] - 1
-                  },
-                  end: {
-                    line: off['location']['last_line'] - 1,
-                    character: off['location']['last_column']
-                  }
-                },
-                # 1 = Error, 2 = Warning, 3 = Information, 4 = Hint
-                severity: severities[off['severity']],
-                source: off['cop_name'],
-                message: off['message'].gsub(/^#{off['cop_name']}\:/, '')
-              }
-              diagnostics.push diag
-            end
-          end
-        end
-        { "status" => "ok", "data" => diagnostics }.to_json
-      rescue Exception => e
-        send_exception e
-      end
-    end
-
-    post '/prepare' do
-      content_type :json
-      begin
-        workspace = params['workspace'].to_s.gsub(/\\/, '/')
-        STDERR.puts "Preparing #{workspace}"
-        @@library = Solargraph::Library.load(workspace) unless workspace.empty?
-        { "status" => "ok"}.to_json
-      rescue Exception => e
-        send_exception e
-      end
-    end
-
-    post '/update' do
-      content_type :json
-      begin
-        filename = params['filename'].to_s.gsub(/\\/, '/')
-        @@library.open filename, File.read(filename), 0
-        { "status" => "ok"}.to_json
-      rescue Exception => e
-        send_exception e
-      end
-    end
-
-    post '/suggest' do
-      content_type :json
-      begin
-        filename = params['filename'].to_s.gsub(/\\/, '/')
-        @@library.open filename, params['text'], 0
-        @@library.checkout filename
-        @@library.refresh
-        with_all = params['all'] == '1' ? true : false
-        completion = @@library.completions_at(filename, params['line'].to_i, params['column'].to_i)
-        JSON.generate({ "status" => "ok", "suggestions" => completion.pins.map{|s| Suggestion.pull(s).as_json(all: with_all)} })
-      rescue Exception => e
-        send_exception e
-      end
-    end
-
-    post '/signify' do
-      content_type :json
-      begin
-        filename = params['filename'].to_s.gsub(/\\/, '/')
-        @@library.open filename, params['text'], 0
-        @@library.checkout filename
-        @@library.refresh
-        sugg = @@library.signatures_at(filename, params['line'].to_i, params['column'].to_i)
-        { "status" => "ok", "suggestions" => sugg.map{|s| Suggestion.pull(s).as_json(all: true)} }.to_json
-      rescue Exception => e
-        send_exception e
-      end
-    end
-
-    post '/resolve' do
-      content_type :json
-      begin
-        result = @@library.get_path_pins(params['path'])
-        { "status" => "ok", "suggestions" => result.map{|s| Suggestion.pull(s).as_json(all: true)} }.to_json
-      rescue Exception => e
-        send_exception e
-      end
-    end
-
-    post '/define' do
-      content_type :json
-      begin
-        filename = params['filename'].to_s.gsub(/\\/, '/')
-        @@library.open filename, params['text'], 0
-        @@library.checkout filename
-        sugg = @@library.definitions_at(filename, params['line'].to_i, params['column'].to_i)
-        { "status" => "ok", "suggestions" => sugg.map{|s| Suggestion.pull(s).as_json(all: true)} }.to_json
-      rescue Exception => e
-        send_exception e
-      end
-    end
-
-    # @deprecated Use /define instead.
-    post '/hover' do
-      content_type :json
-      begin
-        filename = params['filename'].to_s.gsub(/\\/, '/')
-        @@library.open filename, params['text'], 0
-        @@library.refresh
-        @@library.checkout filename
-        sugg = @@library.definitions_at(filename, params['line'].to_i, params['column'].to_i)
-        { "status" => "ok", "suggestions" => sugg.map{|s| Suggestion.pull(s).as_json(all: true)} }.to_json
-      rescue Exception => e
-        send_exception e
-      end
-    end
-
-    get '/search' do
-      @results = @@library.search(params['query'])
-      erb :search, locals: { query: params['query'], results: @results }
-    end
-
-    get '/document' do
-      @objects = @@library.document(params['query'])
-      erb :document, locals: { objects: @objects }
-    end
-
-    def htmlify text
-      rdoc_to_html text
-    end
-
-    def rdoc_to_html text
-      h = Helpers.new
-      h.html_markup_rdoc(text)
-    end
-
-    def ruby_to_html code
-      h = Helpers.new
-      h.html_markup_ruby(code)
-    end
-
-    def send_exception e
-      STDERR.puts e
-      STDERR.puts e.backtrace.join("\n")
-      { "status" => "err", "message" => e.message + "\n" + e.backtrace.join("\n") }.to_json
-    end
-
-    class Helpers
-      include YARD::Templates::Helpers::HtmlHelper
-
-      attr_accessor :object
-      attr_accessor :serializer
-
-      def url_for(object)
-        '.'
-      end
-
-      def options
-        @options ||= YARD::Templates::TemplateOptions.new
-      end
-
-      # HACK: The linkify method just returns the arguments as plain text
-      def linkify *args
-        args.join(', ')
-      end
-    end
-  end
-end