solargraph 0.19.1 → 0.20.0

data/lib/solargraph/version.rb

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

data/lib/solargraph/workspace.rb

@@ -90,6 +90,26 @@ module Solargraph
       @stime = source_hash.values.sort{|a, b| a.stime <=> b.stime}.last.stime
     end
 
+    def require_paths
+      @require_paths ||= generate_require_paths
+    end
+
+    def would_require? path
+      require_paths.each do |rp|
+        return true if File.exist?(File.join(rp, "#{path}.rb"))
+      end
+      false
+    end
+
+    def gemspec?
+      return true unless gemspecs.empty?
+    end
+
+    def gemspecs
+      return [] if directory.nil?
+      @gemspecs ||= Dir[File.join(directory, '**/*.gemspec')]
+    end
+
     private
 
     # @return [Hash<String, Solargraph::Source>]
@@ -109,5 +129,18 @@ module Solargraph
       end
       @stime = Time.now
     end
+
+    def generate_require_paths
+      return [] if directory.nil?
+      return [File.join(directory, 'lib')] unless gemspec?
+      result = []
+      gemspecs.each do |file|
+        spec = Gem::Specification.load(file)
+        base = File.dirname(file)
+        result.concat spec.require_paths.map{ |path| File.join(base, path) } unless spec.nil?
+      end
+      result.push File.join(directory, 'lib') if result.empty?
+      result
+    end
   end
 end

data/lib/solargraph/workspace/config.rb

@@ -26,6 +26,7 @@ module Solargraph
         @raw_data ||= {}
         @raw_data['include'] ||= include_globs
         @raw_data['exclude'] ||= exclude_globs
+        @raw_data['reporters'] ||= []
         @raw_data['domains'] ||= []
         @raw_data['required'] ||= []
         @raw_data['plugins'] ||= []
@@ -69,6 +70,14 @@ module Solargraph
         raw_data['plugins']
       end
 
+      def reporters
+        raw_data['reporters']
+      end
+
+      def require_paths
+        @require_paths ||= generate_require_paths
+      end
+
       private
 
       def process_globs globs
@@ -101,6 +110,9 @@ module Solargraph
       def glob_to_directory glob
         glob.gsub(/(\/\*|\/\*\*\/\*\*?)$/, '')
       end
+
+      def generate_require_paths
+      end
     end
   end
 end

data/lib/solargraph/yard_map.rb

@@ -45,6 +45,10 @@ module Solargraph
       @yardocs ||= []
     end
 
+    def unresolved_requires
+      @unresolved_requires ||= []
+    end
+
     def load_yardoc y
       begin
         if y.kind_of?(Array)
@@ -139,33 +143,15 @@ module Solargraph
           yard = load_yardoc(y)
           unless yard.nil?
             ns = nil
