solargraph 0.12.2 → 0.13.0

data/lib/solargraph/pin.rb

@@ -0,0 +1,12 @@
+module Solargraph
+  module Pin
+    autoload :Base, 'solargraph/pin/base'
+    autoload :Method, 'solargraph/pin/method'
+    autoload :Attribute, 'solargraph/pin/attribute'
+    autoload :BaseVariable, 'solargraph/pin/base_variable'
+    autoload :InstanceVariable, 'solargraph/pin/instance_variable'
+    autoload :ClassVariable, 'solargraph/pin/class_variable'
+    autoload :Constant, 'solargraph/pin/constant'
+    autoload :Symbol, 'solargraph/pin/symbol'
+  end
+end

data/lib/solargraph/pin/attribute.rb

@@ -0,0 +1,16 @@
+module Solargraph
+  module Pin
+    class Attribute < Base
+      attr_reader :access
+
+      def initialize source, node, namespace, access
+        super(source, node, namespace)
+        @access = access
+      end
+
+      def name
+        @name ||= "#{node.children[0]}#{access == :writer ? '=' : ''}"
+      end
+    end
+  end
+end

data/lib/solargraph/pin/base.rb

@@ -0,0 +1,47 @@
+module Solargraph
+  module Pin
+    class Base
+      attr_reader :source
+      attr_reader :node
+      attr_reader :namespace
+
+      def initialize source, node, namespace
+        @source = source
+        @node = node
+        @namespace = namespace
+      end
+
+      def docstring
+        @docstring ||= source.docstring_for(node)
+      end
+
+      def name
+        nil
+      end
+
+      def path
+        nil
+      end
+
+      def kind
+        nil
+      end
+
+      def return_type
+        nil
+      end
+
+      def signature
+        nil
+      end
+
+      def value
+        nil
+      end
+
+      def parameters
+        []
+      end
+    end
+  end
+end

data/lib/solargraph/pin/base_variable.rb

@@ -0,0 +1,33 @@
+module Solargraph
+  module Pin
+    class BaseVariable < Base
+      include NodeMethods
+
+      def name
+        node.children[0].to_s
+      end
+
+      def kind
+        Solargraph::Suggestion::VARIABLE
+      end
+
+      def return_type
+        if @return_type.nil? and !docstring.nil?
+          tag = docstring.tag(:type)
+          @return_type = tag.types[0] unless tag.nil?
+        end
+        @return_type ||= literal_from_assignment
+      end
+
+      def signature
+        @signature ||= resolve_node_signature(node.children[(node.type == :casgn ? 2 : 1)])
+      end
+
+      private
+
+      def literal_from_assignment
+        infer_literal_node_type(node.children[(node.type == :casgn ? 2 : 1)])
+      end
+    end
+  end
+end

data/lib/solargraph/pin/class_variable.rb

@@ -0,0 +1,6 @@
+module Solargraph
+  module Pin
+    class ClassVariable < BaseVariable
+    end
+  end
+end

data/lib/solargraph/pin/constant.rb

@@ -0,0 +1,18 @@
+module Solargraph
+  module Pin
+    class Constant < BaseVariable
+
+      def name
+        @name ||= node.children[1].to_s
+      end
+
+      def kind
+        Solargraph::Suggestion::CONSTANT
+      end
+
+      def value
+        source.code_for(node.children[2])
+      end
+    end
+  end
+end

data/lib/solargraph/pin/instance_variable.rb

@@ -0,0 +1,12 @@
+module Solargraph
+  module Pin
+    class InstanceVariable < BaseVariable
+      attr_reader :scope
+
+      def initialize source, node, namespace, scope
+        super(source, node, namespace)
+        @scope = scope
+      end
+    end
+  end
+end

data/lib/solargraph/pin/method.rb

@@ -0,0 +1,65 @@
+module Solargraph
+  module Pin
+    class Method < Base
+      attr_reader :scope
+      attr_reader :visibility
+
+      def initialize source, node, namespace, scope, visibility
+        super(source, node, namespace)
+        @scope = scope
+        @visibility = visibility
+      end
+
+      def name
+        @name ||= "#{node.children[(node.type == :def ? 0 : 1)]}"
+      end
+
+      def path
+        @path ||= namespace + (scope == :instance ? '#' : '.') + name
+      end
+
+      def kind
+        Solargraph::Suggestion::METHOD
+      end
+
+      def return_type
+        if @return_type.nil? and !docstring.nil?
+          tag = docstring.tag(:return)
+          @return_type = tag.types[0] unless tag.nil?
+        end
+        @return_type
+      end
+
+      def parameters
+        @parameters ||= get_method_args
+      end
+
+      private
+
+      # @return [Array<String>]
+      def get_method_args
+        list = nil
+        args = []
+        node.children.each { |c|
+          if c.kind_of?(AST::Node) and c.type == :args
+            list = c
+            break
+          end
+        }
+        return args if list.nil?
+        list.children.each { |c|
+          if c.type == :arg
+            args.push c.children[0].to_s
+          elsif c.type == :optarg
+            args.push "#{c.children[0]} = #{source.code_for(c.children[1])}"
+          elsif c.type == :kwarg
+            args.push "#{c.children[0]}:"
+          elsif c.type == :kwoptarg
+            args.push "#{c.children[0]}: #{source.code_for(c.children[1])}"
+          end
+        }
+        args
+      end
+    end
+  end
+end

data/lib/solargraph/pin/symbol.rb

@@ -0,0 +1,9 @@
+module Solargraph
+  module Pin
+    class Symbol < Base
+      def name
+        @name ||= ":#{node.children[0]}"
+      end
+    end
+  end
+end

data/lib/solargraph/server.rb

@@ -21,8 +21,20 @@ module Solargraph
     end
 
     post '/prepare' do
+      content_type :json
       STDERR.puts "Preparing #{params['workspace']}"
       Server.prepare_workspace params['workspace']
+      { "status" => "ok"}.to_json
+    end
+
+    post '/update' do
+      content_type :json
+      # @type [Solargraph::ApiMap]
+      api_map = @@api_hash[params['workspace']]
+      unless api_map.nil?
+        api_map.update params['filename']
+      end
+      { "status" => "ok"}.to_json
     end
 
     post '/suggest' do
@@ -30,7 +42,6 @@ module Solargraph
       begin
         sugg = []
         workspace = params['workspace']
-        #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], cursor: [params['line'].to_i, params['column'].to_i])
           offset = code_map.get_offset(params['line'].to_i, params['column'].to_i)
@@ -49,7 +60,6 @@ module Solargraph
       begin
         sugg = []
         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], cursor: [params['line'].to_i, params['column'].to_i])
           offset = code_map.get_offset(params['line'].to_i, params['column'].to_i)
@@ -68,7 +78,6 @@ module Solargraph
       begin
         sugg = []
         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], cursor: [params['line'].to_i, params['column'].to_i])
           offset = code_map.get_offset(params['line'].to_i, params['column'].to_i)
@@ -127,13 +136,12 @@ module Solargraph
 
       def prepare_workspace directory
         Thread.new do
-          @@semaphore.synchronize {
+          @@semaphore.synchronize do
             api_map = Solargraph::ApiMap.new(directory)
-            api_map.update_yardoc
             @@api_hash[directory] = api_map
-          }
+          end
         end
-    end
+      end
     end
 
     class Helpers

data/lib/solargraph/shell.rb

@@ -7,6 +7,13 @@ require 'net/http'
 
 module Solargraph
   class Shell < Thor
+    map %w[--version -v] => :version
+
+    desc "--version, -v", "Print the version"
+    def version
+      puts Solargraph::VERSION
+    end
+
     desc 'prepare', 'Cache YARD files for the current environment'
     option :force, type: :boolean, aliases: :f, desc: 'Force download of YARDOC files if they already exist'
     option :host, type: :string, aliases: :h, desc: 'The host that provides YARDOC files for download', default: 'yardoc.solargraph.org'

data/lib/solargraph/suggestion.rb

@@ -15,7 +15,7 @@ module Solargraph
 
     attr_reader :label, :kind, :insert, :detail, :documentation, :code_object, :location, :arguments
 
-    def initialize label, kind: KEYWORD, insert: nil, detail: nil, documentation: nil, code_object: nil, location: nil, arguments: [], return_type: nil
+    def initialize label, kind: KEYWORD, insert: nil, detail: nil, documentation: nil, code_object: nil, location: nil, arguments: [], return_type: nil, path: nil
       @helper = Server::Helpers.new
       @label = label.to_s
       @kind = kind
@@ -26,10 +26,11 @@ module Solargraph
       @location = location
       @arguments = arguments
       @return_type = return_type
+      @path = path
     end
     
     def path
-      code_object.nil? ? label : code_object.path
+      @path ||= (code_object.nil? ? label : code_object.path)
     end
 
     def to_s
@@ -97,6 +98,10 @@ module Solargraph
       }
       obj.to_json(args)
     end
+
+    def self.pull pin, return_type = nil
+      Suggestion.new(pin.name, insert: pin.name.gsub(/=/, ' = '), kind: pin.kind, documentation: pin.docstring, detail: pin.namespace, arguments: pin.parameters, path: pin.path, return_type: return_type)
+    end
   end
 
 end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.12.2'
+  VERSION = '0.13.0'
 end

data/lib/solargraph/yard_map.rb

@@ -12,7 +12,7 @@ module Solargraph
       @workspace = workspace
       unless workspace.nil?
         wsy = File.join(workspace, '.yardoc')
-        yardocs.push wsy if File.exist?(wsy)
+        #yardocs.push wsy if File.exist?(wsy)
       end
       used = []
       required.each { |r|

data/lib/solargraph/yard_methods.rb

@@ -13,7 +13,9 @@ module Solargraph
             yardopts = File.read(yardopts_file)
             yardopts.lines.each { |line|
               arg = line.strip
-              if arg.start_with?('-')
+              if arg.start_with?('--exclude')
+                @yard_options[:exclude].concat arg.split(/[\s]+/)[1..-1]
+              elsif arg.start_with?('-')
                 @yard_options[:flags].push arg
               else
                 @yard_options[:include].push arg
@@ -25,5 +27,30 @@ module Solargraph
       end
       @yard_options
     end
+
+    def yard_files
+      if @yard_files.nil?
+        @yard_files = []
+        yard_options[:include].each do |glob|
+          if File.file?(glob)
+            @yard_files.push File.realpath(glob)
+          elsif File.directory?(glob)
+            @yard_files.concat Dir["#{glob}/**/*"].map{ |f| File.realpath(f) }
+          else
+            @yard_files.concat Dir[glob].map{ |f| File.realpath(f) }
+          end
+        end
+        yard_options[:exclude].each do |glob|
+          if File.file?(glob)
+            @yard_files.delete File.realpath(glob)
+          elsif File.directory?(glob)
+            @yard_files -= Dir["#{glob}/**/*"].map{ |f| File.realpath(f) }
+          else
+            @yard_files -= Dir[glob].map{ |f| File.realpath(f) }
+          end
+        end
+      end
+      @yard_files
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -158,14 +158,20 @@ files:
 - bin/solargraph
 - lib/solargraph.rb
 - lib/solargraph/api_map.rb
-- lib/solargraph/api_map/attr_pin.rb
 - lib/solargraph/api_map/cache.rb
 - lib/solargraph/api_map/config.rb
-- lib/solargraph/api_map/cvar_pin.rb
-- lib/solargraph/api_map/ivar_pin.rb
-- lib/solargraph/api_map/method_pin.rb
+- lib/solargraph/api_map/source.rb
 - lib/solargraph/code_map.rb
 - lib/solargraph/node_methods.rb
+- lib/solargraph/pin.rb
+- lib/solargraph/pin/attribute.rb
+- lib/solargraph/pin/base.rb
+- lib/solargraph/pin/base_variable.rb
+- lib/solargraph/pin/class_variable.rb
+- lib/solargraph/pin/constant.rb
+- lib/solargraph/pin/instance_variable.rb
+- lib/solargraph/pin/method.rb
+- lib/solargraph/pin/symbol.rb
 - lib/solargraph/server.rb
 - lib/solargraph/shell.rb
 - lib/solargraph/snippets.rb

data/lib/solargraph/api_map/attr_pin.rb

@@ -1,37 +0,0 @@
-module Solargraph
-  class ApiMap
-    class AttrPin
-      attr_reader :node
-
-      def initialize node
-        @node = node
-      end
-
-      def suggestions
-        @suggestions ||= generate_suggestions
-      end
-
-      private
-
-      def generate_suggestions
-        suggestions = []
-        c = node
-        if c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :attr_reader
-          c.children[2..-1].each { |x|
-            suggestions.push Suggestion.new(x.children[0], kind: Suggestion::FIELD) if x.type == :sym
-          }
-        elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :attr_writer
-          c.children[2..-1].each { |x|
-            suggestions.push Suggestion.new("#{x.children[0]}=", kind: Suggestion::FIELD) if x.type == :sym
-          }
-        elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :attr_accessor
-          c.children[2..-1].each { |x|
-            suggestions.push Suggestion.new(x.children[0], kind: Suggestion::FIELD) if x.type == :sym
-            suggestions.push Suggestion.new("#{x.children[0]}=", insert: "#{x.children[0]} = ", kind: Suggestion::FIELD) if x.type == :sym
-          }
-        end
-        suggestions
-      end
-    end
-  end
-end