solargraph 0.37.2 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c6e8cd33eaba452660f445e5edf77658e1a3bf0e7604b753b6632e06ce4af00
-  data.tar.gz: bf6d0596a144b1bee2968e87f451b02a60cafa35c9871a0abe8b0f29a1c360cc
+  metadata.gz: 0b51cc5aaad5a07e4b7a5f6d2678b3fa42ffba42e7eb5aef0a9dca1834fe3b32
+  data.tar.gz: eef096fe46ea782d8d1b747f4bf1faa80c3cac9caf80b6f212face3ae8d45392
 SHA512:
-  metadata.gz: 5f28aa0e7914a6d8f04bb25ea99f81cbb795a1d1bb76121397aa291e0db1132e108fd71ed814d4b65807ed985dbf60b4909a20e976cca0ed80c66e6770224b7c
-  data.tar.gz: 79cc5e511a24c736f7564233f9c0bdc0593b738c739c9fc7897bca7e3b2e2361d0f520ccea009514acc4f2dcd4d60b05778487af2c4d18367a0222abe40b1e65
+  metadata.gz: 47f9cdd2ef911ab8ace7de207503c53bc518aaa1b303bb2bc097b86cca229d73886ad8fa0bd7d502794cc8ec67c4c9a9077bd75b2c06e9e9bb39e3879a102eef
+  data.tar.gz: 698d1343b2843767c9a51d7330f0af2c4202018b1e9cd3e78179f3dd709d1a4a48b5b01ada8d867b8107c4b297a5bc34305989f4adaa7e9057732f1298b54975

data/lib/solargraph.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require 'yard'
+# require 'yard'
 require 'solargraph/version'
-require 'rubygems/package'
-require 'yard-solargraph'
+# require 'yard-solargraph'
 
 # The top-level namespace for the Solargraph code mapping, documentation,
 # static analysis, and language server libraries.
@@ -53,7 +52,3 @@ module Solargraph
     Solargraph::Logging.logger
   end
 end
-
-Solargraph::YardMap::CoreDocs.require_minimum
-# Change YARD log IO to avoid sending unexpected messages to STDOUT
-YARD::Logger.instance.io = File.new(File::NULL, 'w')

data/lib/solargraph/api_map.rb

@@ -3,6 +3,8 @@
 require 'rubygems'
 require 'set'
 require 'pathname'
+require 'yard'
+require 'yard-solargraph'
 
 module Solargraph
   # An aggregate provider for information about workspaces, sources, gems, and

data/lib/solargraph/api_map/store.rb

@@ -147,7 +147,14 @@ module Solargraph
           base = ''
           name = fqns
         end
-        namespace_children(base).select{|pin| pin.name == name && pin.is_a?(Pin::Namespace)}
+        fqns_pins_map[[base, name]]
+      end
+
+      def fqns_pins_map
+        @fqns_pins_map ||= Hash.new do |h, (base, name)|
+          value = namespace_children(base).select { |pin| pin.name == name && pin.is_a?(Pin::Namespace) }
+          h[[base, name]] = value
+        end
       end
 
       # @return [Array<Solargraph::Pin::Symbol>]

data/lib/solargraph/complex_type.rb

@@ -20,6 +20,7 @@ module Solargraph
     # @return [ComplexType]
     def qualify api_map, context = ''
       types = @items.map do |t|
+        next t if ['Boolean', 'nil', 'void', 'undefined'].include?(t.name)
         t.qualify api_map, context
       end
       ComplexType.new(types)

data/lib/solargraph/converters/dd.rb

@@ -0,0 +1,12 @@
+module ReverseMarkdown
+  module Converters
+    class Dd < Base
+      def convert node, state = {}
+        content = treat_children(node, state)
+        ": #{content.strip}\n"
+      end
+    end
+  end
+end
+
+ReverseMarkdown::Converters.register :dd, ReverseMarkdown::Converters::Dd.new

data/lib/solargraph/converters/dl.rb

@@ -0,0 +1,12 @@
+module ReverseMarkdown
+  module Converters
+    class Dl < Base
+      def convert node, state = {}
+        content = treat_children(node, state).strip
+        "\n\n#{content}\n"
+      end
+    end
+  end
+end
+
+ReverseMarkdown::Converters.register :dl, ReverseMarkdown::Converters::Dl.new