-            ns = find_first_resolved_namespace(yard, namespace, scope)
+            ns = find_first_resolved_object(yard, namespace, scope)
             unless ns.nil?
               ns.meths(scope: :class, visibility: visibility).each { |m|
-                n = m.to_s.split(/[\.#]/).last.gsub(/=$/, ' = ')
-                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 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.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
@@ -185,21 +171,13 @@ module Solargraph
           yard = load_yardoc(y)
           unless yard.nil?
             ns = nil
-            ns = find_first_resolved_namespace(yard, namespace, scope)
+            ns = find_first_resolved_object(yard, namespace, scope)
             unless ns.nil?
               ns.meths(scope: :instance, visibility: visibility).each { |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:')
-                  label = "#{n}"
-                  args = get_method_args(m)
-                  kind = (m.is_attribute? ? Suggestion::FIELD : Suggestion::METHOD)
-                  rt = nil
-                  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 Pin::YardObject.new(m, object_location(m))
                 end
               }
@@ -242,26 +220,9 @@ module Solargraph
       yardocs.each { |y|
         yard = load_yardoc(y)
         unless yard.nil?
-          obj = find_first_resolved_namespace(yard, path, space)
-          if obj.nil? and path.include?('#')
-            parts = path.split('#')
-            obj = yard.at(parts[0])
-            unless obj.nil?
-              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 Pin::YardObject.new(m, object_location(m))
-              end
-            end
-          else
-            unless obj.nil?
-              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 Pin::YardObject.new(obj, object_location(obj))
-            end
+          obj = find_first_resolved_object(yard, path, space)
+          unless obj.nil?
+            result.push Pin::YardObject.new(obj, object_location(obj))
           end
         end
       }
@@ -290,20 +251,7 @@ module Solargraph
       @cache ||= Cache.new
     end
 
-    def get_method_args meth
-      args = []
-      meth.parameters.each { |a|
-        p = a[0]
-        unless a[1].nil?
-          p += ' =' unless p.end_with?(':')
-          p += " #{a[1]}"
-        end
-        args.push p
-      }
-      args
-    end
-
-    def find_first_resolved_namespace yard, namespace, scope
+    def find_first_resolved_object yard, namespace, scope
       unless scope.nil?
         parts = scope.split('::')
         while parts.length > 0
@@ -319,30 +267,21 @@ module Solargraph
       get_constants '', ''
     end
 
-    def kind_of_object obj
-      if obj.kind_of?(YARD::CodeObjects::MethodObject)
-        'Method'
-      elsif obj.kind_of?(YARD::CodeObjects::ClassObject)
-        'Class'
-      elsif obj.kind_of?(YARD::CodeObjects::ModuleObject)
-        'Module'
-      else
-        nil
-      end
-    end
-
     def process_gem_paths
-      if !has_bundle? or ENV['BUNDLE_GEMFILE'] == File.join(workspace.directory, 'Gemfile')
+      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!
-              # Bundler.setup
-              processed = true
               process_requires
+              processed = true
             rescue Exception => e
               STDERR.puts "#{e.class}: #{e.message}"
             end
@@ -355,24 +294,26 @@ module Solargraph
 
     def process_requires
       tried = []
+      unresolved_requires.clear
       required.each do |r|
-        # @todo Ignoring requires in the workspace's lib directory handles a lot of common cases.
-        next if !workspace.nil? and File.exist?(File.join(workspace.directory, "lib", "#{r}.rb"))
+        next if !workspace.nil? and workspace.would_require?(r)
         begin
           name = r.split('/').first
           next if name.nil?
-          # @todo Ignoring requires that match the workspace's gem name handles a few more.
-          next if !workspace.nil? and File.exist?(File.join(workspace.directory, "#{name}.gemspec"))
           spec = Gem::Specification.find_by_name(name)
-          next if spec.nil?
+          if spec.nil?
+            unresolved_requires.push r
+            next
+          end
           ver = spec.version.to_s
           ver = ">= 0" if ver.empty?
           add_gem_dependencies spec
           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
-          STDERR.puts "Required path #{r} could not be found in the workspace or gems"
+          unresolved_requires.push r
         end
       end
     end
@@ -383,7 +324,7 @@ module Solargraph
         @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}"
+          unresolved_requires.push dep.name
         else
           yardocs.unshift gy unless yardocs.include?(gy)
         end
@@ -414,13 +355,12 @@ module Solargraph
     end
 
     # @param obj [YARD::CodeObjects::Base]
+    # @return [Solargraph::Source::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)
-        if File.exist?(file)
-          return "#{file}:#{obj.line - 1}:0"
-        end
+        return Solargraph::Source::Location.new(file, Solargraph::Source::Range.from_to(obj.line - 1, 0, obj.line - 1, 0)) if File.exist?(file)
       end
       nil
     end

data/lib/yard-solargraph.rb

@@ -6,3 +6,4 @@ require 'yard/templates/helpers/html_helper'
 YARD::Tags::Library.define_tag("Type", :type, :with_types_and_name)
 # Define a @yieldself tag for documenting block contexts
 YARD::Tags::Library.define_tag("Yieldself", :yieldself, :with_types)
+YARD::Tags::Library.define_directive("domain", YARD::Tags::MacroDirective)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -127,25 +127,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.5
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '0'
   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
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -290,7 +284,10 @@ files:
 - lib/solargraph/api_map/store.rb
 - lib/solargraph/core_fills.rb
 - lib/solargraph/diagnostics.rb
+- lib/solargraph/diagnostics/base.rb
+- lib/solargraph/diagnostics/require_not_found.rb
 - lib/solargraph/diagnostics/rubocop.rb
+- lib/solargraph/diagnostics/severities.rb
 - lib/solargraph/language_server.rb
 - lib/solargraph/language_server/completion_item_kinds.rb
 - lib/solargraph/language_server/error_codes.rb
@@ -304,7 +301,9 @@ files:
 - 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/check_gem_version.rb
 - lib/solargraph/language_server/message/extended/document.rb
+- lib/solargraph/language_server/message/extended/document_gems.rb
 - lib/solargraph/language_server/message/extended/search.rb
 - lib/solargraph/language_server/message/initialize.rb
 - lib/solargraph/language_server/message/initialized.rb
@@ -329,6 +328,7 @@ files:
 - lib/solargraph/language_server/message/workspace/did_change_watched_files.rb
 - lib/solargraph/language_server/message/workspace/workspace_symbol.rb
 - lib/solargraph/language_server/message_types.rb
+- lib/solargraph/language_server/request.rb
 - lib/solargraph/language_server/symbol_kinds.rb
 - lib/solargraph/language_server/transport.rb
 - lib/solargraph/language_server/transport/socket.rb