solargraph 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3993f33469901ac1b7d51659d9452a48adcd0e3f
-  data.tar.gz: de8f13ed8c39b332b7837fca4bcdfd8516ca8c1f
+  metadata.gz: dd9313a286cf130526a889c6e21b07e5de2498f8
+  data.tar.gz: 759db6af9c03b875c451cbde438c924aa2f9f855
 SHA512:
-  metadata.gz: 0fdcec41d5a9b6920596d30f16a719948e74b3432b53584a0621b05f7c6d815e5bc5e69748737ef4c415db67061682babefeac0cf28c4cc73e69b8927b86b768
-  data.tar.gz: f6daf69d9d06dba1b7fea6e29ed5a2d8c336cfccbe3c33ab29cbb2fa05c79eca886f1e1474ed92ba5cc11a7eeb71ed6fbdedc5de96fc8ecd52c634fe91417209
+  metadata.gz: 9b5a23b6f4a27598cee4ef774958432f27b3d645d8126a970e941e7082c14ffcf6471a100b258055a789e4dbd89b1817a66e34ce5ebcf7f8a67ffb7ded0cf782
+  data.tar.gz: 7b644e646b415f3366e7461edbb381bd12bf5cf132ed79658aeddfdf9282cb209163474c2fceceb43687f9591fe846bd4ffec45c67f0afb3941120df90be438c

data/lib/solargraph/api_map.rb

@@ -614,7 +614,7 @@ module Solargraph
     end
 
     def mappable?(node)
-      return true if node.kind_of?(AST::Node) and [:array, :hash, :str, :int, :float].include?(node.type)
+      return true if node.kind_of?(AST::Node) and [:array, :hash, :str, :int, :float, :block].include?(node.type)
       # TODO Add node.type :casgn (constant assignment)
       if node.kind_of?(AST::Node) and (node.type == :class or node.type == :module or node.type == :def or node.type == :defs or node.type == :ivasgn or node.type == :gvasgn or node.type == :lvasgn or node.type == :or_asgn or node.type == :const or node.type == :lvar or node.type == :args or node.type == :kwargs)
         true
@@ -650,7 +650,7 @@ module Solargraph
       return node if node.type == :args
       type = node.type
       children = []
-      if node.type == :class
+      if node.type == :class or node.type == :block
         children += node.children[0, 2]
         children += get_mappable_nodes(node.children[2..-1], comment_hash)
         #children += get_mappable_nodes(node.children, comment_hash)

data/lib/solargraph/code_map.rb

@@ -482,6 +482,13 @@ module Solargraph
       if local.type == :def or local.type == :defs
         result += get_method_arguments_from local
       end
+      # Get block parameter variables
+      block_node = parent_node_from(index, :block)
+      unless block_node.nil? or block_node.children[1].nil?
+        block_node.children[1].children.each do |a|
+          result.push Suggestion.new(a.children[0], kind: Suggestion::PROPERTY)
+        end
+      end
       result += api_map.get_methods('Kernel')
       result
     end

data/lib/solargraph/server.rb

@@ -43,7 +43,7 @@ module Solargraph
       content_type :json
       begin
         sugg = []
-        workspace = params['workspace'] || CodeMap.find_workspace(params['filename'])
+        workspace = params['workspace'] || nil
         Server.prepare_workspace workspace unless @@api_hash.has_key?(workspace)
         @@semaphore.synchronize {
           code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: @@api_hash[workspace])
@@ -62,7 +62,7 @@ module Solargraph
       content_type :json
       begin
         sugg = []
-        workspace = params['workspace'] || CodeMap.find_workspace(params['filename'])
+        workspace = params['workspace'] || nil
         Server.prepare_workspace workspace unless @@api_hash.has_key?(workspace)
         @@semaphore.synchronize {
           code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: @@api_hash[workspace])

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/lib/solargraph/views/_method.erb

@@ -0,0 +1,60 @@
+<h2>
+    Namespace:
+</h2>
+<p>
+    <a href="command:solargraph._openDocument?<%= URI.escape "\"solargraph:/document?#{object.namespace}\"" %>"><%= object.namespace %></a>
+</p>
+<h2>
+    Overview:
+</h2>
+<%= htmlify object.docstring %>
+<h2>
+    Parameters:
+</h2>
+<% if object.parameters.empty? %>
+    <p>
+        None
+    </p>
+<% else %>
+    <ul>
+    <% object.parameters.each do |p| %>
+        <li>
+            <%= p[0] %>
+            <%= " = #{p[1]}" unless p[1].nil? %>
+        </li>
+    <% end %>
+    </ul>
+<% end %>
+<h2>
+    Returns:
+</h2>
+<% if object.tag(:return).nil? %>
+    <p>
+        Undefined/unknown
+    </p>
+<% else %>
+    <% tag = object.tag(:return) %>
+    <% unless tag.types.nil? or tag.types.empty? %>
+    <ul>
+        <% tag.types.each do |r| %>
+            <li>
+                <a href="command:solargraph._openDocument?<%= URI.escape "\"solargraph:/document?#{r}\"" %>"><%= r %></a>
+            </li>
+        <% end %>
+    </ul>
+    <% end %>
+    <% unless tag.text.empty? %>
+        <p>
+            <%= tag.text %>
+        </p>
+    <% end %>
+<% end %>
+<% examples = object.tags(:example) %>
+<% unless examples.nil? %>
+    <% examples.each do |example| %>
+        <h2>
+            Example: <%= example.name %>
+        </h2>
+        <%= ruby_to_html example.text.strip %>
+    <% end %>
+<% end %>

data/lib/solargraph/views/_namespace.erb

@@ -0,0 +1,26 @@
+<h2>
+    Overview:
+</h2>
+<%= htmlify object.docstring %>
+<h2>
+    Class Methods
+</h2>
+<ul class="doc-list">
+    <% object.meths(scope: :class).sort{|a, b| a.name <=> b.name}.each do |meth| %>
+        <li>
+            <% esc = URI.escape("\"solargraph:/document?#{meth.path}\"").gsub('%23', URI.escape('%23')) %>
+            <a href="command:solargraph._openDocument?<%= esc %>"><%= meth.name %></a>
+        </li>
+    <% end %>
+</ul>
+<h2>
+    Instance Methods
+</h2>
+<ul class="doc-list">
+    <% object.meths(scope: :instance).sort{|a, b| a.name <=> b.name}.each do |meth| %>
+        <li>
+            <% esc = URI.escape("\"solargraph:/document?#{meth.path}\"").gsub('%23', URI.escape('%23')) %>
+            <a href="command:solargraph._openDocument?<%= esc %>"><%= meth.name %></a>
+        </li>
+    <% end %>
+</ul>

data/lib/solargraph/views/document.erb

@@ -0,0 +1,16 @@
+<% @objects.reverse.each do |object| %>
+    <h1>
+        <%= object.name %>
+    </h1>
+    <h2>
+        Defined in:
+    </h2>
+    <p>
+        <%= object.files.join(', ') %>
+    </p>
+    <% if object.kind_of?(YARD::CodeObjects::NamespaceObject) %>
+        <%= erb :_namespace, layout: false, locals: {object: object} %>
+    <% elsif object.kind_of?(YARD::CodeObjects::MethodObject) %>
+        <%= erb :_method, layout: false, locals: {object: object} %>
+    <% end %>
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -107,25 +107,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.14'
 description: IDE tools for code analysis and autocompletion
 email: admin@castwide.com
 executables:
@@ -145,6 +139,9 @@ files:
 - lib/solargraph/snippets.rb
 - lib/solargraph/suggestion.rb
 - lib/solargraph/version.rb
+- lib/solargraph/views/_method.erb
+- lib/solargraph/views/_namespace.erb
+- lib/solargraph/views/document.erb
 - lib/solargraph/views/layout.erb
 - lib/solargraph/views/search.erb
 - lib/solargraph/yard_map.rb