data/lib/solargraph/converters/dt.rb

@@ -0,0 +1,12 @@
+module ReverseMarkdown
+  module Converters
+    class Dt < Base
+      def convert node, state = {}
+        content = treat_children(node, state)
+        "\n#{content.strip}\n"
+      end
+    end
+  end
+end
+
+ReverseMarkdown::Converters.register :dt, ReverseMarkdown::Converters::Dt.new

data/lib/solargraph/converters/misc.rb

@@ -0,0 +1 @@
+ReverseMarkdown::Converters.register :tt, ReverseMarkdown::Converters::Code.new

data/lib/solargraph/diagnostics/rubocop.rb

@@ -35,17 +35,6 @@ module Solargraph
 
       private
 
-      # @todo This is a smelly way to redirect output, but the RuboCop specs do
-      #   the same thing.
-      # @return [String]
-      def redirect_stdout
-        redir = StringIO.new
-        $stdout = redir
-        yield if block_given?
-        $stdout = STDOUT
-        redir.string
-      end
-
       # @param resp [Hash]
       # @return [Array<Hash>]
       def make_array resp

data/lib/solargraph/diagnostics/rubocop_helpers.rb

@@ -45,6 +45,17 @@ module Solargraph
         return path unless path.match(/^[a-z]:/)
         path[0].upcase + path[1..-1]
       end
+
+      # @todo This is a smelly way to redirect output, but the RuboCop specs do
+      #   the same thing.
+      # @return [String]
+      def redirect_stdout
+        redir = StringIO.new
+        $stdout = redir
+        yield if block_given?
+        $stdout = STDOUT
+        redir.string
+      end
     end
   end
 end

data/lib/solargraph/language_server/message.rb

@@ -56,38 +56,38 @@ module Solargraph
         end
       end
 
-      register 'initialize',                       Initialize
-      register 'initialized',                      Initialized
-      register 'textDocument/completion',          TextDocument::Completion
-      register 'completionItem/resolve',           CompletionItem::Resolve
-      register 'textDocument/signatureHelp',       TextDocument::SignatureHelp
-      register 'textDocument/didOpen',             TextDocument::DidOpen
-      register 'textDocument/didChange',           TextDocument::DidChange
-      register 'textDocument/didSave',             TextDocument::DidSave
-      register 'textDocument/didClose',            TextDocument::DidClose
-      register 'textDocument/hover',               TextDocument::Hover
-      register 'textDocument/definition',          TextDocument::Definition
-      register 'textDocument/formatting',          TextDocument::Formatting
-      register 'textDocument/onTypeFormatting',    TextDocument::OnTypeFormatting
-      register 'textDocument/documentSymbol',      TextDocument::DocumentSymbol
-      register 'textDocument/references',          TextDocument::References
-      register 'textDocument/rename',              TextDocument::Rename
-      register 'textDocument/prepareRename',       TextDocument::PrepareRename
-      register 'textDocument/foldingRange',        TextDocument::FoldingRange
-      register 'textDocument/codeAction',          TextDocument::CodeAction
-      register 'workspace/didChangeWatchedFiles',  Workspace::DidChangeWatchedFiles
-      register 'workspace/didChangeConfiguration', Workspace::DidChangeConfiguration
+      register 'initialize',                          Initialize
+      register 'initialized',                         Initialized
+      register 'textDocument/completion',             TextDocument::Completion
+      register 'completionItem/resolve',              CompletionItem::Resolve
+      register 'textDocument/signatureHelp',          TextDocument::SignatureHelp
+      register 'textDocument/didOpen',                TextDocument::DidOpen
+      register 'textDocument/didChange',              TextDocument::DidChange
+      register 'textDocument/didSave',                TextDocument::DidSave
+      register 'textDocument/didClose',               TextDocument::DidClose
+      register 'textDocument/hover',                  TextDocument::Hover
+      register 'textDocument/definition',             TextDocument::Definition
+      register 'textDocument/formatting',             TextDocument::Formatting
+      register 'textDocument/onTypeFormatting',       TextDocument::OnTypeFormatting
+      register 'textDocument/documentSymbol',         TextDocument::DocumentSymbol
+      register 'textDocument/references',             TextDocument::References
+      register 'textDocument/rename',                 TextDocument::Rename
+      register 'textDocument/prepareRename',          TextDocument::PrepareRename
+      register 'textDocument/foldingRange',           TextDocument::FoldingRange
+      register 'textDocument/codeAction',             TextDocument::CodeAction
+      register 'workspace/didChangeWatchedFiles',     Workspace::DidChangeWatchedFiles
+      register 'workspace/didChangeConfiguration',    Workspace::DidChangeConfiguration
       register 'workspace/didChangeWorkspaceFolders', Workspace::DidChangeWorkspaceFolders
