solargraph 0.56.0 → 0.58.2

data/lib/solargraph/workspace.rb

@@ -1,249 +1,220 @@
-# frozen_string_literal: true
-
-require 'open3'
-require 'json'
-
-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
-
-    # The require paths associated with the workspace.
-    #
-    # @return [Array<String>]
-    attr_reader :require_paths
-
-    # @return [Array<String>]
-    attr_reader :gemnames
-    alias source_gems gemnames
-
-    # @param directory [String]
-    # @param config [Config, nil]
-    # @param server [Hash]
-    def initialize directory = '', config = nil, server = {}
-      @directory = directory
-      @config = config
-      @server = server
-      load_sources
-      @gemnames = []
-      @require_paths = generate_require_paths
-      require_plugins
-    end
-
-    # @return [Solargraph::Workspace::Config]
-    def config
-      @config ||= Solargraph::Workspace::Config.new(directory)
-    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 sources [Array<Solargraph::Source>]
-    # @return [Boolean] True if the source was added to the workspace
-    def merge *sources
-      unless directory == '*' || sources.all? { |source| source_hash.key?(source.filename) }
-        # Reload the config to determine if a new source should be included
-        @config = Solargraph::Workspace::Config.new(directory)
-      end
-
-      includes_any = false
-      sources.each do |source|
-        if directory == "*" || config.calculated.include?(source.filename)
-          source_hash[source.filename] = source
-          includes_any = true
-        end
-      end
-
-      includes_any
-    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 filename [String]
-    # @return [Boolean] True if the source was removed from the workspace
-    def remove filename
-      return false unless source_hash.key?(filename)
-      source_hash.delete filename
-      true
-    end
-
-    # @return [Array<String>]
-    def filenames
-      source_hash.keys
-    end
-
-    # @return [Array<Solargraph::Source>]
-    def sources
-      source_hash.values
-    end
-
-    # @param filename [String]
-    # @return [Boolean]
-    def has_file? filename
-      source_hash.key?(filename)
-    end
-
-    # Get a source by its filename.
-    #
-    # @param filename [String]
-    # @return [Solargraph::Source]
-    def source filename
-      source_hash[filename]
-    end
-
-    # True if the path resolves to a file in the workspace's require paths.
-    #
-    # @param path [String]
-    # @return [Boolean]
-    def would_require? path
-      require_paths.each do |rp|
-        full = File.join rp, path
-        return true if File.file?(full) || File.file?(full << ".rb")
-      end
-      false
-    end
-
-    # True if the workspace contains at least one gemspec file.
-    #
-    # @return [Boolean]
-    def gemspec?
-      !gemspecs.empty?
-    end
-
-    # Get an array of all gemspec files in the workspace.
-    #
-    # @return [Array<String>]
-    def gemspecs
-      return [] if directory.empty? || directory == '*'
-      @gemspecs ||= Dir[File.join(directory, '**/*.gemspec')].select do |gs|
-        config.allow? gs
-      end
-    end
-
-    # @return [String, nil]
-    def rbs_collection_path
-      @gem_rbs_collection ||= read_rbs_collection_path
-    end
-
-    def rbs_collection_config_path
-      @rbs_collection_config_path ||= begin
-        unless directory.empty? || directory == '*'
-          yaml_file = File.join(directory, 'rbs_collection.yaml')
-          yaml_file if File.file?(yaml_file)
-        end
-      end
-    end
-
-    # Synchronize the workspace from the provided updater.
-    #
-    # @param updater [Source::Updater]
-    # @return [void]
-    def synchronize! updater
-      source_hash[updater.filename] = source_hash[updater.filename].synchronize(updater)
-    end
-
-    # @return [String]
-    def command_path
-      server['commandPath'] || 'solargraph'
-    end
-
-    private
-
-    # The language server configuration (or an empty hash if the workspace was
-    # not initialized from a server).
-    #
-    # @return [Hash]
-    attr_reader :server
-
-    # @return [Hash{String => Solargraph::Source}]
-    def source_hash
-      @source_hash ||= {}
-    end
-
-    # @return [void]
-    def load_sources
-      source_hash.clear
-      unless directory.empty? || directory == '*'
-        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|
-          begin
-            source_hash[filename] = Solargraph::Source.load(filename)
-          rescue Errno::ENOENT => e
-            Solargraph.logger.warn("Error loading #{filename}: [#{e.class}] #{e.message}")
-          end
-        end
-      end
-    end
-
-    # Generate require paths from gemspecs if they exist or assume the default
-    # lib directory.
-    #
-    # @return [Array<String>]
-    def generate_require_paths
-      return configured_require_paths unless gemspec?
-      result = []
-      gemspecs.each do |file|
-        base = File.dirname(file)
-        # HACK: Evaluating gemspec files violates the goal of not running
-        #   workspace code, but this is how Gem::Specification.load does it
-        #   anyway.
-        cmd = ['ruby', '-e', "require 'rubygems'; require 'json'; spec = eval(File.read('#{file}'), TOPLEVEL_BINDING, '#{file}'); return unless Gem::Specification === spec; puts({name: spec.name, paths: spec.require_paths}.to_json)"]
-        o, e, s = Open3.capture3(*cmd)
-        if s.success?
-          begin
-            hash = o && !o.empty? ? JSON.parse(o.split("\n").last) : {}
-            next if hash.empty?
-            @gemnames.push hash['name']
-            result.concat(hash['paths'].map { |path| File.join(base, path) })
-          rescue StandardError => e
-            Solargraph.logger.warn "Error reading #{file}: [#{e.class}] #{e.message}"
-          end
-        else
-          Solargraph.logger.warn "Error reading #{file}"
-          Solargraph.logger.warn e
-        end
-      end
-      result.concat(config.require_paths.map { |p| File.join(directory, p) })
-      result.push File.join(directory, 'lib') if result.empty?
-      result
-    end
-
-    # Get additional require paths defined in the configuration.
-    #
-    # @return [Array<String>]
-    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
-
-    # @return [void]
-    def require_plugins
-      config.plugins.each do |plugin|
-        begin
-          require plugin
-        rescue LoadError
-          Solargraph.logger.warn "Failed to load plugin '#{plugin}'"
-        end
-      end
-    end
-
-    # @return [String, nil]
-    def read_rbs_collection_path
-      return unless rbs_collection_config_path
-
-      path = YAML.load_file(rbs_collection_config_path)&.fetch('path')
-      # make fully qualified
-      File.expand_path(path, directory)
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'open3'
+require 'json'
+
+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'
+    autoload :RequirePaths, 'solargraph/workspace/require_paths'
+
+    # @return [String]
+    attr_reader :directory
+
+    # @return [Array<String>]
+    attr_reader :gemnames
+    alias source_gems gemnames
+
+    # @param directory [String] TODO: Remove '' and '*' special cases
+    # @param config [Config, nil]
+    # @param server [Hash]
+    def initialize directory = '', config = nil, server = {}
+      raise ArgumentError, 'directory must be a String' unless directory.is_a?(String)
+
+      @directory = if ['*', ''].include?(directory)
+                     directory
+                   else
+                     File.absolute_path(directory)
+                   end
+      @config = config
+      @server = server
+      load_sources
+      @gemnames = []
+      require_plugins
+    end
+
+    # The require paths associated with the workspace.
+    #
+    # @return [Array<String>]
+    def require_paths
+      # @todo are the semantics of '*' the same as '', meaning 'don't send back any require paths'?
+      @require_paths ||= RequirePaths.new(directory_or_nil, config).generate
+    end
+
+    # @return [Solargraph::Workspace::Config]
+    def config
+      @config ||= Solargraph::Workspace::Config.new(directory)
+    end
+
+    # @param level [Symbol]
+    # @return [TypeChecker::Rules]
+    def rules(level)
+      @rules ||= TypeChecker::Rules.new(level, config.type_checker_rules)
+    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 sources [Array<Solargraph::Source>]
+    # @return [Boolean] True if the source was added to the workspace
+    def merge *sources
+      unless directory == '*' || sources.all? { |source| source_hash.key?(source.filename) }
+        # Reload the config to determine if a new source should be included
+        @config = Solargraph::Workspace::Config.new(directory)
+      end
+
+      includes_any = false
+      sources.each do |source|
+        if directory == "*" || config.calculated.include?(source.filename)
+          source_hash[source.filename] = source
+          includes_any = true
+        end
+      end
+
+      includes_any
+    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 filename [String]
+    # @return [Boolean] True if the source was removed from the workspace
+    def remove filename
+      return false unless source_hash.key?(filename)
+      source_hash.delete filename
+      true
+    end
+
+    # @return [Array<String>]
+    def filenames
+      source_hash.keys
+    end
+
+    # @return [Array<Solargraph::Source>]
+    def sources
+      source_hash.values
+    end
+
+    # @param filename [String]
+    # @return [Boolean]
+    def has_file? filename
+      source_hash.key?(filename)
+    end
+
+    # Get a source by its filename.
+    #
+    # @param filename [String]
+    # @return [Solargraph::Source]
+    def source filename
+      source_hash[filename]
+    end
+
+    # True if the path resolves to a file in the workspace's require paths.
+    #
+    # @param path [String]
+    # @return [Boolean]
+    def would_require? path
+      require_paths.each do |rp|
+        full = File.join rp, path
+        return true if File.file?(full) || File.file?(full << ".rb")
+      end
+      false
+    end
+
+    # @return [String, nil]
+    def rbs_collection_path
+      @gem_rbs_collection ||= read_rbs_collection_path
+    end
+
+    # @return [String, nil]
+    def rbs_collection_config_path
+      @rbs_collection_config_path ||= begin
+        unless directory.empty? || directory == '*'
+          yaml_file = File.join(directory, 'rbs_collection.yaml')
+          yaml_file if File.file?(yaml_file)
+        end
+      end
+    end
+
+    # Synchronize the workspace from the provided updater.
+    #
+    # @param updater [Source::Updater]
+    # @return [void]
+    def synchronize! updater
+      source_hash[updater.filename] = source_hash[updater.filename].synchronize(updater)
+    end
+
+    # @return [String]
+    def command_path
+      server['commandPath'] || 'solargraph'
+    end
+
+    # @return [String, nil]
+    def directory_or_nil
+      return nil if directory.empty? || directory == '*'
+      directory
+    end
+
+    # True if the workspace has a root Gemfile.
+    #
+    # @todo Handle projects with custom Bundler/Gemfile setups (see DocMap#gemspecs_required_from_bundler)
+    #
+    def gemfile?
+      directory && File.file?(File.join(directory, 'Gemfile'))
+    end
+
+    private
+
+    # The language server configuration (or an empty hash if the workspace was
+    # not initialized from a server).
+    #
+    # @return [Hash]
+    attr_reader :server
+
+    # @return [Hash{String => Solargraph::Source}]
+    def source_hash
+      @source_hash ||= {}
+    end
+
+    # @return [void]
+    def load_sources
+      source_hash.clear
+      unless directory.empty? || directory == '*'
+        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|
+          begin
+            source_hash[filename] = Solargraph::Source.load(filename)
+          rescue Errno::ENOENT => e
+            Solargraph.logger.warn("Error loading #{filename}: [#{e.class}] #{e.message}")
+          end
+        end
+      end
+    end
+
+    # @return [void]
+    def require_plugins
+      config.plugins.each do |plugin|
+        begin
+          require plugin
+        rescue LoadError
+          Solargraph.logger.warn "Failed to load plugin '#{plugin}'"
+        end
+      end
+    end
+
+    # @return [String, nil]
+    def read_rbs_collection_path
+      return unless rbs_collection_config_path
+
+      path = YAML.load_file(rbs_collection_config_path)&.fetch('path')
+      # make fully qualified
+      File.expand_path(path, directory)
+    end
+  end
+end

