solargraph 0.35.2 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8036332dcdfd3db5e87daff4f720ec35f7f6872b9f8830e7bf1393dd0c471ee
-  data.tar.gz: 82e22e32d17d27fb3500e8366e1aeac95afa199c179f02b29f3367f3185b7cf7
+  metadata.gz: b775ff47aedcc50ee7f1b3c10db47ad78ae5de1c7be7763a3870bd36a5f1b25d
+  data.tar.gz: c860cd9e682a6065229d2a14142665b195232c3dd6a2e78e21bea0d9b30aabf1
 SHA512:
-  metadata.gz: bdda954fdbb8e7e071f96f004027646387529a3df7af0706ea7f5a0839ac32436582f9c57fb94c3ff5f1a962cce7cbe7140dc40b278a4d715e6ab4a59eb2f02c
-  data.tar.gz: 891e88524fb9d45190b326a29dabb36eff73c0ea1e9993a58b0cc443e7ee0c7b0265af9a74fe3beb3ca75e8c1ce833684ebbf6616e26507d94c8e495640b8f5f
+  metadata.gz: ea4070ee58a6ab2c00e7a86674e787395d5325c10cc4aa46f3f8c3b3f4f23726b93b639a479be9a3a86835eda0110672fddb63936637737350614bc2fe59df8b
+  data.tar.gz: 956f38e583f416eeabf0a95508ccaec1be6ea6f1d1a55e1461b3f5cd2612f07c939eabacf69516742d6f3c8dee9a6c14be78f522593441bc7016515f3c8254e0

data/.gitignore

@@ -1,5 +1,5 @@
 /Gemfile.lock
-
+.Gemfile
 .idea
 .vscode
 .yardoc

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 
 gemspec name: 'solargraph'
+
+# Local gemfile for development tools, etc.
+local_gemfile = File.expand_path(".Gemfile", __dir__)
+instance_eval File.read local_gemfile if File.exist? local_gemfile

data/lib/solargraph/language_server/message/extended/download_core.rb

@@ -10,15 +10,11 @@ module Solargraph
         #
         class DownloadCore < Base
           def process
-            cmd = "solargraph download-core"
-            o, s = Open3.capture2(cmd)
-            if s != 0
-              host.show_message "An error occurred while downloading documentation.", LanguageServer::MessageTypes::ERROR
-            else
-              ver = o.match(/[\d]*\.[\d]*\.[\d]*/)[0]
-              host.show_message "Downloaded documentation for Ruby #{ver}.", LanguageServer::MessageTypes::INFO
-              # @todo YardMap should be refreshed
-            end
+            ver = Solargraph::YardMap::CoreDocs.best_download
+            Solargraph::YardMap::CoreDocs.download ver
+            host.show_message "Downloaded documentation for Ruby #{ver}.", LanguageServer::MessageTypes::INFO
+          rescue StandardError => e
+            host.show_message "An error occurred while downloading documentation: [#{e.class}] #{e.message}", LanguageServer::MessageTypes::ERROR
           end
         end
       end

data/lib/solargraph/page.rb

@@ -2,7 +2,7 @@
 
 require 'ostruct'
 require 'tilt'
-require 'kramdown'
+require 'maruku'
 require 'htmlentities'
 require 'cgi'
 
@@ -24,17 +24,9 @@ module Solargraph
       # @param text [String]
       # @return [String]
       def htmlify text
-        Kramdown::Document.new(
-          text.to_s.lines.map{|l| l.gsub(/^  /, "\t")}.join,
-          input: 'GFM',
-          entity_output: :symbolic,
-          syntax_highlighter_opts: {
-            block: {
-              line_numbers: false
-            },
-            default_lang: :ruby
-          },
-        ).to_html
+        Maruku.new(text.to_s.lines.map{|l| l.gsub(/^  /, "\t")}.join).to_html
+        # redcarpet = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
+        # redcarpet.render(text.to_s.lines.map{|l| l.gsub(/^  /, "\t")}.join)
       end
 
       # @param code [String]

data/lib/solargraph/pin/base_variable.rb

@@ -43,13 +43,18 @@ module Solargraph
         return ComplexType::UNDEFINED if @assignment.nil?
         types = []
         returns_from(@assignment).each do |node|
-          pos = Solargraph::Position.new(node.loc.expression.last_line, node.loc.expression.last_column)
-          clip = api_map.clip_at(location.filename, pos)
-          # Use the return node for inference. The clip might infer from the
-          # first node in a method call instead of the entire call.
-          chain = Solargraph::Source::NodeChainer.chain(node, nil, clip.in_block?)
-          result = chain.infer(api_map, closure, clip.locals)
-          types.push result unless result.undefined?
+          # Nil nodes may not have a location
+          if node.type == :nil
+            types.push ComplexType::NIL
+          else
+            pos = Solargraph::Position.new(node.loc.expression.last_line, node.loc.expression.last_column)
+            clip = api_map.clip_at(location.filename, pos)
+            # Use the return node for inference. The clip might infer from the
+            # first node in a method call instead of the entire call.
+            chain = Solargraph::Source::NodeChainer.chain(node, nil, clip.in_block?)
+            result = chain.infer(api_map, closure, clip.locals)
+            types.push result unless result.undefined?
+          end
         end
         return ComplexType::UNDEFINED if types.empty?
         ComplexType.try_parse(*types.map(&:tag))

data/lib/solargraph/pin/documenting.rb

@@ -2,7 +2,7 @@
 
 require 'rdoc'
 require 'reverse_markdown'
-require 'kramdown'
+require 'maruku'
 
 module Solargraph
   module Pin
@@ -12,12 +12,7 @@ module Solargraph
       # @return [String]
       def documentation
         @documentation ||= begin
-          html = Kramdown::Document.new(
-            normalize_indentation(docstring.to_s),
-            input: 'GFM',
-            entity_output: :symbolic,
-            syntax_highlighter: nil
-          ).to_html
+          html = Maruku.new(normalize_indentation(docstring.to_s)).to_html
           ReverseMarkdown.convert(html, github_flavored: true).lines.map(&:rstrip).join("\n")
         end
       end

data/lib/solargraph/version.rb

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

data/solargraph.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   end
   s.homepage    = 'http://solargraph.org'
   s.license     = 'MIT'
-  s.executables   = ['solargraph', 'solargraph-runtime']
+  s.executables = ['solargraph']
 
   s.required_ruby_version = '>= 2.1'
 
@@ -23,7 +23,8 @@ Gem::Specification.new do |s|
   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 'kramdown', '~> 1.16'
+  s.add_runtime_dependency 'maruku', '~> 0.7'
+  s.add_runtime_dependency 'nokogiri', '>= 1.9.1'
   s.add_runtime_dependency 'parser', '~> 2.3'
   s.add_runtime_dependency 'reverse_markdown', '~> 1.0', '>= 1.0.5'
   s.add_runtime_dependency 'rubocop', '~> 0.52'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.35.2
+  version: 0.36.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -73,19 +73,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: maruku
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -248,7 +262,6 @@ description: IDE tools for code completion, inline documentation, and static ana
 email: admin@castwide.com
 executables:
 - solargraph
-- solargraph-runtime
 extensions: []
 extra_rdoc_files: []
 files:
@@ -263,7 +276,6 @@ files:
 - README.md
 - Rakefile
 - bin/solargraph
-- bin/solargraph-runtime
 - lib/solargraph.rb
 - lib/solargraph/api_map.rb
 - lib/solargraph/api_map/bundler_methods.rb

data/bin/solargraph-runtime

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'solargraph/plugin/process'
-
-Solargraph::Plugin::Process.new.run