solargraph 0.26.1 → 0.27.0

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.26.1'
+  VERSION = '0.27.0'
 end

data/lib/solargraph/workspace.rb

@@ -10,7 +10,7 @@ module Solargraph
     attr_reader :directory
 
     # @param directory [String]
-    def initialize directory, config = nil
+    def initialize directory = nil, config = nil
       # @todo Convert to an absolute path?
       @directory = directory
       @directory = nil if @directory == ''
@@ -48,12 +48,11 @@ module Solargraph
     # 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]
+    # @param filename [String]
     # @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
+    def remove filename
+      return false if config(true).calculated.include?(filename)
+      source_hash.delete filename
       true
     end
 
@@ -67,11 +66,6 @@ module Solargraph
       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)
@@ -84,14 +78,6 @@ module Solargraph
       source_hash[filename]
     end
 
-    # The time of the last workspace synchronization.
-    #
-    # @return [Time]
-    def stime
-      return @stime if source_hash.empty?
-      @stime = source_hash.values.sort{|a, b| a.stime <=> b.stime}.last.stime
-    end
-
     # The require paths associated with the workspace.
     #
     # @return [Array<String>]
@@ -125,6 +111,14 @@ module Solargraph
       @gemspecs ||= Dir[File.join(directory, '**/*.gemspec')]
     end
 
+    # Synchronize the workspace from the provided updater.
+    #
+    # @param [Source::Updater]
+    # @return [void]
+    def synchronize! updater
+      source_hash[updater.filename] = source_hash[updater.filename].synchronize(updater)
+    end
+
     private
 
     # @return [Hash<String, Solargraph::Source>]
@@ -142,7 +136,6 @@ module Solargraph
           source_hash[filename] = Solargraph::Source.load(filename)
         end
       end
-      @stime = Time.now
     end
 
     def generate_require_paths

data/lib/solargraph/yard_map.rb

@@ -20,24 +20,18 @@ module Solargraph
       @@stdlib_paths[path].push ns
     end
 
-    # @return [Solargraph::Workspace]
-    attr_reader :workspace
-
     # @return [Array<String>]
     attr_reader :required
 
     # @param required [Array<String>]
     # @param workspace [Solargraph::Workspace, nil]
-    def initialize(required: [], workspace: nil)
-      @workspace = workspace
+    def initialize(required: [])
       # HACK: YardMap needs its own copy of this array
       @required = required.clone
       @gem_paths = {}
       @stdlib_namespaces = []
       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?
     end
 
     # @return [Array<Solargraph::Pin::Base>]
@@ -45,6 +39,19 @@ module Solargraph
       @pins ||= []
     end
 
+    # @param new_requires [Array<String>]
+    # @return [Boolean]
+    def change new_requires
+      if new_requires.uniq.sort == required.uniq.sort
+        false
+      else
+        required.clear
+        required.concat new_requires
+        process_requires
+        true
+      end
+    end
+
     # @return [Array<String>]
     def yardocs
       @yardocs ||= []
@@ -71,31 +78,24 @@ module Solargraph
       end
     end
 
-    # @param new_requires [Array<String>]
-    # @return [Boolean]
-    def change new_requires
-      if new_requires.uniq.sort == required.uniq.sort
-        false
-      else
-        required.clear
-        required.concat new_requires
-        process_requires
-        true
-      end
-    end
-
     # @return [Array<Solargraph::Pin::Base>]
     def core_pins
       @@core_pins ||= begin
         result = []
         load_yardoc CoreDocs.yardoc_file
         YARD::Registry.each do |o|
-          result.push generate_pin(o)
+          result.concat generate_pins(o)
         end
         result
       end
     end
 
+    # @param path [String]
+    # @return [Pin::Base]
+    def path_pin path
+      pins.select{ |p| p.path == path }.first
+    end
+
     private
 
     # @return [YardMap::Cache]
@@ -108,7 +108,7 @@ module Solargraph
     def recurse_namespace_object ns
       result = []
       ns.children.each do |c|
-        result.push generate_pin(c)
+        result.concat generate_pins(c)
         result.concat recurse_namespace_object(c) if c.respond_to?(:children)
       end
       result
@@ -116,17 +116,23 @@ module Solargraph
 
     # @param code_object [YARD::CodeObjects::Base]
     # @return [Solargraph::Pin::Base]