data/lib/solargraph/yard_map/helpers.rb

@@ -1,16 +1,44 @@
-module Solargraph
-  class YardMap
-    module Helpers
-      module_function
-
-      # @param code_object [YARD::CodeObjects::Base]
-      # @param spec [Gem::Specification, nil]
-      # @return [Solargraph::Location, nil]
-      def object_location code_object, spec
-        return nil if spec.nil? || code_object.nil? || code_object.file.nil? || code_object.line.nil?
-        file = File.join(spec.full_gem_path, code_object.file)
-        Solargraph::Location.new(file, Solargraph::Range.from_to(code_object.line - 1, 0, code_object.line - 1, 0))
-      end
-    end
-  end
-end
+module Solargraph
+  class YardMap
+    module Helpers
+      module_function
+
+      # @param code_object [YARD::CodeObjects::Base]
+      # @param spec [Gem::Specification, nil]
+      # @return [Solargraph::Location, nil]
+      def object_location code_object, spec
+        if spec.nil? || code_object.nil? || code_object.file.nil? || code_object.line.nil?
+          if code_object.namespace.is_a?(YARD::CodeObjects::NamespaceObject)
+            # If the code object is a namespace, use the namespace's location
+            return object_location(code_object.namespace, spec)
+          end
+          return Solargraph::Location.new(__FILE__, Solargraph::Range.from_to(__LINE__ - 1, 0, __LINE__ - 1, 0))
+        end
+        file = File.join(spec.full_gem_path, code_object.file)
+        Solargraph::Location.new(file, Solargraph::Range.from_to(code_object.line - 1, 0, code_object.line - 1, 0))
+      end
+
+      # @param code_object [YARD::CodeObjects::Base]
+      # @param spec [Gem::Specification, nil]
+      # @return [Solargraph::Pin::Namespace]
+      def create_closure_namespace_for(code_object, spec)
+        code_object_for_location = code_object
+        # code_object.namespace is sometimes a YARD proxy object pointing to a method path ("Object#new")
+        code_object_for_location = code_object.namespace if code_object.namespace.is_a?(YARD::CodeObjects::NamespaceObject)
+        namespace_location = object_location(code_object_for_location, spec)
+        ns_name = code_object.namespace.to_s
+        if ns_name.empty?
+          Solargraph::Pin::ROOT_PIN
+        else
+          Solargraph::Pin::Namespace.new(
+            name: ns_name,
+            closure: Pin::ROOT_PIN,
+            gates: [code_object.namespace.to_s],
+            source: :yardoc,
+            location: namespace_location
+          )
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/yard_map/mapper/to_constant.rb

@@ -7,12 +7,12 @@ module Solargraph
         extend YardMap::Helpers
 
         # @param code_object [YARD::CodeObjects::Base]
+        # @param closure [Pin::Closure, nil]
+        # @param spec [Gem::Specification, nil]
+        # @return [Pin::Constant]
         def self.make code_object, closure = nil, spec = nil
-          closure ||= Solargraph::Pin::Namespace.new(
-            name: code_object.namespace.to_s,
-            gates: [code_object.namespace.to_s],
-            source: :yardoc,
-          )
+          closure ||= create_closure_namespace_for(code_object, spec)
+
           Pin::Constant.new(
             location: object_location(code_object, spec),
             closure: closure,