-      register 'workspace/symbol',                 Workspace::WorkspaceSymbol
-      register '$/cancelRequest',                  CancelRequest
-      register '$/solargraph/document',            Extended::Document
-      register '$/solargraph/search',              Extended::Search
-      register '$/solargraph/checkGemVersion',     Extended::CheckGemVersion
-      register '$/solargraph/documentGems',        Extended::DocumentGems
-      register '$/solargraph/downloadCore',        Extended::DownloadCore
-      register '$/solargraph/environment',         Extended::Environment
-      register 'shutdown',                         Shutdown
-      register 'exit',                             ExitNotification
+      register 'workspace/symbol',                    Workspace::WorkspaceSymbol
+      register '$/cancelRequest',                     CancelRequest
+      register '$/solargraph/document',               Extended::Document
+      register '$/solargraph/search',                 Extended::Search
+      register '$/solargraph/checkGemVersion',        Extended::CheckGemVersion
+      register '$/solargraph/documentGems',           Extended::DocumentGems
+      register '$/solargraph/downloadCore',           Extended::DownloadCore
+      register '$/solargraph/environment',            Extended::Environment
+      register 'shutdown',                            Shutdown
+      register 'exit',                                ExitNotification
     end
   end
 end

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

@@ -1,29 +1,40 @@
 # frozen_string_literal: true
 
-require 'open3'
-require 'shellwords'
+require 'rubocop'
+require 'securerandom'
 
 module Solargraph
   module LanguageServer
     module Message
       module TextDocument
         class Formatting < Base
+          include Solargraph::Diagnostics::RubocopHelpers
+
           def process
             filename = uri_to_file(params['textDocument']['uri'])
-            filename = 'tmp.rb' if filename.nil? or filename.empty?
+            # Make the temp file in the original file's directory so RuboCop
+            # detects the correct configuration
+            tempfile = File.join(File.dirname(filename), "_tmp_#{SecureRandom.hex(8)}_#{File.basename(filename)}")
             original = host.read_text(params['textDocument']['uri'])
-            cmd = "rubocop -a -f fi -s #{Shellwords.escape(filename)}"
-            o, e, s = Open3.capture3(cmd, stdin_data: original)
-            return format(original, o) if o && !o.empty?
-            set_error(Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, e)
+            File.write tempfile, original
+            begin
+              options, paths = RuboCop::Options.new.parse(['-a', '-f', 'fi', tempfile])
+              redirect_stdout { RuboCop::Runner.new(options, RuboCop::ConfigStore.new).run(paths) }
+              result = File.read(tempfile)
+              File.unlink tempfile
+              format original, result
+            rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e
+              set_error(Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}")
+              File.unlink tempfile
+            end
           end
 
+          private
+
+          # @param original [String]
+          # @param result [String]
+          # @return [void]
           def format original, result
-            lines = result.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,
@@ -45,7 +56,7 @@ module Solargraph
                     },
                     end: ending
                   },
-                  newText: formatted
+                  newText: result
                 }
               ]
             )

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

@@ -19,7 +19,7 @@ module Solargraph
               if !this_link.nil? && this_link != last_link
                 parts.push this_link
               end
-              parts.push pin.detail unless pin.is_a?(Pin::Namespace) || pin.detail.nil?
+              parts.push pin.detail.gsub(':', '\\:') unless pin.is_a?(Pin::Namespace) || pin.detail.nil?
               parts.push pin.documentation unless pin.documentation.nil? or pin.documentation.empty?
               contents.push parts.join("\n\n") unless parts.empty?
               last_link = this_link unless this_link.nil?

