solargraph 0.28.2 → 0.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99d55308f8ad7a0f73c4432cf08789471b46a60df7db0cc59a4ca8ef6dd9360f
-  data.tar.gz: 8b81acc2451105bb669fbaa0eb215f27ef6f32306b354683c0c045374317e4f8
+  metadata.gz: a5263886b3711a2cc3a6ff8b93c6162002feae2162055999a42d0e571473e47c
+  data.tar.gz: e936cac7abedde1efab2c97618c15a0290937211016cb7ae0a71d607b6483e23
 SHA512:
-  metadata.gz: 482e84a980ef3385ee1f182c17681bdd97912b84055b017dd5821641a82a240945c1e080bbd11dee0a32df520069318aafef85687a24d801089574fb88154f2f
-  data.tar.gz: 14cf67e4029a2f1fcc8fdbccfd521f7db6776d010d2f4681c77db56b5f5da0a4ebdc51499ef60c5ff5fcd6fa031ab054f250491b71a2ac4394feef4b8aeaa9c5
+  metadata.gz: c8dd13d206f759022ab35d9721672b2a0c1c517a18f9e58cfeec7143eacdd6e8d20ad726cb5539bb2e010b9ec82593a4b164dd5bed4ddcb48e4adde17e226689
+  data.tar.gz: b4e88b5cd5f6c5d4495d4562edfd2510651410fe17e6e6b4db33dcee85afbe0ba7110fba5dabd143c76fd04a94e359ad07adae0588ca67ca2a1e445dd421ce67

data/lib/solargraph/api_map.rb

@@ -46,7 +46,7 @@ module Solargraph
     # @param source [Source]
     # @return [self]
     def map source
-      catalog Bundle.new(sources: [source])
+      catalog Bundle.new(opened: [source])
       self
     end
 
@@ -56,9 +56,6 @@ module Solargraph
     # @param bundle [Bundle]
     # @return [self]
     def catalog bundle
-      # @todo This can be more efficient. We don't need to remap sources that
-      #   are already here.
-      # all_sources = (workspace.sources + others).uniq
       new_map_hash = {}
       unmerged = false
       bundle.sources.each do |source|
@@ -88,11 +85,11 @@ module Solargraph
         pins.concat map.pins
         reqs.concat map.requires.map(&:name)
       end
-      reqs.concat bundle.required
-      unless bundle.load_paths.empty?
+      reqs.concat bundle.workspace.config.required
+      unless bundle.workspace.require_paths.empty?
         reqs.delete_if do |r|
           result = false
-          bundle.load_paths.each do |l|
+          bundle.workspace.require_paths.each do |l|
             if new_map_hash.keys.include?(File.join(l, "#{r}.rb"))
               result = true
               break
@@ -101,13 +98,13 @@ module Solargraph
           result
         end
       end
-      bundle.yard_map.change(reqs)
-      new_store = Store.new(pins + bundle.yard_map.pins)
+      yard_map.change(reqs)
+      new_store = Store.new(pins + yard_map.pins)
       @mutex.synchronize {
         @cache.clear
         @source_map_hash = new_map_hash
         @store = new_store
-        @unresolved_requires = bundle.yard_map.unresolved_requires
+        @unresolved_requires = yard_map.unresolved_requires
       }
       self
     end
@@ -137,7 +134,7 @@ module Solargraph
       # @todo How should this work?
       api_map = self.new #(Solargraph::Workspace.new(directory))
       workspace = Solargraph::Workspace.new(directory)
-      api_map.catalog Bundle.new(sources: workspace.sources)
+      api_map.catalog Bundle.new(workspace: workspace)
       api_map
     end
 
@@ -445,6 +442,10 @@ module Solargraph
 
     private
 
+    def yard_map
+      @yard_map ||= YardMap.new
+    end
+
     # A hash of source maps with filename keys.
     #
     # @return [Hash{String => SourceMap}]

data/lib/solargraph/bundle.rb

@@ -1,22 +1,21 @@
 module Solargraph
   class Bundle
