solargraph 0.32.1 → 0.32.2

data/lib/solargraph/live_map.rb

@@ -1,126 +1,126 @@
-module Solargraph
-  # The LiveMap allows extensions to add their own completion suggestions.
-  #
-  class LiveMap
-    autoload :Cache, 'solargraph/live_map/cache'
-
-    @@plugin_registry = {}
-
-    # @return [Solargraph::ApiMap]
-    attr_reader :api_map
-
-    # @param api_map [Solargraph::ApiMap]
-    def initialize api_map
-      @api_map = api_map
-      runners
-    end
-
-    def get_path_pin path
-      cache.get_path_pin(path)
-    end
-
-    # @return [Array<Solargraph::Pin::Base>]
-    def get_methods(namespace, root = '', scope = 'instance', with_private = false)
-      fqns = api_map.qualify(namespace, root)
-      params = {
-        namespace: namespace, root: root, scope: scope, with_private: with_private
-      }
-      cached = cache.get_methods(params)
-      return cached unless cached.nil?
-      did_runtime = false
-      result = []
-      runners.each do |p|
-        next if did_runtime and p.runtime?
-        p.get_methods(namespace: namespace, root: root, scope: scope, with_private: with_private).each do |m|
-          result.push Solargraph::Pin::Method.new(nil, namespace, m['name'], YARD::Docstring.new('(defined at runtime)'), scope.to_sym, nil, [])
-        end
-        did_runtime = true if p.runtime?
-      end
-      cache.set_methods(params, result)
-      result
-    end
-
-    # @return [Array<Solargraph::Pin::Base>]
-    def get_constants(namespace, root = '')
-      cached = cache.get_constants(namespace, root)
-      return cached unless cached.nil?
-      did_runtime = false
-      result = []
-      runners.each do |p|
-        next if did_runtime and p.runtime?
-        result.concat p.get_constants(namespace, root)
-        did_runtime = true if p.runtime?
-      end
-      suggestions = []
-      result.uniq.each do |r|
-        path = (r['namespace'].empty? ? '' : "#{r['namespace']}::") + r['name']
-        kind = Pin::CONSTANT
-        if r['class'] == 'Class'
-          suggestions.push Pin::Namespace.new(nil, r['namespace'], r['name'], YARD::Docstring.new("(defined at runtime)"), :class, :public, nil)
-        elsif r['class'] == 'Module'
-          suggestions.push Pin::Namespace.new(nil, r['namespace'], r['name'], YARD::Docstring.new("(defined at runtime)"), :module, :public, nil)
-        else
-          suggestions.push Pin::Constant.new(nil, r['namespace'], r['name'], YARD::Docstring.new("(defined at runtime"), nil, nil, nil, :public)
-        end
-      end
-      cache.set_constants(namespace, root, suggestions)
-      suggestions
-    end
-
-    def get_fqns(namespace, root)
-      did_runtime = false
-      runners.each do |p|
-        next if did_runtime and p.runtime?
-        result = p.get_fqns(namespace, root)
-        return result unless result.nil?
-        did_runtime = true if p.runtime?
-      end
-      nil
-    end
-
-    def self.register name, klass
-      raise ArgumentError.new("A Solargraph plugin named #{name} already exists") if @@plugin_registry.has_key?(name)
-      @@plugin_registry[name] = klass
-    end
-
-    def refresh
-      changed = false
-      runners.each do |p|
-        changed ||= p.refresh
-      end
-      if changed
-        Solargraph::Logging.logger.debug "Resetting LiveMap cache"
-        cache.clear
-        get_constants('')
-        get_methods('', '', 'class')
-        get_methods('', '', 'instance')
-        get_methods('Kernel', '', 'class')
-        get_methods('Kernel', '', 'instance')
-      end
-    end
-
-    private
-
-    # @return [Solargraph::LiveMap::Cache]
-    def cache
-      @cache ||= Solargraph::LiveMap::Cache.new
-    end
-
-    # @return [Array<Solargraph::Plugin::Base>]
-    def runners
-      @runners ||= load_runners
-    end
-
-    # @return [Array<Solargraph::Plugin::Base>]
-    def load_runners
-      result = []
-      api_map.workspace.config.plugins.each do |name|
-        r = @@plugin_registry[name].new(api_map)
-        result.push r
-      end
-      result
-    end
-  end
-end
-
-Solargraph::LiveMap.register 'runtime', Solargraph::Plugin::Runtime
+module Solargraph
+  # The LiveMap allows extensions to add their own completion suggestions.
+  #
+  class LiveMap
+    autoload :Cache, 'solargraph/live_map/cache'
+
+    @@plugin_registry = {}
+
+    # @return [Solargraph::ApiMap]
+    attr_reader :api_map
+
+    # @param api_map [Solargraph::ApiMap]
+    def initialize api_map
+      @api_map = api_map
+      runners
+    end
+
+    def get_path_pin path
+      cache.get_path_pin(path)
+    end
+
+    # @return [Array<Solargraph::Pin::Base>]
+    def get_methods(namespace, root = '', scope = 'instance', with_private = false)
+      fqns = api_map.qualify(namespace, root)
+      params = {
+        namespace: namespace, root: root, scope: scope, with_private: with_private
+      }
+      cached = cache.get_methods(params)
+      return cached unless cached.nil?
+      did_runtime = false
+      result = []
+      runners.each do |p|
+        next if did_runtime and p.runtime?
+        p.get_methods(namespace: namespace, root: root, scope: scope, with_private: with_private).each do |m|
+          result.push Solargraph::Pin::Method.new(nil, namespace, m['name'], YARD::Docstring.new('(defined at runtime)'), scope.to_sym, nil, [])
+        end
+        did_runtime = true if p.runtime?
+      end
+      cache.set_methods(params, result)
+      result
+    end
+
+    # @return [Array<Solargraph::Pin::Base>]
+    def get_constants(namespace, root = '')
+      cached = cache.get_constants(namespace, root)
+      return cached unless cached.nil?
+      did_runtime = false
+      result = []
+      runners.each do |p|
+        next if did_runtime and p.runtime?
+        result.concat p.get_constants(namespace, root)
+        did_runtime = true if p.runtime?
+      end
+      suggestions = []
+      result.uniq.each do |r|
+        path = (r['namespace'].empty? ? '' : "#{r['namespace']}::") + r['name']
+        kind = Pin::CONSTANT
+        if r['class'] == 'Class'
+          suggestions.push Pin::Namespace.new(nil, r['namespace'], r['name'], YARD::Docstring.new("(defined at runtime)"), :class, :public, nil)
+        elsif r['class'] == 'Module'
+          suggestions.push Pin::Namespace.new(nil, r['namespace'], r['name'], YARD::Docstring.new("(defined at runtime)"), :module, :public, nil)
+        else
+          suggestions.push Pin::Constant.new(nil, r['namespace'], r['name'], YARD::Docstring.new("(defined at runtime"), nil, nil, nil, :public)
+        end
+      end
+      cache.set_constants(namespace, root, suggestions)
+      suggestions
+    end
+
+    def get_fqns(namespace, root)
+      did_runtime = false
+      runners.each do |p|
+        next if did_runtime and p.runtime?
+        result = p.get_fqns(namespace, root)
+        return result unless result.nil?
+        did_runtime = true if p.runtime?
+      end
+      nil
+    end
+
+    def self.register name, klass
+      raise ArgumentError.new("A Solargraph plugin named #{name} already exists") if @@plugin_registry.has_key?(name)
+      @@plugin_registry[name] = klass
+    end
+
+    def refresh
+      changed = false
+      runners.each do |p|
+        changed ||= p.refresh
+      end
+      if changed
+        Solargraph::Logging.logger.debug "Resetting LiveMap cache"
+        cache.clear
+        get_constants('')
+        get_methods('', '', 'class')
+        get_methods('', '', 'instance')
+        get_methods('Kernel', '', 'class')
+        get_methods('Kernel', '', 'instance')
+      end
+    end
+
+    private
+
+    # @return [Solargraph::LiveMap::Cache]
+    def cache
+      @cache ||= Solargraph::LiveMap::Cache.new
+    end
+
+    # @return [Array<Solargraph::Plugin::Base>]
+    def runners
+      @runners ||= load_runners
+    end
+
+    # @return [Array<Solargraph::Plugin::Base>]
+    def load_runners
+      result = []
+      api_map.workspace.config.plugins.each do |name|
+        r = @@plugin_registry[name].new(api_map)
+        result.push r
+      end
+      result
+    end
+  end
+end
+
+Solargraph::LiveMap.register 'runtime', Solargraph::Plugin::Runtime

data/lib/solargraph/live_map/cache.rb

@@ -1,38 +1,38 @@
-module Solargraph
-  class LiveMap
-    class Cache
-      def initialize
-        @method_cache = {}
-        @constant_cache = {}
-        @path_cache = {}
-      end
-
-      def get_methods options
-        @method_cache[options]
-      end
-
-      def set_methods options, values
-        @method_cache[options] = values
-        values.each { |pin| @path_cache[pin.path] = pin }
-      end
-
-      def get_constants namespace, root
-        @constant_cache[[namespace, root]]
-      end
-
-      def set_constants namespace, root, values
-        @constant_cache[[namespace, root]] = values
-      end
-
-      def get_path_pin path
-        @path_cache[path]
-      end
-
-      def clear
-        @method_cache.clear
-        @constant_cache.clear
-        @path_cache.clear
-      end
-    end
-  end
-end
+module Solargraph
+  class LiveMap
+    class Cache
+      def initialize
+        @method_cache = {}
+        @constant_cache = {}
+        @path_cache = {}
+      end
+
+      def get_methods options
+        @method_cache[options]
+      end
+
+      def set_methods options, values
+        @method_cache[options] = values
+        values.each { |pin| @path_cache[pin.path] = pin }
+      end
+
+      def get_constants namespace, root
+        @constant_cache[[namespace, root]]
+      end
+
+      def set_constants namespace, root, values
+        @constant_cache[[namespace, root]] = values
+      end
+
+      def get_path_pin path
+        @path_cache[path]
+      end
+
+      def clear
+        @method_cache.clear
+        @constant_cache.clear
+        @path_cache.clear
+      end
+    end
+  end
+end

data/lib/solargraph/location.rb

@@ -1,31 +1,31 @@
-module Solargraph
-  # A section of text identified by its filename and range.
-  #
-  class Location
-    # @return [String]
-    attr_reader :filename
-
-    # @return [Solargraph::Range]
-    attr_reader :range
-
-    # @param filename [String]
-    # @param range [Solargraph::Range]
-    def initialize filename, range
-      @filename = filename
-      @range = range
-    end
-
-    # @return [Hash]
-    def to_hash
-      {
-        filename: filename,
-        range: range.to_hash
-      }
-    end
-
-    def == other
-      return false unless other.is_a?(Location)
-      filename == other.filename and range == other.range
-    end
-  end
-end
+module Solargraph
+  # A section of text identified by its filename and range.
+  #
+  class Location
+    # @return [String]
+    attr_reader :filename
+
+    # @return [Solargraph::Range]
+    attr_reader :range
+
+    # @param filename [String]
+    # @param range [Solargraph::Range]
+    def initialize filename, range
+      @filename = filename
+      @range = range
+    end
+
+    # @return [Hash]
+    def to_hash
+      {
+        filename: filename,
+        range: range.to_hash
+      }
+    end
+
+    def == other
+      return false unless other.is_a?(Location)
+      filename == other.filename and range == other.range
+    end
+  end
+end

data/lib/solargraph/logging.rb

@@ -1,25 +1,25 @@
-require 'logger'
-
-module Solargraph
-  module Logging
-    DEFAULT_LOG_LEVEL = Logger::WARN
-
-    LOG_LEVELS = {
-      'warn' => Logger::WARN,
-      'info' => Logger::INFO,
-      'debug' => Logger::DEBUG
-    }
-
-    @@logger = Logger.new(STDERR, level: DEFAULT_LOG_LEVEL)
-    @@logger.formatter = proc do |severity, datetime, progname, msg|
-      "[#{severity}] #{msg}\n"
-    end
-
-    module_function
-
-    # @return [Logger]
-    def logger
-      @@logger
-    end
-  end
-end
+require 'logger'
+
+module Solargraph
+  module Logging
+    DEFAULT_LOG_LEVEL = Logger::WARN
+
+    LOG_LEVELS = {
+      'warn' => Logger::WARN,
+      'info' => Logger::INFO,
+      'debug' => Logger::DEBUG
+    }
+
+    @@logger = Logger.new(STDERR, level: DEFAULT_LOG_LEVEL)
+    @@logger.formatter = proc do |severity, datetime, progname, msg|
+      "[#{severity}] #{msg}\n"
+    end
+
+    module_function
+
+    # @return [Logger]
+    def logger
+      @@logger
+    end
+  end
+end

data/lib/solargraph/page.rb

@@ -1,68 +1,68 @@
-require 'ostruct'
-require 'tilt'
-require 'kramdown'
-require 'htmlentities'
-require 'cgi'
-
-module Solargraph
-  class Page
-    class Binder < OpenStruct
-      def initialize locals, render_method
-        super(locals)
-        define_singleton_method :render do |template, layout: false, locals: {}|
-          render_method.call(template, layout: layout, locals: locals)
-        end
-        define_singleton_method :erb do |template, layout: false, locals: {}|
-          render_method.call(template, layout: layout, locals: locals)
-        end
-      end
-
-      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
-      end
-
-      def ruby_to_html code
-        code
-      end
-    end
-    private_constant :Binder
-
-    def initialize directory = VIEWS_PATH
-      directory = VIEWS_PATH if directory.nil? or !File.directory?(directory)
-      directories = [directory]
-      directories.push VIEWS_PATH if directory != VIEWS_PATH
-      @render_method = proc { |template, layout: false, locals: {}|
-        binder = Binder.new(locals, @render_method)
-        if layout
-          Tilt::ERBTemplate.new(Page.select_template(directories, 'layout')).render(binder) do
-            Tilt::ERBTemplate.new(Page.select_template(directories, template)).render(binder)
-          end
-        else
-          Tilt::ERBTemplate.new(Page.select_template(directories, template)).render(binder)
-        end
-      }
-    end
-
-    def render template, layout: true, locals: {}
-      @render_method.call(template, layout: layout, locals: locals)
-    end
-
-    def self.select_template directories, name
-      directories.each do |dir|
-        path = File.join(dir, "#{name}.erb")
-        return path if File.file?(path)
-      end
-      raise FileNotFoundError, "Template not found: #{name}"
-    end
-  end
-end
+require 'ostruct'
+require 'tilt'
+require 'kramdown'
+require 'htmlentities'
+require 'cgi'
+
+module Solargraph
+  class Page
+    class Binder < OpenStruct
+      def initialize locals, render_method
+        super(locals)
+        define_singleton_method :render do |template, layout: false, locals: {}|
+          render_method.call(template, layout: layout, locals: locals)
+        end
+        define_singleton_method :erb do |template, layout: false, locals: {}|
+          render_method.call(template, layout: layout, locals: locals)
+        end
+      end
+
+      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
+      end
+
+      def ruby_to_html code
+        code
+      end
+    end
+    private_constant :Binder
+
+    def initialize directory = VIEWS_PATH
+      directory = VIEWS_PATH if directory.nil? or !File.directory?(directory)
+      directories = [directory]
+      directories.push VIEWS_PATH if directory != VIEWS_PATH
+      @render_method = proc { |template, layout: false, locals: {}|
+        binder = Binder.new(locals, @render_method)
+        if layout
+          Tilt::ERBTemplate.new(Page.select_template(directories, 'layout')).render(binder) do
+            Tilt::ERBTemplate.new(Page.select_template(directories, template)).render(binder)
+          end
+        else
+          Tilt::ERBTemplate.new(Page.select_template(directories, template)).render(binder)
+        end
+      }
+    end
+
+    def render template, layout: true, locals: {}
+      @render_method.call(template, layout: layout, locals: locals)
+    end
+
+    def self.select_template directories, name
+      directories.each do |dir|
+        path = File.join(dir, "#{name}.erb")
+        return path if File.file?(path)
+      end
+      raise FileNotFoundError, "Template not found: #{name}"
+    end
+  end
+end