data/lib/solargraph/language_server/transport/data_reader.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 module Solargraph
   module LanguageServer
     module Transport

data/lib/solargraph/page.rb

@@ -3,7 +3,6 @@
 require 'ostruct'
 require 'tilt'
 require 'yard'
-require 'htmlentities'
 require 'cgi'
 
 module Solargraph
@@ -30,7 +29,7 @@ module Solargraph
       # @param text [String]
       # @return [String]
       def escape text
-        HTMLEntities.new.encode(text)
+        CGI.escapeHTML(text)
       end
 
       # @param code [String]

data/lib/solargraph/pin.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'yard'
+
 module Solargraph
   # The namespace for pins used in maps.
   #

data/lib/solargraph/pin/base.rb

@@ -237,7 +237,7 @@ module Solargraph
       # @return [void]
       def parse_comments
         # HACK: Avoid a NoMethodError on nil with empty overload tags
-        if comments.empty? || comments.strip.end_with?('@overload')
+        if comments.nil? || comments.empty? || comments.strip.end_with?('@overload')
           @docstring = nil
           @directives = []
         else

data/lib/solargraph/pin/documenting.rb

@@ -1,25 +1,91 @@
 # frozen_string_literal: true
 
+require 'maruku'
+require 'yard'
 require 'reverse_markdown'
+require 'solargraph/converters/dl'
+require 'solargraph/converters/dt'
+require 'solargraph/converters/dd'
+require 'solargraph/converters/misc'
+
+# HACK: Setting :html_parser through `Maruku.new` does not work
+MaRuKu::Globals[:html_parser] = 'nokogiri'
 
 module Solargraph
   module Pin
     # A module to add the Pin::Base#documentation method.
     #
     module Documenting
+      # A documentation formatter that either performs Markdown conversion for
+      # text, or applies backticks for code blocks.
+      #
+      class DocSection
+        # @return [String]
+        attr_reader :plaintext
+
+        # @param code [Boolean] True if this section is a code block
+        def initialize code
+          @plaintext = String.new('')
+          @code = code
+        end
+
+        def code?
+          @code
+        end
+
+        # @param text [String]
+        # @return [String]
+        def concat text
+          @plaintext.concat text
+        end
+
+        def to_s
+          return "\n```ruby\n#{@plaintext}#{@plaintext.end_with?("\n") ? '' : "\n"}```\n\n" if code?
+          ReverseMarkdown.convert unescape_brackets(Maruku.new(escape_brackets(@plaintext), on_error: :raise).to_html)
+        rescue MaRuKu::Exception
+          # Maruku exceptions usually indicate that the documentation is in
+          # RDoc syntax.
+          ReverseMarkdown.convert YARD::Templates::Helpers::Markup::RDocMarkup.new(@plaintext).to_html
+        end
+
+        private
+
+        # @param text [String]
+        # @return [String]
+        def escape_brackets text
+          text.gsub(/(\[[^\]]*\])([^\(]|\z)/, '!!!`\1`!!!\2')
+        end
+
+        # @param text [String]
+        # @return [String]
+        def unescape_brackets text
+          text.gsub('!!!`[', '[').gsub(']`!!!', ']')
+        end
+      end
+
       # @return [String]
       def documentation
         @documentation ||= begin
-          indented = false
-          normalize_indentation(docstring.to_s).gsub(/\t/, '  ').lines.map { |l|
-            if l =~ /^  [^\s]/ || (l.start_with?(' ') && indented)
-              indented = true
-              "  #{l}"
+          # Using DocSections allows for code blocks that start with an empty
+          # line and at least two spaces of indentation. This is a common
+          # convention in Ruby core documentation, e.g., String#split.
+          sections = [DocSection.new(false)]
+          normalize_indentation(docstring.to_s).gsub(/\t/, '  ').lines.each do |l|
+            if l.strip.empty?
+              sections.last.concat l
             else
-              indented = false
-              l # (was `unhtml l`)
+              if (l =~ /^  [^\s]/ && sections.last.plaintext =~ /(\r?\n[ \t]*?){2,}$/) || (l.start_with?('  ') && sections.last.code?)
+                # Code block
+                sections.push DocSection.new(true) unless sections.last.code?
+                sections.last.concat l[2..-1]
+              else
+                # Regular documentation
+                sections.push DocSection.new(false) if sections.last.code?
+                sections.last.concat l
+              end
             end
-          }.join
+          end
+          sections.map(&:to_s).join
         end
       end
 