-    # @return [Array<Source>]
-    attr_reader :sources
-
-    # @return [Array<String>]
-    attr_reader :required
+    # @return [Workspace]
+    attr_reader :workspace
 
-    # @return [Array<String>]
-    attr_reader :load_paths
+    # @return [Array<Source>]
+    attr_reader :opened
 
-    # @return [YardMap]
-    attr_reader :yard_map
+    # @param workspace [Workspace]
+    # @param opened [Array<Source>]
+    def initialize workspace: Workspace.new, opened: []
+      @workspace = workspace
+      @opened = opened
+    end
 
-    def initialize sources: [], required: [], load_paths: [], yard_map: YardMap.new
-      @sources = sources
-      @required = required
-      @load_paths = load_paths
-      @yard_map = yard_map
+    # @return [Array<Source>]
+    def sources
+      @sources ||= (opened + workspace.sources).uniq(&:filename)
     end
   end
 end

data/lib/solargraph/diagnostics.rb

@@ -15,6 +15,7 @@ module Solargraph
       #
       # @param name [String] The name
       # @param klass [Class<Solargraph::Diagnostics::Base>] The class implementation
+      # @return [void]
       def register name, klass
         reporter_hash[name] = klass
       end

data/lib/solargraph/diagnostics/base.rb

@@ -1,5 +1,7 @@
 module Solargraph
   module Diagnostics
+    # The base class for diagnostics reporters.
+    #
     class Base
       # Perform a diagnosis on a Source within the context of an ApiMap.
       # The result is an array of hash objects that conform to the LSP's

data/lib/solargraph/diagnostics/rubocop.rb

@@ -19,23 +19,19 @@ module Solargraph
       # @param api_map [Solargraph::ApiMap]
       # @return [Array<Hash>]
       def diagnose source, api_map
-        begin
-          options, paths = generate_options(source.filename, source.code)
-          runner = RuboCop::Runner.new(options, RuboCop::ConfigStore.new)
-          result = redirect_stdout{ runner.run(paths) }
-          make_array JSON.parse(result)
-        rescue JSON::ParserError
-          raise DiagnosticsError, 'RuboCop returned invalid data'
-        end
+        options, paths = generate_options(source.filename, source.code)
+        runner = RuboCop::Runner.new(options, RuboCop::ConfigStore.new)
+        result = redirect_stdout{ runner.run(paths) }
+        make_array JSON.parse(result)
+      rescue JSON::ParserError
+        raise DiagnosticsError, 'RuboCop returned invalid data'
       end
 
       private
 
-      # @param workspace [Solargraph::Workspace]
       # @param filename [String]
       # @param code [String]
       # @return [Array]
-      # def generate_options workspace, filename, code
       def generate_options filename, code
         args = ['-f', 'j']
         rubocop_file = find_rubocop_file(filename)
@@ -46,20 +42,16 @@ module Solargraph
         [options, paths]
       end
 
+      # @param filename [String]
+      # @return [String, nil]
       def find_rubocop_file filename
-        rcfile = nil
         dir = File.dirname(filename)
-        while rcfile.nil?
+        until File.dirname(dir) == dir
           here = File.join(dir, '.rubocop.yml')
-          if File.exist?(here)
-            rcfile = here
-            break
-          else
-            break if File.dirname(dir) == dir
-            dir = File.dirname(dir)
-          end
+          return here if File.exist?(here)
+          dir = File.dirname(dir)
         end
-        rcfile
+        nil
       end
 
       # @todo This is a smelly way to redirect output, but the RuboCop specs do the

data/lib/solargraph/language_server/host.rb

@@ -136,13 +136,6 @@ module Solargraph
         diagnoser.schedule uri
       end
 
-      def save params
-        uri = params['textDocument']['uri']
-        filename = uri_to_file(uri)
-        version = params['textDocument']['version']
-        library.overwrite filename, version
-      end
-
       # @param uri [String]
       def diagnose uri
         begin
@@ -193,7 +186,7 @@ module Solargraph
       #
       # @param directory [String]
       def prepare directory