-    def generate_pin code_object
+    def generate_pins code_object
+      result = []
       location = object_location(code_object)
       if code_object.is_a?(YARD::CodeObjects::NamespaceObject)
-        Solargraph::Pin::YardPin::Namespace.new(code_object, location)
+        result.push Solargraph::Pin::YardPin::Namespace.new(code_object, location)
       elsif code_object.is_a?(YARD::CodeObjects::MethodObject)
-        Solargraph::Pin::YardPin::Method.new(code_object, location)
+        if code_object.name == :initialize && code_object.scope == :instance
+          # @todo Check the visibility of <Class>.new
+          result.push Solargraph::Pin::YardPin::Method.new(code_object, location, 'new', :class, :public)
+          result.push Solargraph::Pin::YardPin::Method.new(code_object, location, 'initialize', :instance, :private)
+        else
+          result.push Solargraph::Pin::YardPin::Method.new(code_object, location)
+        end
       elsif code_object.is_a?(YARD::CodeObjects::ConstantObject)
-        Solargraph::Pin::YardPin::Constant.new(code_object, location)
-      else
-        nil
+        result.push Solargraph::Pin::YardPin::Constant.new(code_object, location)
       end
+      result
     end
 
     # @return [void]
@@ -136,7 +142,6 @@ module Solargraph
       stdnames = {}
       required.each do |r|
         next if r.nil? or r.empty?
-        next if !workspace.nil? and workspace.would_require?(r)
         cached = cache.get_path_pins(r)
         unless cached.nil?
           pins.concat cached
@@ -147,8 +152,6 @@ module Solargraph
           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?
-          # @todo Ignoring dependencies for now
-          # add_gem_dependencies spec
           yd = YARD::Registry.yardoc_file_for_gem(spec.name, ver)
           @gem_paths[spec.name] = spec.full_gem_path
           if yd.nil?
@@ -156,18 +159,15 @@ module Solargraph
           else
             unless yardocs.include?(yd)
               yardocs.unshift yd
-              # @todo Generate the pins
-              load_yardoc yd
-              YARD::Registry.each do |o|
-                result.push generate_pin(o)
-              end
+              result.concat process_yardoc yd
+              # @todo Testing performance
+              # result.concat add_gem_dependencies spec
             end
           end
         rescue Gem::LoadError => e
-          next if !workspace.nil? and workspace.would_require?(r)
           stdtmp = []
           @@stdlib_paths.each_pair do |path, objects|
-            stdtmp.concat objects if path == r or path.start_with?("#{r}/")
+            stdtmp.concat objects if path == r || path.start_with?("#{r}/")
           end
           if stdtmp.empty?
             unresolved_requires.push r
@@ -197,7 +197,7 @@ module Solargraph
           objects.each do |ns|
             next if done.include?(ns.path)
             done.push ns.path
-            result.push generate_pin(ns)
+            result.concat generate_pins(ns)
             result.concat recurse_namespace_object(ns)
           end
           result.delete_if(&:nil?)
@@ -211,25 +211,54 @@ module Solargraph
     # @param spec [Gem::Specification]
     # @return [void]
     def add_gem_dependencies spec
+      result = []
       (spec.dependencies - spec.development_dependencies).each do |dep|
-        depspec = Gem::Specification.find_by_name(dep.name)
-        @gem_paths[spec.name] = depspec.full_gem_path unless depspec.nil?
-        gy = YARD::Registry.yardoc_file_for_gem(dep.name)
-        if gy.nil?
-          unresolved_requires.push dep.name
-        else
-          yardocs.unshift gy unless yardocs.include?(gy)
+        begin
+          depspec = Gem::Specification.find_by_name(dep.name)
+          @gem_paths[depspec.name] = depspec.full_gem_path unless depspec.nil?
+          gy = YARD::Registry.yardoc_file_for_gem(dep.name)
+          if gy.nil?
+            unresolved_requires.push dep.name
+          else
+            unless yardocs.include?(gy)
+              yardocs.unshift gy
+              result.concat process_yardoc gy
+              # @todo Trying only one level of dependencies
+              # result.concat add_gem_dependencies(depspec)
+            end
+          end
+        rescue Gem::LoadError
+          # This error probably indicates a bug in an installed gem
+          STDERR.puts "Warning: failed to resolve #{dep.name} gem dependency for #{spec.name}"
         end
       end
+      result
+    end
+
+    def process_yardoc y
+      return [] if y.nil?
+      size = Dir.glob(File.join(y, '**', '*'))
+        .map{ |f| File.size(f) }
+        .inject(:+)
+      if !size.nil? && size > 20_000_000
+        STDERR.puts "Warning: yardoc at #{y} is too large to process (#{size} bytes)"
+        return []
+      end
+      result = []
+      load_yardoc y
+      YARD::Registry.each do |o|
+        result.concat generate_pins(o)
+      end
+      result
     end
 
     # @param obj [YARD::CodeObjects::Base]
-    # @return [Solargraph::Source::Location]
+    # @return [Solargraph::Location]
     def object_location obj
       return nil if obj.file.nil? or obj.line.nil?
       @gem_paths.values.each do |path|
         file = File.join(path, obj.file)
-        return Solargraph::Source::Location.new(file, Solargraph::Source::Range.from_to(obj.line, 0, obj.line, 0)) if File.exist?(file)
+        return Solargraph::Location.new(file, Solargraph::Range.from_to(obj.line, 0, obj.line, 0)) if File.exist?(file)
       end
       nil
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.27.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -238,9 +238,10 @@ files:
 - lib/solargraph/api_map/cache.rb
 - lib/solargraph/api_map/source_to_yard.rb
 - lib/solargraph/api_map/store.rb
-- lib/solargraph/basic_type.rb
-- lib/solargraph/basic_type_methods.rb
+- lib/solargraph/bundle.rb
 - lib/solargraph/complex_type.rb
+- lib/solargraph/complex_type/type_methods.rb
+- lib/solargraph/complex_type/unique_type.rb
 - lib/solargraph/core_fills.rb
 - lib/solargraph/diagnostics.rb
 - lib/solargraph/diagnostics/base.rb
@@ -248,10 +249,13 @@ files:
 - lib/solargraph/diagnostics/rubocop.rb
 - lib/solargraph/diagnostics/severities.rb
 - lib/solargraph/diagnostics/type_not_defined.rb
+- lib/solargraph/diagnostics/update_errors.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/host/cataloger.rb
+- lib/solargraph/language_server/host/diagnoser.rb
 - lib/solargraph/language_server/message.rb
 - lib/solargraph/language_server/message/base.rb
 - lib/solargraph/language_server/message/cancel_request.rb
@@ -301,6 +305,7 @@ files:
 - lib/solargraph/library.rb
 - lib/solargraph/live_map.rb
 - lib/solargraph/live_map/cache.rb
+- lib/solargraph/location.rb
 - lib/solargraph/page.rb
 - lib/solargraph/pin.rb
 - lib/solargraph/pin/attribute.rb
@@ -336,10 +341,11 @@ files:
 - lib/solargraph/plugin/canceler.rb
 - lib/solargraph/plugin/process.rb
 - lib/solargraph/plugin/runtime.rb
+- lib/solargraph/position.rb
+- lib/solargraph/range.rb
 - lib/solargraph/server_methods.rb
 - lib/solargraph/shell.rb
 - lib/solargraph/source.rb
-- lib/solargraph/source/call_chainer.rb
 - lib/solargraph/source/chain.rb
 - lib/solargraph/source/chain/call.rb
 - lib/solargraph/source/chain/class_variable.rb
@@ -352,17 +358,17 @@ files:
 - lib/solargraph/source/chain/literal.rb
 - lib/solargraph/source/chain/variable.rb
 - lib/solargraph/source/change.rb
-- lib/solargraph/source/completion.rb
+- lib/solargraph/source/cursor.rb
 - lib/solargraph/source/encoding_fixes.rb
 - lib/solargraph/source/flawed_builder.rb
-- lib/solargraph/source/fragment.rb
-- lib/solargraph/source/location.rb
-- lib/solargraph/source/mapper.rb
 - lib/solargraph/source/node_chainer.rb
 - lib/solargraph/source/node_methods.rb
-- lib/solargraph/source/position.rb
-- lib/solargraph/source/range.rb
+- lib/solargraph/source/source_chainer.rb
 - lib/solargraph/source/updater.rb
+- lib/solargraph/source_map.rb
+- lib/solargraph/source_map/clip.rb
+- lib/solargraph/source_map/completion.rb
+- lib/solargraph/source_map/mapper.rb
 - lib/solargraph/version.rb
 - lib/solargraph/views/_method.erb
 - lib/solargraph/views/_name_type_tag.erb

data/lib/solargraph/basic_type.rb

@@ -1,33 +0,0 @@
-module Solargraph
-  class BasicType
-    include BasicTypeMethods
-
-    # Create a BasicType with the specified name and an optional substring.
-    # The substring is the parameter section of a parametrized type, e.g., for
-    # the type `Array<String>`, the name is `Array` and the substring is
-    # `<String>`.
-    #
-    # @param name [String] The name of the type
-    # @param substring [String] The substring of the type
-    def initialize name, substring = ''
-      @name = name
-      @substring = substring
-      @tag = name + substring
-      @key_types = []
-      @subtypes = []
-      return unless parameters?
-      subs = ComplexType.parse(substring[1..-2], partial: true)
-      if hash_parameters?
-        raise ComplexTypeError, "Bad hash type" unless !subs.is_a?(ComplexType) and subs.length == 2 and !subs[0].is_a?(ComplexType) and !subs[1].is_a?(ComplexType)
-        @key_types.concat subs[0]
-        @subtypes.concat subs[1]
-      else
-        @subtypes.concat subs
-      end
-    end
-
-    def to_s
-      tag
-    end
-  end
-end

data/lib/solargraph/basic_type_methods.rb

@@ -1,111 +0,0 @@
-module Solargraph
-  module BasicTypeMethods
-    # @return [String]
-    attr_reader :name
-
-    # @return [String]
-    attr_reader :substring
-
-    # @return [String]
-    attr_reader :tag
-
-    # @return [Array<ComplexType>]
-    attr_reader :subtypes
-
-    # @return [Boolean]
-    def duck_type?
-      @duck_type ||= name.start_with?('#')
-    end
-
-    # @return [Boolean]
-    def nil_type?
-      @nil_type ||= (name.downcase == 'nil')
-    end
-
-    # @return [Boolean]
-    def parameters?
-      !substring.empty?
-    end
-
-    def void?
-      name == 'void'
-    end
-
-    def defined?
-      !undefined?
-    end
-
-    def undefined?
-      name == 'undefined'
-    end
-
-    # @return [Boolean]
-    def list_parameters?
-      substring.start_with?('<')
-    end
-
-    # @return [Boolean]
-    def fixed_parameters?
-      substring.start_with?('(')
-    end
-
-    # @return [Boolean]
-    def hash_parameters?
-      substring.start_with?('{')
-    end
-
-    # @return [Array<ComplexType>]
-    def value_types
-      @subtypes
-    end
-
-    # @return [Array<ComplexType>]
-    def key_types
-      @key_types
-    end
-
-    # @return [String]
-    def namespace
-      @namespace ||= 'Object' if duck_type?
-      @namespace ||= 'NilClass' if nil_type?
-      @namespace ||= ((name == 'Class' or name == 'Module') and !subtypes.empty?) ? subtypes.first.name : name
-    end
-
-    # @return [Symbol] :class or :instance
-    def scope
-      @scope ||= :instance if duck_type? or nil_type?
-      @scope ||= ((name == 'Class' or name == 'Module') and !subtypes.empty?) ? :class : :instance
-    end
-
-    def == other
-      return false unless self.class == other.class
-      tag == other.tag
-    end
-
-    # Generate a ComplexType that fully qualifies this type's namespaces.
-    #
-    # @param api_map [ApiMap] The ApiMap that performs qualification
-    # @param context [String] The namespace from which to resolve names
-    # @return [ComplexType] The generated ComplexType
-    def qualify api_map, context = ''
-      return ComplexType.parse(tag) if duck_type? or void? or undefined?
-      fqns = api_map.qualify(name, context)
-      return ComplexType::UNDEFINED if fqns.nil?
-      ltypes = key_types.map do |t|
-        t.qualify api_map, context
-      end
-      rtypes = value_types.map do |t|
-        t.qualify api_map, context
-      end
-      if list_parameters?
-        Solargraph::ComplexType.parse("#{fqns}<#{rtypes.map(&:tag).join(', ')}>").first
-      elsif fixed_parameters?
-        Solargraph::ComplexType.parse("#{fqns}(#{rtypes.map(&:tag).join(', ')})").first
-      elsif hash_parameters?
-        Solargraph::ComplexType.parse("#{fqns}{#{ltypes.map(&:tag).join(', ')} => #{rtypes.map(&:tag).join(', ')}}").first
-      else
-        Solargraph::ComplexType.parse(fqns).first
-      end
-    end
-  end
-end