@@ -39,15 +105,6 @@ module Solargraph
         return line unless spaces.odd?
         line[1..-1]
       end
-
-      # @todo This was tested as a simple way to convert some of the more
-      #   common markup in documentation to Markdown. We should still look
-      #   for a solution, but it'll have to be more robust than this.
-      def unhtml text
-        text.gsub(/\<\/?(code|tt)\>/, '`')
-            .gsub(/\<\/?(em|i)\>/, '*')
-            .gsub(/\<\/?(strong|b)\>/, '**')
-      end
     end
   end
 end

data/lib/solargraph/pin/method.rb

@@ -76,7 +76,7 @@ module Solargraph
             name: name,
             closure: closure,
             args: tag.parameters.map(&:first),
-            comments: tag.docstring.all
+            comments: tag.docstring.all.to_s
           )
         end
       end

data/lib/solargraph/pin/yard_pin/yard_mixin.rb

@@ -11,7 +11,7 @@ module Solargraph
         @@gate_cache ||= {}
 
         def comments
-          @comments ||= code_object.docstring ? code_object.docstring.all : ''
+          @comments ||= code_object.docstring ? code_object.docstring.all.to_s : ''
         end
 
         def location

data/lib/solargraph/shell.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'backport'
-require 'benchmark'
 
 module Solargraph
   class Shell < Thor
@@ -20,6 +18,7 @@ module Solargraph
     option :host, type: :string, aliases: :h, desc: 'The server host', default: '127.0.0.1'
     option :port, type: :numeric, aliases: :p, desc: 'The server port', default: 7658
     def socket
+      require 'backport'
       port = options[:port]
       port = available_port if port.zero?
       Backport.run do
@@ -36,6 +35,7 @@ module Solargraph
 
     desc 'stdio', 'Run a Solargraph stdio server'
     def stdio
+      require 'backport'
       Backport.run do
         Signal.trap("INT") do
           Backport.stop
@@ -159,6 +159,7 @@ module Solargraph
     option :directory, type: :string, aliases: :d, desc: 'The workspace directory', default: '.'
     option :verbose, type: :boolean, aliases: :v, desc: 'Verbose output', default: false
     def scan