-        path = nil
+        path = ''
         path = normalize_separators(directory) unless directory.nil?
         begin
           @library = Solargraph::Library.load(path)
@@ -202,7 +195,7 @@ module Solargraph
             'type' => Solargraph::LanguageServer::MessageTypes::WARNING,
             'message' => e.message
           }
-          @library = Solargraph::Library.load(nil)
+          @library = Solargraph::Library.load
         end
         diagnoser.start
         cataloger.start
@@ -565,6 +558,9 @@ module Solargraph
           },
           'workspace/symbol' => {
             workspaceSymbolProvider: true
+          },
+          'textDocument/formatting' => {
+            formattingProvider: true
           }
         }
       end

data/lib/solargraph/language_server/message/completion_item/resolve.rb

@@ -5,11 +5,12 @@ module Solargraph
   module LanguageServer
     module Message
       module CompletionItem
+        # completionItem/resolve message handler
+        #
         class Resolve < Base
           def process
             pin = host.locate_pin params
             if pin.nil?
-              # set_error(Solargraph::LanguageServer::ErrorCodes::INVALID_REQUEST, "Completion item could not be resolved")
               set_result params
             else
               set_result(

data/lib/solargraph/language_server/message/text_document/formatting.rb

@@ -14,10 +14,29 @@ module Solargraph
             lines = o.lines
             index = lines.index{|l| l.start_with?('====================')}
             formatted = lines[index+1..-1].join
+            # The response is required to send an explicit range. Text edits
+            # with null ranges get ignored. See castwide/vscode-solargraph#83
+            if original.end_with?("\n")
+              ending = {
+                line: original.lines.length,
+                character: 0
+              }
+            else
+              ending = {
+                line: original.lines.length - 1,
+                character: original.lines.last.length
+              }
+            end
             set_result(
               [
                 {
-                  range: nil,
+                  range: {
+                    start: {
+                      line: 0,
+                      character: 0
+                    },
+                    end: ending
+                  },
                   newText: formatted
                 }
               ]

data/lib/solargraph/library.rb

@@ -1,11 +1,9 @@
-require 'set'
-
 module Solargraph
-  # A library handles coordination between a Workspace and an ApiMap.
+  # A Library handles coordination between a Workspace and an ApiMap.
   #
   class Library
     # @param workspace [Solargraph::Workspace]
-    def initialize workspace = Solargraph::Workspace.new(nil)
+    def initialize workspace = Solargraph::Workspace.new
       @mutex = Mutex.new
       @workspace = workspace
       api_map.catalog bundle
@@ -115,22 +113,6 @@ module Solargraph
       end
     end
 
-    # @param filename [String]
-    # @param version [Integer]
-    # @return [void]
-    def overwrite filename, version
-      mutex.synchronize do
-        source = source_hash[filename]
-        return if source.nil?
-        if source.version > version
-          STDERR.puts "Save out of sync for #{filename} (current #{source.version}, overwrite #{version})" if source.version > version
-        else
-          open filename, File.read(filename), version
-        end
-        catalog
-      end
-    end
-
     # Get completion suggestions at the specified file and location.
     #
     # @param filename [String] The file to analyze
@@ -336,7 +318,7 @@ module Solargraph
     #
     # @param directory [String] The path to be used for the workspace
     # @return [Solargraph::Library]
-    def self.load directory
+    def self.load directory = ''
       Solargraph::Library.new(Solargraph::Workspace.new(directory))
     end
 
@@ -358,10 +340,8 @@ module Solargraph
     # @return [Bundle]
     def bundle
       Bundle.new(
-        sources: (workspace.sources + open_file_hash.values).uniq(&:filename),
-        required: workspace.config.required,
-        load_paths: workspace.require_paths,
-        yard_map: yard_map
+        workspace: workspace,
+        opened: open_file_hash.values
       )
     end
 

data/lib/solargraph/location.rb

@@ -1,4 +1,6 @@
 module Solargraph
+  # A section of text identified by its filename and range.
+  #
   class Location
     # @return [String]
     attr_reader :filename
@@ -13,6 +15,7 @@ module Solargraph
       @range = range
     end
 
+    # @return [Hash]
     def to_hash
       {
         filename: filename,

data/lib/solargraph/pin.rb

@@ -1,4 +1,6 @@
 module Solargraph
+  # The namespace for pins used in maps.
+  #
   module Pin
     autoload :Helper,           'solargraph/pin/helper'
     autoload :Conversions,      'solargraph/pin/conversions'

data/lib/solargraph/pin/base.rb

@@ -2,6 +2,8 @@ require 'reverse_markdown'
 
 module Solargraph
   module Pin
+    # The base class for map pins.
+    #
     class Base
       include Conversions
       include Documenting
@@ -214,10 +216,10 @@ module Solargraph
       # @param t2 [YARD::Tags::Tag]
       # @return [Boolean]
       def compare_tags t1, t2
-        t1.class == t2.class and
-          t1.tag_name == t2.tag_name and
-          t1.text == t2.text and
-          t1.name == t2.name and
+        t1.class == t2.class &&
+          t1.tag_name == t2.tag_name &&
+          t1.text == t2.text &&
+          t1.name == t2.name &&
           t1.types == t2.types
       end
     end

data/lib/solargraph/pin/method_parameter.rb

@@ -9,6 +9,10 @@ module Solargraph
           params.each do |p|
             next unless p.name == name
             found = p
+            break
+          end
+          if found.nil? and !index.nil?
+            found = params[index] if params[index] && (params[index].name.nil? || params[index].name.empty?)
           end
           @return_complex_type = ComplexType.parse(*found.types) unless found.nil? or found.types.nil?
         end
@@ -16,6 +20,13 @@ module Solargraph
         @return_complex_type
       end
 
+      # The parameter's zero-based location in the block's signature.
+      #
+      # @return [Integer]
+      def index
+        block.parameter_names.index(name)
+      end
+
       def try_merge! pin
         return false unless super
         # @todo This is a little expensive, but it's necessary because

data/lib/solargraph/range.rb

@@ -1,4 +1,6 @@
 module Solargraph
+  # A pair of positions that compose a section of text.
+  #
   class Range
     # @return [Position]
     attr_reader :start
@@ -29,9 +31,9 @@ module Solargraph
     # @param position [Solargraph::Position]
     # @return [Boolean]
     def contain? position
-      return false if position.line < start.line or position.line > ending.line
-      return false if position.line == start.line and position.character < start.character
-      return false if position.line == ending.line and position.character > ending.character
+      return false if position.line < start.line || position.line > ending.line
+      return false if position.line == start.line && position.character < start.character
+      return false if position.line == ending.line && position.character > ending.character
       true
     end
 
@@ -40,7 +42,7 @@ module Solargraph
     # @param position [Position]
     # @return [Boolean]
     def include? position
-      contain?(position) and !(position.line == start.line and position.character == start.character)
+      contain?(position) && !(position.line == start.line && position.character == start.character)
     end
 
     # Create a range from a pair of lines and characters.
@@ -54,17 +56,26 @@ module Solargraph
       Range.new(Position.new(l1, c1), Position.new(l2, c2))
     end
 
+    # Get a range from a node.
+    #
+    # @param node [Parser::AST::Node]
+    # @return [Range]
     def self.from_node node
       from_expr(node.loc.expression)
     end
 
+    # Get a range from a Parser range, usually found in
+    # Parser::AST::Node#location#expression.
+    #
+    # @param expr [Parser::Source::Range]
+    # @return [Range]
     def self.from_expr expr
       from_to(expr.line, expr.column, expr.last_line, expr.last_column)
     end
 
     def == other
       return false unless other.is_a?(Range)
-      start == other.start and ending == other.ending
+      start == other.start && ending == other.ending
     end
   end
 end

data/lib/solargraph/source/chain.rb

@@ -1,8 +1,11 @@
-# HACK Fix autoload issue
+# HACK: Fix autoload issue
 require 'solargraph/source/chain/link'
 
 module Solargraph
   class Source
+    # A chain of constants, variables, and method calls for inferring types of
+    # values.
+    #
     class Chain
       autoload :Link,             'solargraph/source/chain/link'
       autoload :Call,             'solargraph/source/chain/call'
@@ -14,6 +17,10 @@ module Solargraph
       autoload :Literal,          'solargraph/source/chain/literal'
       autoload :Head,             'solargraph/source/chain/head'
 
+      # Chain#infer uses the inference stack to avoid recursing into itself.
+      # See Chain#active_signature for more information.
+      @@inference_stack = []
+
       UNDEFINED_CALL = Chain::Call.new('<undefined>')
       UNDEFINED_CONSTANT = Chain::Constant.new('<undefined>')
 
@@ -37,22 +44,16 @@ module Solargraph
       # @return [Array<Pin::Base>]
       def define api_map, name_pin, locals
         return [] if undefined?
-        type = ComplexType::UNDEFINED
-        head = true
         working_pin = name_pin
         links[0..-2].each do |link|
-          pins = link.resolve(api_map, working_pin, head ? locals : [])
-          head = false
-          return [] if pins.empty?
-          type = ComplexType::UNDEFINED
-          pins.each do |pin|
-            type = pin.infer(api_map)
-            break unless type.undefined?
-          end
+          pins = link.resolve(api_map, working_pin, locals)
+          # Locals are only used when resolving the first link
+          locals = []
+          type = infer_first_defined(pins, api_map)
           return [] if type.undefined?
           working_pin = Pin::ProxyType.anonymous(type)
         end
-        links.last.resolve(api_map, working_pin, head ? locals: [])
+        links.last.resolve(api_map, working_pin, locals)
       end
 
       # @param api_map [ApiMap]
@@ -60,27 +61,57 @@ module Solargraph
       # @param locals [Array<Pin::Base>]
       # @return [ComplexType]
       def infer api_map, name_pin, locals
-        return ComplexType::UNDEFINED if undefined?
+        return ComplexType::UNDEFINED if undefined? || @@inference_stack.include?(active_signature(name_pin))
+        @@inference_stack.push active_signature(name_pin)
         type = ComplexType::UNDEFINED
         pins = define(api_map, name_pin, locals)
         pins.each do |pin|
           type = pin.infer(api_map)
           break unless type.undefined?
         end
+        @@inference_stack.pop
         type
       end
 
+      # @return [Boolean]
       def literal?
         links.last.is_a?(Chain::Literal)
       end
 
+      # @return [Boolean]
       def undefined?
         links.any?(&:undefined?)
       end
 
+      # @return [Boolean]
       def constant?
         links.last.is_a?(Chain::Constant)
       end
+
+      private
+
+      # Get a signature for this chain that includes the current context
+      # where it's being analyzed. Chain#infer uses this value to detect
+      # recursive inference into the same chain, e.g., when two variables
+      # reference each other in their assignments.
+      #
+      # @param pin [Pin::Base] The named pin context
+      # @return [String]
+      def active_signature(pin)
+        "#{pin.path}|#{links.map(&:word).join('.')}"
+      end
+
+      # @param pins [Array<Pin::Base>]
+      # @param api_map [ApiMap]
+      # @return [ComplexType]
+      def infer_first_defined pins, api_map
+        type = ComplexType::UNDEFINED
+        pins.each do |pin|
+          type = pin.infer(api_map)
+          break unless type.undefined?
+        end
+        type
+      end
     end
   end
 end

data/lib/solargraph/source/chain/head.rb

@@ -24,7 +24,7 @@ module Solargraph
         # @param name_pin [Pin::Base]
         # @return [Array<Pin::Base>]
         def super_pins api_map, name_pin
-          pins = api_map.get_method_stack(name_pin.namespace, name_pin.name, scope: name_pin.scope)
+          pins = api_map.get_method_stack(name_pin.namespace, name_pin.name, scope: name_pin.context.scope)
           pins.reject{|p| p.path == name_pin.path}
         end
       end

data/lib/solargraph/source/node_chainer.rb

@@ -1,14 +1,15 @@
 module Solargraph
   class Source
+    # A factory for generating chains from nodes.
+    #
     class NodeChainer
       include Source::NodeMethods
 
+      # @param node [Parser::AST::Node]
+      # @param filename [String]
       def initialize node, filename = nil
         @node = node
         @filename = filename
-        # @source = source
-        # @line = line
-        # @column = column
       end
 
       # @return [Source::Chain]
@@ -26,7 +27,6 @@ module Solargraph
         end
 
         # @param code [String]
-        # @param filename [String, nil]
         # @return [Chain]
         def load_string(code)
           node = Source.parse(code.sub(/\.$/, ''))
@@ -47,7 +47,6 @@ module Solargraph
         # return generate_links(n.children[2] || n.children[0]) if n.type == :block
         result = []
         if n.type == :block
-          # result.concat generate_links(n.children[2])
           result.concat generate_links(n.children[0])
         elsif n.type == :send
           if n.children[0].is_a?(Parser::AST::Node)
@@ -71,12 +70,7 @@ module Solargraph
         elsif n.type == :zsuper
           result.push Chain::Head.new('super')
         elsif n.type == :const
-          # result.push Chain::Constant.new(unpack_name(n))
           const = unpack_name(n)
-          # parts = const.split('::')
-          # last = parts.pop
-          # result.push Chain::Constant.new(parts.join('::')) unless parts.empty?
-          # result.push Chain::Constant.new(last)
           result.push Chain::Constant.new(const)
         elsif [:lvar, :lvasgn].include?(n.type)
           result.push Chain::Call.new(n.children[0].to_s)

data/lib/solargraph/source/source_chainer.rb

@@ -24,11 +24,7 @@ module Solargraph
       # @param position [Position]
       def initialize source, position
         @source = source
-        # @source.code = source.code
         @position = position
-        # @todo Get rid of line/column
-        @line = position.line
-        @column = position.column
         @calculated_literal = false
       end
 
@@ -65,16 +61,6 @@ module Solargraph
       # @return [Position]
       attr_reader :position
 
-      # The zero-based line number of the fragment's location.
-      #
-      # @return [Integer]
-      attr_reader :line
-
-      # The zero-based column number of the fragment's location.
-      #
-      # @return [Integer]
-      attr_reader :column
-
       # @return [Solargraph::Source]
       attr_reader :source
 
@@ -105,13 +91,6 @@ module Solargraph
         end
       end
 
-      # An alias for #column.
-      #
-      # @return [Integer]
-      def character
-        @column
-      end
-
       # True if the current offset is inside a string.
       #
       # @return [Boolean]
@@ -122,7 +101,7 @@ module Solargraph
 
       # @return [Integer]
       def offset
-        @offset ||= get_offset(line, column)
+        @offset ||= get_offset(position.line, position.column)
       end
 
       # @param line [Integer]

data/lib/solargraph/source_map/clip.rb

@@ -13,7 +13,7 @@ module Solargraph
 
       # @return [Array<Pin::Base>]
       def define
-        return [] if cursor.chain.literal?
+        return [] if cursor.comment? || cursor.chain.literal?
         result = cursor.chain.define(api_map, context_pin, locals)
         result.concat(source_map.pins.select{ |p| p.location.range.start.line == cursor.position.line }) if result.empty?
         result

data/lib/solargraph/source_map/mapper.rb

@@ -297,6 +297,15 @@ module Solargraph
                     pins.push Solargraph::Pin::Attribute.new(get_node_location(c), pin.namespace, c.children[0].children[0].to_s, comments_for(c) || pin.comments, pin.access, pin.scope, pin.visibility)
                   end
                 end
+              elsif c.type == :send && c.children[1] == :alias_method && c.children[2] && c.children[2] && c.children[2].type == :sym && c.children[3] && c.children[3].type == :sym
+                pin = pins.select{|p| p.name == c.children[3].children[0].to_s && p.namespace == fqn && p.scope == scope}.first
+                unless pin.nil?
+                  if pin.is_a?(Solargraph::Pin::Method)
+                    pins.push Solargraph::Pin::Method.new(get_node_location(c), pin.namespace, c.children[2].children[0].to_s, comments_for(c) || pin.comments, pin.scope, pin.visibility, pin.parameters)
+                  elsif pin.is_a?(Solargraph::Pin::Attribute)
+                    pins.push Solargraph::Pin::Attribute.new(get_node_location(c), pin.namespace, c.children[2].children[0].to_s, comments_for(c) || pin.comments, pin.access, pin.scope, pin.visibility)
+                  end
+                end
               elsif c.type == :sclass && c.children[0].type == :self
                 process c, tree, :public, :class, fqn || '', stack
                 next

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.28.2'
+  VERSION = '0.28.3'
 end

data/lib/solargraph/workspace.rb

@@ -10,19 +10,15 @@ module Solargraph
     attr_reader :directory
 
     # @param directory [String]
-    def initialize directory = nil, config = nil
-      # @todo Convert to an absolute path?
+    def initialize directory = '', config = nil
       @directory = directory
-      @directory = nil if @directory == ''
       @config = config
       load_sources
     end
 
-    # @param reload [Boolean] Force a reload of the config file
     # @return [Solargraph::Workspace::Config]
-    def config reload = false
-      @config = Solargraph::Workspace::Config.new(directory) if @config.nil? or reload
-      @config
+    def config
+      @config ||= Solargraph::Workspace::Config.new(directory)
     end
 
     # Merge the source. A merge will update the existing source for the file
@@ -32,7 +28,11 @@ module Solargraph
     # @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)
+      unless source_hash.has_key?(source.filename)
+        # Reload the config to determine if a new source should be included
+        @config = Solargraph::Workspace::Config.new(directory)
+        return false unless config.calculated.include?(source.filename)
+      end
       source_hash[source.filename] = source
       true
     end
@@ -42,7 +42,9 @@ module Solargraph
     # @param filename [String]
     # @return [Boolean]
     def would_merge? filename
-      Solargraph::Workspace::Config.new(directory).calculated.include?(filename)
+      return true if source_hash.include?(filename)
+      @config = Solargraph::Workspace::Config.new(directory)
+      config.calculated.include?(filename)
     end
 
     # Remove a source from the workspace. The source will not be removed if
@@ -51,7 +53,7 @@ module Solargraph
     # @param filename [String]
     # @return [Boolean] True if the source was removed from the workspace
     def remove filename
-      return false if config(true).calculated.include?(filename)
+      return false unless source_hash.has_key?(filename)
       source_hash.delete filename
       true
     end
@@ -107,7 +109,7 @@ module Solargraph
     #
     # @return [Array<String>]
     def gemspecs
-      return [] if directory.nil?
+      return [] if directory.empty?
       @gemspecs ||= Dir[File.join(directory, '**/*.gemspec')]
     end
 
@@ -128,7 +130,7 @@ module Solargraph
 
     def load_sources
       source_hash.clear
-      unless directory.nil?
+      unless directory.empty?
         size = config.calculated.length
         raise WorkspaceTooLargeError, "The workspace is too large to index (#{size} files, #{config.max_files} max)" if config.max_files > 0 and size > config.max_files
         config.calculated.each do |filename|
@@ -138,11 +140,14 @@ module Solargraph
     end
 
     def generate_require_paths
-      return [] if directory.nil?
-      return configured_require_paths unless gemspec?
+      return configured_require_paths if directory.empty? || !gemspec?
       result = []
       gemspecs.each do |file|
-        spec = Gem::Specification.load(file)
+        # @todo Evaluating gemspec files violates the goal of not running
+        #   workspace code, but this is how Gem::Specification.load does it
+        #   anyway.
+        spec = eval(File.read(file), binding, file)
+        next unless Gem::Specification === spec
         base = File.dirname(file)
         result.concat spec.require_paths.map{ |path| File.join(base, path) } unless spec.nil?
       end
@@ -152,6 +157,7 @@ module Solargraph
     end
 
     def configured_require_paths
+      return ['lib'] if directory.empty?
       return [File.join(directory, 'lib')] if config.require_paths.empty?
       config.require_paths.map{|p| File.join(directory, p)}
     end

data/lib/solargraph/workspace/config.rb

@@ -10,18 +10,18 @@ module Solargraph
       MAX_FILES = 5000
 
       # @return [String]
-      attr_reader :workspace
+      attr_reader :directory
 
       # @return [Hash]
       attr_reader :raw_data
 
       # @param workspace [String]
-      def initialize workspace = nil
-        @workspace = workspace
+      def initialize directory = ''
+        @directory = directory
         include_globs = ['**/*.rb']
         exclude_globs = ['spec/**/*', 'test/**/*', 'vendor/**/*', '.bundle/**/*']
-        unless @workspace.nil?
-          sfile = File.join(@workspace, '.solargraph.yml')
+        unless @directory.empty?
+          sfile = File.join(@directory, '.solargraph.yml')
           if File.file?(sfile)
             @raw_data = YAML.safe_load(File.read(sfile))
             include_globs = @raw_data['include'] || include_globs
@@ -45,7 +45,7 @@ module Solargraph
       #
       # @return [Array<String>]
       def included
-        return [] if workspace.nil?
+        return [] if directory.empty?
         @included ||= process_globs(@raw_data['include'])
       end
 
@@ -53,7 +53,7 @@ module Solargraph
       #
       # @return [Array<String>]
       def excluded
-        return [] if workspace.nil?
+        return [] if directory.empty?
         @excluded ||= process_exclusions(@raw_data['exclude'])
       end
 
@@ -117,7 +117,7 @@ module Solargraph
       def process_globs globs
         result = []
         globs.each do |glob|
-          result.concat Dir[File.join workspace, glob].map{ |f| f.gsub(/\\/, '/') }
+          result.concat Dir[File.join directory, glob].map{ |f| f.gsub(/\\/, '/') }
         end
         result
       end
@@ -130,7 +130,7 @@ module Solargraph
       def process_exclusions globs
         remainder = globs.select do |glob|
           if glob_is_directory?(glob)
-            exdir = File.join(workspace, glob_to_directory(glob))
+            exdir = File.join(directory, glob_to_directory(glob))
             included.delete_if { |file| file.start_with?(exdir) }
             false
           else

data/lib/solargraph/yard_map.rb

@@ -24,7 +24,6 @@ module Solargraph
     attr_reader :required
 
     # @param required [Array<String>]
-    # @param workspace [Solargraph::Workspace, nil]
     def initialize(required: [])
       # HACK: YardMap needs its own copy of this array
       @required = required.clone
@@ -65,17 +64,15 @@ module Solargraph
     # @param y [String]
     # @return [YARD::Registry]
     def load_yardoc y
-      begin
-        if y.kind_of?(Array)
-          YARD::Registry.load y, true
-        else
-          YARD::Registry.load! y
-        end
-      rescue Exception => e
-        STDERR.puts "Error loading yardoc '#{y}' #{e.class} #{e.message}"
-        yardocs.delete y
-        nil
+      if y.kind_of?(Array)
+        YARD::Registry.load y, true
+      else
+        YARD::Registry.load! y
       end
+    rescue Exception => e
+      STDERR.puts "Error loading yardoc '#{y}' #{e.class} #{e.message}"
+      yardocs.delete y
+      nil
     end
 
     # @return [Array<Solargraph::Pin::Base>]
@@ -254,6 +251,8 @@ module Solargraph
       result
     end
 
+    # @param y [String, nil]
+    # @return [Array<Pin::Base>]
     def process_yardoc y
       return [] if y.nil?
       size = Dir.glob(File.join(y, '**', '*'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.28.2
+  version: 0.28.3
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser