solargraph 0.17.4 → 0.18.0

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.17.4'
+  VERSION = '0.18.0'
 end

data/lib/solargraph/workspace.rb

@@ -0,0 +1,105 @@
+module Solargraph
+  # A workspace consists of the files in a project's directory and the
+  # project's configuration. It provides a Source for each file to be used
+  # in an associated Library or ApiMap.
+  #
+  class Workspace
+    autoload :Config, 'solargraph/workspace/config'
+
+    # @return [String]
+    attr_reader :directory
+
+    def initialize directory
+      @directory = directory
+      load_sources
+    end
+
+    # @return [Solargraph::Workspace::Config]
+    def config reload = false
+      @config = Solargraph::Workspace::Config.new(directory) if @config.nil? or reload
+      @config
+    end
+
+    # Merge the source. A merge will update the existing source for the file
+    # or add it to the sources if the workspace is configured to include it.
+    # The source is ignored if the configuration excludes it.
+    #
+    # @param source [Solargraph::Source]
+    # @return [Boolean] True if the source was added to the workspace
+    def merge source
+      return false unless config(true).calculated.include?(source.filename)
+      source_hash[source.filename] = source
+      true
+    end
+
+    # Determine whether a file would be merged into the workspace.
+    #
+    # @param filename [String]
+    # @return [Boolean]
+    def would_merge? filename
+      Solargraph::Workspace::Config.new(directory).calculated.include?(filename)
+    end
+
+    # Remove a source from the workspace. The source will not be removed if
+    # its file exists and the workspace is configured to include it.
+    #
+    # @param source [Solargraph::Source]
+    # @return [Boolean] True if the source was removed from the workspace
+    def remove source
+      return false if config(true).calculated.include?(source.filename)
+      # @todo This method PROBABLY doesn't care if the file is actually here
+      source_hash.delete source.filename
+      true
+    end
+
+    # @return [Array<String>]
+    def filenames
+      source_hash.keys
+    end
+
+    # @return [Array<Solargraph::Source>]
+    def sources
+      source_hash.values
+    end
+
+    # @return [Boolean]
+    def has_source? source
+      source_hash.has_value?(source)
+    end
+
+    # @return [Boolean]
+    def has_file? filename
+      source_hash.has_key?(filename)
+    end
+
+    # Get a source by its filename.
+    #
+    # @return [Solargraph::Source]
+    def source filename
+      source_hash[filename]
+    end
+
+    def stime
+      return @stime if source_hash.empty?
+      @stime = source_hash.values.sort{|a, b| a.stime <=> b.stime}.last.stime
+    end
+
+    private
+
+    # @return [Hash<String, Solargraph::Source>]
+    def source_hash
+      @source_hash ||= {}
+    end
+
+    def load_sources
+      source_hash.clear
+      unless directory.nil?
+        config(true).calculated.each do |filename|
+          src = Solargraph::Source.load(filename)
+          source_hash[filename] = src
+        end
+      end
+      @stime = Time.now
+    end
+  end
+end

data/lib/solargraph/{api_map → workspace}/config.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 module Solargraph
-  class ApiMap
+  class Workspace
     class Config
       # @return [String]
       attr_reader :workspace

data/lib/solargraph/yard_map.rb

@@ -26,6 +26,7 @@ module Solargraph
       process_gem_paths
       yardocs.push CoreDocs.yardoc_file
       yardocs.uniq!
+      yardocs.delete_if{ |y| y.start_with? workspace.directory } unless workspace.nil? or workspace.directory.nil?
       yardocs.each do |y|
         load_yardoc y
         YARD::Registry.all(:class, :module).each do |ns|
@@ -117,7 +118,8 @@ module Solargraph
         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 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
@@ -125,6 +127,7 @@ module Solargraph
 
     # @return [Array<Suggestion>]
     def get_methods namespace, scope = '', visibility: [:public]
+      return [] if namespace == '' and scope == ''
       cached = cache.get_methods(namespace, scope, visibility)
       return cached unless cached.nil?
       meths = []
@@ -140,23 +143,26 @@ module Solargraph
                 label = "#{n}"
                 args = get_method_args(m)
                 kind = (m.is_attribute? ? Suggestion::FIELD : Suggestion::METHOD)
-                meths.push Suggestion.new(label, insert: n, kind: kind, docstring: m.docstring, code_object: m, detail: "#{ns}", location: object_location(m), arguments: args)
+                # meths.push Suggestion.new(label, insert: n, kind: kind, docstring: m.docstring, code_object: m, detail: "#{ns}", location: object_location(m), arguments: args)
+                meths.push Pin::YardObject.new(m, object_location(m))
               }
               # Collect superclass methods
               if ns.kind_of?(YARD::CodeObjects::ClassObject) and !ns.superclass.nil?
                 meths += get_methods ns.superclass.to_s, '', visibility: [:public, :protected] unless ['Object', 'BasicObject', ''].include?(ns.superclass.to_s)
               end
-              if ns.kind_of?(YARD::CodeObjects::ClassObject) and namespace != 'Class'
-                meths += get_instance_methods('Class')
-                yard = load_yardoc(y)
-                i = yard.at("#{ns}#initialize")
-                unless i.nil?
-                  meths.delete_if{|m| m.label == 'new'}
-                  label = "#{i}"
-                  args = get_method_args(i)
-                  meths.push Suggestion.new('new', kind: Suggestion::METHOD, docstring: i.docstring, code_object: i, detail: "#{ns}", location: object_location(i), arguments: args)
-                end
-              end
+              # if ns.kind_of?(YARD::CodeObjects::ClassObject) and namespace != 'Class'
+              #   meths += get_instance_methods('Class')
+              #   yard = load_yardoc(y)
+              #   i = yard.at("#{ns}#initialize")
+              #   unless i.nil?
+              #     meths.delete_if{|m| m.name == 'new'}
+              #     label = "#{i}"
+              #     args = get_method_args(i)
+              #     tmp = Solargraph::Pin::YardObject.new(i, object_location(i))
+              #     tmp.instance_variable_set(:@name, 'new')
+              #     meths.push tmp
+              #   end
+              # end
             end
           end
         end
@@ -167,6 +173,7 @@ module Solargraph
 
     # @return [Array<Suggestion>]
     def get_instance_methods namespace, scope = '', visibility: [:public]
+      return [] if namespace == '' and scope == ''
       cached = cache.get_instance_methods(namespace, scope, visibility)
       return cached unless cached.nil?
       meths = []
@@ -179,8 +186,8 @@ module Solargraph
             unless ns.nil?
               ns.meths(scope: :instance, visibility: visibility).each { |m|
                 n = m.to_s.split(/[\.#]/).last
-                # @todo Return method names like []?
-                #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:')
+                # 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:')
                   label = "#{n}"
                   args = get_method_args(m)
@@ -189,7 +196,8 @@ module Solargraph
                   if Solargraph::CoreFills::CUSTOM_RETURN_TYPES.has_key?(m.path)
                     rt = Solargraph::CoreFills::CUSTOM_RETURN_TYPES[m.path]
                   end
-                  meths.push Suggestion.new(label, insert: "#{n.gsub(/=$/, ' = ')}", kind: kind, docstring: m.docstring, code_object: m, detail: m.namespace, location: object_location(m), arguments: args, return_type: rt)
+                  # meths.push Suggestion.new(label, insert: "#{n.gsub(/=$/, ' = ')}", kind: kind, docstring: m.docstring, code_object: m, detail: m.namespace, location: object_location(m), arguments: args, return_type: rt)
+                  meths.push Pin::YardObject.new(m, object_location(m))
                 end
               }
               if ns.kind_of?(YARD::CodeObjects::ClassObject) and namespace != 'Object'
@@ -200,6 +208,11 @@ module Solargraph
               ns.instance_mixins.each do |m|
                 meths += get_instance_methods(m.to_s) unless m.to_s == 'Kernel'
               end
+              # HACK: Now get the #initialize method for private requests
+              if visibility.include?(:private)
+                init = ns.meths(scope: :instance).select{|m| m.to_s.split(/[\.#]/).last == 'initialize'}.first
+                meths.push Pin::YardObject.new(init, object_location(init)) unless init.nil?
+              end
             end
           end
         end
@@ -234,7 +247,8 @@ module Solargraph
               meths = obj.meths(scope: [:instance]).keep_if{|m| m.name.to_s == parts[1]}
               meths.each do |m|
                 args = get_method_args(m)
-                result.push Solargraph::Suggestion.new(m.name, kind: 'Method', detail: m.path, code_object: m, arguments: args, location: object_location(m))
+                # result.push Solargraph::Suggestion.new(m.name, kind: 'Method', detail: m.path, code_object: m, arguments: args, location: object_location(m))
+                result.push Pin::YardObject.new(m, object_location(m))
               end
             end
           else
@@ -242,7 +256,8 @@ module Solargraph
               args = []
               args = get_method_args(obj) if obj.kind_of?(YARD::CodeObjects::MethodObject)
               kind = kind_of_object(obj)
-              result.push Solargraph::Suggestion.new(obj.name, kind: kind, detail: obj.path, code_object: obj, arguments: args, location: object_location(obj))
+              # result.push Solargraph::Suggestion.new(obj.name, kind: kind, detail: obj.path, code_object: obj, arguments: args, location: object_location(obj))
+              result.push Pin::YardObject.new(obj, object_location(obj))
             end
           end
         end
@@ -314,42 +329,49 @@ module Solargraph
     end
 
     def process_gem_paths
-      if !has_bundle?
+      if !has_bundle? or ENV['BUNDLE_GEMFILE'] == File.join(workspace.directory, 'Gemfile')
         process_requires
       else
+        processed = false
         Bundler.with_clean_env do
-          Bundler.environment.chdir(workspace) do
-            #Bundler.environment.gems.to_a.each do |g|
-            #  @gem_paths[g.name] = g.full_gem_path
-            #end
-            process_requires
+          Bundler.environment.chdir(workspace.directory) do
+            begin
+              Bundler.reset!
+              # Bundler.setup
+              processed = true
+              process_requires
+            rescue Exception => e
+              STDERR.puts "#{e.class}: #{e.message}"
+            end
           end
         end
+        Bundler.reset!
+        process_requires unless processed
       end
     end
 
     def process_requires
+      tried = []
       required.each do |r|
-        next if !workspace.nil? and File.exist?(File.join workspace, 'lib', "#{r}.rb")
-        spec = Gem::Specification.find_by_path(r)
         begin
-          spec = Gem::Specification.find_by_name(r) if spec.nil?
-        rescue Gem::LoadError => e
-          # @todo How to handle this?
-        end
-        if spec.nil?
-          STDERR.puts "Required path not found (pgp): #{r}"
-        else
-          @gem_paths[spec.name] = spec.full_gem_path
+          spec = Gem::Specification.find_by_name(r.split('/').first)
+          next if spec.nil?
+          ver = spec.version.to_s
+          ver = ">= 0" if ver.empty?
           add_gem_dependencies spec
-          result = YARD::Registry.yardoc_file_for_gem(spec.name)
-          yardocs.unshift result unless result.nil? or yardocs.include?(result)
+          yd = YARD::Registry.yardoc_file_for_gem(spec.name, ver)
+          @gem_paths[spec.name] = spec.full_gem_path
+          yardocs.unshift yd unless yd.nil? or yardocs.include?(yd)
+        rescue Gem::LoadError => e
+          # STDERR.puts "LoadError on #{r}"
         end
       end
     end
 
     def add_gem_dependencies spec
       (spec.dependencies - spec.development_dependencies).each do |dep|
+        spec = Gem::Specification.find_by_name(dep.name)
+        @gem_paths[spec.name] = spec.full_gem_path unless spec.nil?
         gy = YARD::Registry.yardoc_file_for_gem(dep.name)
         if gy.nil?
           STDERR.puts "Required path not found: #{dep.name}"
@@ -395,7 +417,7 @@ module Solargraph
     end
 
     def has_bundle?
-      !workspace.nil? and File.exist?(File.join workspace, 'Gemfile')
+      !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.17.4
+  version: 0.18.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -86,6 +86,114 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.52'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.52'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+- !ruby/object:Gem::Dependency
+  name: reverse_markdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.3
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.4
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -176,30 +284,78 @@ files:
 - lib/solargraph.rb
 - lib/solargraph/api_map.rb
 - lib/solargraph/api_map/cache.rb
-- lib/solargraph/api_map/config.rb
-- lib/solargraph/api_map/source.rb
+- lib/solargraph/api_map/completion.rb
 - lib/solargraph/api_map/source_to_yard.rb
-- lib/solargraph/code_map.rb
 - lib/solargraph/core_fills.rb
+- lib/solargraph/language_server.rb
+- lib/solargraph/language_server/completion_item_kinds.rb
+- lib/solargraph/language_server/error_codes.rb
+- lib/solargraph/language_server/host.rb
+- lib/solargraph/language_server/message.rb
+- lib/solargraph/language_server/message/base.rb
+- lib/solargraph/language_server/message/cancel_request.rb
+- lib/solargraph/language_server/message/client.rb
+- lib/solargraph/language_server/message/client/register_capability.rb
+- lib/solargraph/language_server/message/completion_item.rb
+- lib/solargraph/language_server/message/completion_item/resolve.rb
+- lib/solargraph/language_server/message/exit_notification.rb
+- lib/solargraph/language_server/message/extended.rb
+- lib/solargraph/language_server/message/extended/document.rb
+- lib/solargraph/language_server/message/extended/search.rb
+- lib/solargraph/language_server/message/initialize.rb
+- lib/solargraph/language_server/message/initialized.rb
+- lib/solargraph/language_server/message/method_not_found.rb
+- lib/solargraph/language_server/message/method_not_implemented.rb
+- lib/solargraph/language_server/message/shutdown.rb
+- lib/solargraph/language_server/message/text_document.rb
+- lib/solargraph/language_server/message/text_document/base.rb
+- lib/solargraph/language_server/message/text_document/completion.rb
+- lib/solargraph/language_server/message/text_document/definition.rb
+- lib/solargraph/language_server/message/text_document/did_change.rb
+- lib/solargraph/language_server/message/text_document/did_close.rb
+- lib/solargraph/language_server/message/text_document/did_open.rb
+- lib/solargraph/language_server/message/text_document/did_save.rb
+- lib/solargraph/language_server/message/text_document/document_symbol.rb
+- lib/solargraph/language_server/message/text_document/formatting.rb
+- lib/solargraph/language_server/message/text_document/hover.rb
+- lib/solargraph/language_server/message/text_document/on_type_formatting.rb
+- lib/solargraph/language_server/message/text_document/signature_help.rb
+- lib/solargraph/language_server/message/workspace.rb
+- lib/solargraph/language_server/message/workspace/did_change_configuration.rb
+- lib/solargraph/language_server/message/workspace/did_change_watched_files.rb
+- lib/solargraph/language_server/message/workspace/workspace_symbol.rb
+- lib/solargraph/language_server/symbol_kinds.rb
+- lib/solargraph/language_server/transport.rb
+- lib/solargraph/language_server/transport/socket.rb
+- lib/solargraph/language_server/uri_helpers.rb
+- lib/solargraph/library.rb
 - lib/solargraph/live_map.rb
 - lib/solargraph/live_map/cache.rb
 - lib/solargraph/node_methods.rb
+- lib/solargraph/page.rb
 - lib/solargraph/pin.rb
 - lib/solargraph/pin/attribute.rb
 - lib/solargraph/pin/base.rb
 - lib/solargraph/pin/base_variable.rb
+- lib/solargraph/pin/block_parameter.rb
 - lib/solargraph/pin/class_variable.rb
 - lib/solargraph/pin/constant.rb
+- lib/solargraph/pin/conversions.rb
 - lib/solargraph/pin/directed.rb
 - lib/solargraph/pin/directed/attribute.rb
 - lib/solargraph/pin/directed/method.rb
 - lib/solargraph/pin/global_variable.rb
+- lib/solargraph/pin/helper.rb
 - lib/solargraph/pin/instance_variable.rb
+- lib/solargraph/pin/keyword.rb
 - lib/solargraph/pin/local_variable.rb
 - lib/solargraph/pin/method.rb
+- lib/solargraph/pin/method_parameter.rb
 - lib/solargraph/pin/namespace.rb
+- lib/solargraph/pin/parameter.rb
 - lib/solargraph/pin/plugin/method.rb
 - lib/solargraph/pin/symbol.rb
+- lib/solargraph/pin/yard_object.rb
 - lib/solargraph/plugin.rb
 - lib/solargraph/plugin/base.rb
 - lib/solargraph/plugin/canceler.rb
@@ -208,6 +364,11 @@ files:
 - lib/solargraph/server.rb
 - lib/solargraph/server_methods.rb
 - lib/solargraph/shell.rb
+- lib/solargraph/source.rb
+- lib/solargraph/source/flawed_builder.rb
+- lib/solargraph/source/fragment.rb
+- lib/solargraph/source/position.rb
+- lib/solargraph/source/range.rb
 - lib/solargraph/suggestion.rb
 - lib/solargraph/version.rb
 - lib/solargraph/views/_method.erb
@@ -215,6 +376,8 @@ files:
 - lib/solargraph/views/document.erb
 - lib/solargraph/views/layout.erb
 - lib/solargraph/views/search.erb
+- lib/solargraph/workspace.rb
+- lib/solargraph/workspace/config.rb
 - lib/solargraph/yard_map.rb
 - lib/solargraph/yard_map/cache.rb
 - lib/solargraph/yard_map/core_docs.rb