solargraph 0.28.3 → 0.28.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5263886b3711a2cc3a6ff8b93c6162002feae2162055999a42d0e571473e47c
-  data.tar.gz: e936cac7abedde1efab2c97618c15a0290937211016cb7ae0a71d607b6483e23
+  metadata.gz: 0fd24fe0b737e17e14772aa13d7b948b5721ba99f3a0855682e78503ca337816
+  data.tar.gz: 1e907c9e1f5fa10537c406fdd512574da4dce74354d0d16accb04d91794c29a4
 SHA512:
-  metadata.gz: c8dd13d206f759022ab35d9721672b2a0c1c517a18f9e58cfeec7143eacdd6e8d20ad726cb5539bb2e010b9ec82593a4b164dd5bed4ddcb48e4adde17e226689
-  data.tar.gz: b4e88b5cd5f6c5d4495d4562edfd2510651410fe17e6e6b4db33dcee85afbe0ba7110fba5dabd143c76fd04a94e359ad07adae0588ca67ca2a1e445dd421ce67
+  metadata.gz: 77d273f6d65def59c5d4661a3479948fffce730fe9aebdff94cdc24dbefed1be8d60633e469a2d3f8c9941d1463980ed0db71eef7bdffe1182b6d9abc1835af6
+  data.tar.gz: e836999b24c652aa457a32db9f29a46264b91401c1fe6f4a86dc62baf9fce78e49f8795b6e957919ddcca21924c7ccc57a54d030f6183095dfa5d1663ab650d6

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

@@ -1,6 +1,3 @@
-require 'reverse_markdown'
-require 'uri'
-
 module Solargraph
   module LanguageServer
     module Message

data/lib/solargraph/page.rb

@@ -3,6 +3,7 @@ require 'tilt'
 require 'kramdown'
 require 'htmlentities'
 require 'coderay'
+require 'reverse_markdown'
 
 module Solargraph
   class Page
@@ -18,11 +19,8 @@ module Solargraph
       end
 
       def htmlify text
-        helper = Solargraph::Pin::Helper.new
-        html = helper.html_markup_rdoc(text)
-        conv = ReverseMarkdown.convert(html, github_flavored: true)
         Kramdown::Document.new(
-          conv,
+          text.to_s.lines.map{|l| l.gsub(/^  /, "\t")}.join,
           input: 'GFM',
           entity_output: :symbolic,
           syntax_highlighter_opts: {

data/lib/solargraph/pin.rb

@@ -2,7 +2,6 @@ module Solargraph
   # The namespace for pins used in maps.
   #
   module Pin
-    autoload :Helper,           'solargraph/pin/helper'
     autoload :Conversions,      'solargraph/pin/conversions'
     autoload :Base,             'solargraph/pin/base'
     autoload :Method,           'solargraph/pin/method'

data/lib/solargraph/pin/base.rb

@@ -1,5 +1,3 @@
-require 'reverse_markdown'
-
 module Solargraph
   module Pin
     # The base class for map pins.

data/lib/solargraph/pin/documenting.rb

@@ -1,18 +1,41 @@
+require 'rdoc'
+require 'reverse_markdown'
+require 'kramdown'
+
 module Solargraph
   module Pin
+    # A module to add the Pin::Base#documentation method.
+    #
     module Documenting
       # @return [String]
       def documentation
-        if @documentation.nil?
-          @documentation = ReverseMarkdown.convert(helper.html_markup_rdoc(docstring), github_flavored: true)
-          @documentation.strip!
+        @documentation ||= begin
+          html = Kramdown::Document.new(
+            normalize_indentation(docstring.to_s),
+            input: 'GFM',
+            entity_output: :symbolic,
+            syntax_highlighter: nil
+          ).to_html
+          ReverseMarkdown.convert(html, github_flavored: true)
         end
-        @documentation
       end
 
-      def helper
-        @helper ||= Solargraph::Pin::Helper.new
+      private
+
+      # @param text [String]
+      # @return [String]
+      def normalize_indentation text
+        text.lines.map { |l| remove_odd_spaces(l).gsub(/^  /, "\t") }.join
+      end
+
+      # @param line [String]
+      # @return [String]
+      def remove_odd_spaces line
+        return line unless line.start_with?(' ')
+        spaces = line.match(/^ +/)[0].length
+        return line unless spaces.odd?
+        line[1..-1]
       end
     end
   end
-end
+end

data/lib/solargraph/version.rb

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

data/lib/solargraph/workspace.rb

@@ -139,23 +139,38 @@ module Solargraph
       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 if directory.empty? || !gemspec?
       result = []
       gemspecs.each do |file|
+        base = File.dirname(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?
+        begin
+           spec = eval(File.read(file), binding, file)
+           next unless Gem::Specification === spec
+           result.concat spec.require_paths.map{ |path| File.join(base, path) } unless spec.nil?
+        rescue Exception => e
+           # Don't die if we have an error during eval-ing a gem spec.
+           # Concat the default lib directory instead.
+           # @todo Should the client be informed of the error through
+           #   diagnostics or some other mechanism?
+           result.push File.join(base, 'lib')
+        end
       end
       result.concat config.require_paths
       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?

metadata

@@ -1,83 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.28.3
+  version: 0.28.4
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: parser
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        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: '0.9'
+        version: '4.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.4
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
+        version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement
@@ -99,81 +113,81 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.5
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0.52'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0.52'
 - !ruby/object:Gem::Dependency
-  name: htmlentities
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.4
+        version: 0.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.4
+        version: 0.19.4
 - !ruby/object:Gem::Dependency
-  name: coderay
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+        version: 0.11.3
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.11.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -208,20 +222,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.3
 description: IDE tools for code completion and inline documentation
 email: admin@castwide.com
 executables:
@@ -319,7 +319,6 @@ files:
 - lib/solargraph/pin/documenting.rb
 - lib/solargraph/pin/duck_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

data/lib/solargraph/pin/helper.rb

@@ -1,41 +0,0 @@
-require 'yard'
-
-module Solargraph
-  module Pin
-    class Helper
-      include YARD::Templates::Helpers::HtmlHelper
-
-      attr_accessor :object
-      attr_accessor :serializer
-
-      def initialize object = nil
-        @object = object
-      end
-
-      def url_for(object)
-        '.'
-      end
-
-      def html_markup_rdoc(text)
-        # @todo The :rdoc markup class might not be immediately available.
-        #   If not, return nil for now under the assumption that the problem
-        #   will eventually fix itself.
-        return nil if markup_class(:rdoc).nil?
-        super
-      end
-
-      def options
-        if @options.nil?
-          @options = YARD::Templates::TemplateOptions.new
-          @options[:type] = :rdoc
-        end
-        @options
-      end
-
-      # HACK: The linkify method just returns the arguments as plain text
-      def linkify *args
-        args.join(', ')
-      end
-    end
-  end
-end