+      require 'benchmark'
       directory = File.realpath(options[:directory])
       api_map = nil
       time = Benchmark.measure {

data/lib/solargraph/source/node_methods.rb

@@ -55,21 +55,21 @@ module Solargraph
       def infer_literal_node_type node
         return nil unless node.is_a?(AST::Node)
         if node.type == :str || node.type == :dstr
-          return 'String'
+          return '::String'
         elsif node.type == :array
-          return 'Array'
+          return '::Array'
         elsif node.type == :hash
-          return 'Hash'
+          return '::Hash'
         elsif node.type == :int
-          return 'Integer'
+          return '::Integer'
         elsif node.type == :float
-          return 'Float'
+          return '::Float'
         elsif node.type == :sym
-          return 'Symbol'
+          return '::Symbol'
         elsif node.type == :regexp
-          return 'Regexp'
+          return '::Regexp'
         elsif node.type == :irange
-          return 'Range'
+          return '::Range'
         # @todo Support `nil` keyword in types
         # elsif node.type == :nil
         #   return 'NilClass'

data/lib/solargraph/source_map.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'jaro_winkler'
+require 'yard'
+require 'yard-solargraph'
 
 module Solargraph
   # An index of pins and other ApiMap-related data for a Source.

data/lib/solargraph/source_map/mapper.rb

@@ -104,7 +104,7 @@ module Solargraph
           gen_pin = Solargraph::SourceMap::NodeProcessor.process(src_node, region).first.last
           return if gen_pin.nil?
           # @todo: Smelly instance variable access
-          gen_pin.instance_variable_set(:@comments, docstring.all)
+          gen_pin.instance_variable_set(:@comments, docstring.all.to_s)
           @pins.push gen_pin
         when 'attribute'
           return if directive.tag.name.nil?
@@ -115,7 +115,7 @@ module Solargraph
               location: location,
               closure: namespace,
               name: directive.tag.name,
-              comments: docstring.all,
+              comments: docstring.all.to_s,
               access: :reader,
               scope: namespace.is_a?(Pin::Singleton) ? :class : :instance,
               visibility: :public
@@ -126,7 +126,7 @@ module Solargraph
               location: location,
               closure: namespace,
               name: "#{directive.tag.name}=",
-              comments: docstring.all,
+              comments: docstring.all.to_s,
               access: :writer,
               scope: namespace.is_a?(Pin::Singleton) ? :class : :instance,
               visibility: :public

data/lib/solargraph/type_checker.rb

@@ -231,8 +231,15 @@ module Solargraph
                   else
                     argtype = arg.infer(api_map, block, locals)
                     if !arg_to_duck(argtype, partype)
-                      if argtype.tag != partype.tag && !api_map.super_and_sub?(partype.tag.to_s, argtype.tag.to_s)
-                        result.push Problem.new(Solargraph::Location.new(filename, Solargraph::Range.from_node(node)), "Wrong parameter type for #{pin.path}: #{pin.parameter_names[index]} expected #{partype.tag}, received #{argtype.tag}")
+                      match = false
+                      partype.each do |pt|
+                        if argtype.tag == pt.tag || api_map.super_and_sub?(pt.tag.to_s, argtype.tag.to_s)
+                          match = true
+                          break
+                        end
+                      end
+                      unless match
+                        result.push Problem.new(Solargraph::Location.new(filename, Solargraph::Range.from_node(node)), "Wrong parameter type for #{pin.path}: #{pin.parameter_names[index]} expected [#{partype}], received [#{argtype.tag}]")
                       end
                     end
                   end

data/lib/solargraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.37.2'
+  VERSION = '0.38.0'
 end

data/lib/solargraph/yard_map.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'yard'
+require 'yard-solargraph'
+require 'rubygems/package'
 
 module Solargraph
   # The YardMap provides access to YARD documentation for the Ruby core, the
@@ -18,7 +20,7 @@ module Solargraph
     @@stdlib_paths = {}
     YARD::Registry.load! @@stdlib_yardoc
     YARD::Registry.all(:class, :module).each do |ns|
-      next if ns.file.nil?
+      next if ns.nil? || ns.file.nil?
       path = ns.file.sub(/^(ext|lib)\//, '').sub(/\.(rb|c)$/, '')
       next if path.start_with?('-')
       @@stdlib_paths[path] ||= []
@@ -291,3 +293,7 @@ module Solargraph
     end
   end
 end
+
+Solargraph::YardMap::CoreDocs.require_minimum
+# Change YARD log IO to avoid sending unexpected messages to STDOUT
+YARD::Logger.instance.io = File.new(File::NULL, 'w')

data/solargraph.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'backport', '~> 1.1'
   s.add_runtime_dependency 'bundler', '>= 1.17.2'
-  s.add_runtime_dependency 'htmlentities', '~> 4.3', '>= 4.3.4'
   s.add_runtime_dependency 'jaro_winkler', '~> 1.5'
+  s.add_runtime_dependency 'maruku', '~> 0.7', '>= 0.7.3'
   s.add_runtime_dependency 'nokogiri', '~> 1.9', '>= 1.9.1'
   s.add_runtime_dependency 'parser', '~> 2.3'
   s.add_runtime_dependency 'reverse_markdown', '~> 1.0', '>= 1.0.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.37.2
+  version: 0.38.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -39,39 +39,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.17.2
 - !ruby/object:Gem::Dependency
-  name: htmlentities
+  name: jaro_winkler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.3.4
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.3.4
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: jaro_winkler
+  name: maruku
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -283,6 +283,10 @@ files:
 - lib/solargraph/convention/gemfile.rb
 - lib/solargraph/convention/gemspec.rb
 - lib/solargraph/convention/rspec.rb
+- lib/solargraph/converters/dd.rb
+- lib/solargraph/converters/dl.rb
+- lib/solargraph/converters/dt.rb
+- lib/solargraph/converters/misc.rb
 - lib/solargraph/core_fills.rb
 - lib/solargraph/diagnostics.rb
 - lib/solargraph/diagnostics/base.rb