solargraph 0.36.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b775ff47aedcc50ee7f1b3c10db47ad78ae5de1c7be7763a3870bd36a5f1b25d
-  data.tar.gz: c860cd9e682a6065229d2a14142665b195232c3dd6a2e78e21bea0d9b30aabf1
+  metadata.gz: a210d97aeb15cde25f91fae2f9574295d075eb32c91cb73154142f21d250e66c
+  data.tar.gz: 3192c110188450543803da61d7f7de524f6b9f12ff47a9f1099487176ed0dc17
 SHA512:
-  metadata.gz: ea4070ee58a6ab2c00e7a86674e787395d5325c10cc4aa46f3f8c3b3f4f23726b93b639a479be9a3a86835eda0110672fddb63936637737350614bc2fe59df8b
-  data.tar.gz: 956f38e583f416eeabf0a95508ccaec1be6ea6f1d1a55e1461b3f5cd2612f07c939eabacf69516742d6f3c8dee9a6c14be78f522593441bc7016515f3c8254e0
+  metadata.gz: 28913d0d3371eabe95d351f0c7c45b08ba5aef15a1410e60846b1c362597ea4b19250aeb3098f1ad3c4f18215c5b625a3670f3fe87983e858a2c7550c9e4c3d5
+  data.tar.gz: 3cba8f1a33b143e6afd8dd9858301d61e86d167b1786eeeb301708cbd8cce13f9d57af7dbc394e0d6da1245094bf26e058c412c57ad30d9b53f9b77b333c065b

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

@@ -42,11 +42,12 @@ module Solargraph
             result = []
             last_link = nil
             pins.each_with_index do |pin|
-              if pin.link_documentation && pin.link_documentation != last_link
-                result.push pin.link_documentation
+              this_link = host.options['enablePages'] ? pin.link_documentation : pin.text_documentation
+              if this_link && this_link != last_link && this_link != 'undefined'
+                result.push this_link
               end
               result.push pin.documentation
-              last_link = pin.link_documentation
+              last_link = this_link
             end
             result.join("\n\n")
           end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'uri'
-require 'htmlentities'
 
 module Solargraph
   module LanguageServer
@@ -16,11 +15,11 @@ module Solargraph
             last_link = nil
             suggestions.each do |pin|
               parts = []
-              this_link = pin.link_documentation
+              this_link = host.options['enablePages'] ? pin.link_documentation : pin.text_documentation
               if !this_link.nil? && this_link != last_link
                 parts.push this_link
               end
-              parts.push HTMLEntities.new.encode(pin.detail) unless pin.is_a?(Pin::Namespace) || pin.detail.nil?
+              parts.push pin.detail 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/page.rb

@@ -2,7 +2,7 @@
 
 require 'ostruct'
 require 'tilt'
-require 'maruku'
+require 'yard'
 require 'htmlentities'
 require 'cgi'
 
@@ -24,9 +24,13 @@ module Solargraph
       # @param text [String]
       # @return [String]
       def htmlify text
-        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)
+        YARD::Templates::Helpers::Markup::RDocMarkup.new(text).to_html
+      end
+
+      # @param text [String]
+      # @return [String]
+      def escape text
+        HTMLEntities.new.encode(text)
       end
 
       # @param code [String]

data/lib/solargraph/pin/conversions.rb

@@ -47,7 +47,7 @@ module Solargraph
         # change when pins get proxied.
         detail = String.new
         detail += "(#{parameters.join(', ')}) " unless !is_a?(Pin::BaseMethod) or parameters.empty?
-        detail += "=#{probed? ? '~' : (proxied? ? '^' : '>')} #{return_type}" unless return_type.undefined?
+        detail += "=#{probed? ? '~' : (proxied? ? '^' : '>')} #{escape_brackets(return_type.to_s)}" unless return_type.undefined?
         detail.strip!
         return nil if detail.empty?
         detail
@@ -60,6 +60,12 @@ module Solargraph
         @link_documentation ||= generate_link
       end
 
+      def text_documentation
+        this_path = path || return_type.tag
+        return nil if this_path == 'undefined'
+        escape_brackets this_path
+      end
+
       def reset_conversions
         @completion_item = nil
         @resolve_completion_item = nil
@@ -70,11 +76,19 @@ module Solargraph
 
       private
 
+      # @return [String]
       def generate_link
         this_path = path || return_type.tag
+        return nil if this_path == 'undefined'
         return nil if this_path.nil? || this_path == 'undefined'
-        # return this_path if comments.empty?
-        "[#{this_path.gsub('_', '\\\\_')}](solargraph:/document?query=#{URI.escape(this_path)})"
+        "[#{escape_brackets(this_path).gsub('_', '\\\\_')}](solargraph:/document?query=#{URI.escape(this_path)})"
+      end
+
+      # @param text [String]
+      # @return [String]
+      def escape_brackets text
+        # text.gsub(/(\<|\>)/, "\\#{$1}")
+        text.gsub("<", "\\<").gsub(">", "\\>")
       end
     end
   end

data/lib/solargraph/pin/documenting.rb

@@ -2,7 +2,7 @@
 
 require 'rdoc'
 require 'reverse_markdown'
-require 'maruku'
+require 'yard'
 
 module Solargraph
   module Pin
@@ -12,8 +12,11 @@ module Solargraph
       # @return [String]
       def documentation
         @documentation ||= begin
-          html = Maruku.new(normalize_indentation(docstring.to_s)).to_html
-          ReverseMarkdown.convert(html, github_flavored: true).lines.map(&:rstrip).join("\n")
+          text = normalize_indentation(docstring.to_s)
+          markup = YARD::Templates::Helpers::Markup::RDocMarkup.new(text)
+          html = markup.to_html
+          ReverseMarkdown.convert(html, github_flavored: true)
+                         .lines.map(&:rstrip).join("\n")
         end
       end
 
@@ -22,7 +25,7 @@ module Solargraph
       # @param text [String]
       # @return [String]
       def normalize_indentation text
-        text.lines.map { |l| remove_odd_spaces(l).gsub(/^  /, "\t") }.join
+        text.lines.map { |l| remove_odd_spaces(l) }.join
       end
 
       # @param line [String]

data/lib/solargraph/pin/method.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'htmlentities'
-
 module Solargraph
   module Pin
     class Method < BaseMethod
@@ -44,7 +42,7 @@ module Solargraph
             lines = []
             param_tags.each do |p|
               l = "* #{p.name}"
-              l += " [#{p.types.map { |t| HTMLEntities.new.encode(t) }.join(', ')}]" unless p.types.nil? or p.types.empty?
+              l += " [#{escape_brackets(p.types.join(', '))}]" unless p.types.nil? or p.types.empty?
               l += " #{p.text}"
               lines.push l
             end
@@ -78,7 +76,7 @@ module Solargraph
             name: name,
             closure: closure,
             args: tag.parameters.map(&:first),
-            comments: tag.text
+            comments: tag.docstring.all
           )
         end
       end

data/lib/solargraph/source/cursor.rb

@@ -109,21 +109,16 @@ module Solargraph
       # @return [Cursor, nil]
       def recipient
         @recipient ||= begin
-          result = nil
           node = recipient_node
-          unless node.nil?
-            result = if node.children[1].is_a?(AST::Node)
-                       pos = Range.from_node(node.children[1]).start
-                       Cursor.new(source, Position.new(pos.line, pos.column - 1))
-                     else
-                       Cursor.new(source, Range.from_node(node).ending)
-                     end
-          end
-          result
+          node ? Cursor.new(source, Range.from_node(node).ending) : nil
         end
       end
       alias receiver recipient
 
+      def node
+        @node ||= source.node_at(position.line, position.column)
+      end
+
       # @return [Position]
       def node_position
         @node_position ||= begin

data/lib/solargraph/version.rb

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

data/lib/solargraph/views/_name_type_tag.erb

@@ -1,6 +1,6 @@
 <%= tag.name %>
 <% unless tag.types.nil? or tag.types.empty? %>
-	[<%= tag.types.join(', ') %>]
+	[<%= escape(tag.types.join(', ')) %>]
 <% end %>
 <% unless tag.text.empty? %>
 	<% unless (tag.name.nil? or tag.name.empty?) and (tag.types.nil? or tag.types.empty?) %>

data/solargraph.gemspec

@@ -23,8 +23,7 @@ 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 'maruku', '~> 0.7'
-  s.add_runtime_dependency 'nokogiri', '>= 1.9.1'
+  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'
   s.add_runtime_dependency 'rubocop', '~> 0.52'
@@ -35,5 +34,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry', '~> 0.11.3'
   s.add_development_dependency 'rspec', '~> 3.5', '>= 3.5.0'
   s.add_development_dependency 'simplecov', '~> 0.14'
-  s.add_development_dependency 'webmock'
+  s.add_development_dependency 'webmock', '~> 3.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -73,23 +73,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: maruku
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.1
@@ -97,6 +86,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.1
@@ -248,16 +240,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 description: IDE tools for code completion, inline documentation, and static analysis
 email: admin@castwide.com
 executables: