solargraph 0.46.0 → 0.47.1

data/lib/solargraph/location.rb

@@ -1,37 +1,37 @@
-# frozen_string_literal: true
-
-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
-
-    def inspect
-      "#<#{self.class} #{filename}, #{range.inspect}>"
-    end
-  end
-end
+# frozen_string_literal: true
+
+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
+
+    def inspect
+      "#<#{self.class} #{filename}, #{range.inspect}>"
+    end
+  end
+end

data/lib/solargraph/logging.rb

@@ -1,27 +1,27 @@
-# frozen_string_literal: true
-
-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
+# frozen_string_literal: true
+
+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,83 +1,83 @@
-# frozen_string_literal: true
-
-require 'ostruct'
-require 'tilt'
-require 'yard'
-require 'cgi'
-
-module Solargraph
-  class Page
-    class Binder < OpenStruct
-      # @param locals [Hash]
-      # @param render_method [Proc]
-      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
-
-      # @param text [String]
-      # @return [String]
-      def htmlify text
-        YARD::Templates::Helpers::Markup::RDocMarkup.new(text).to_html
-      end
-
-      # @param text [String]
-      # @return [String]
-      def escape text
-        CGI.escapeHTML(text)
-      end
-
-      # @param code [String]
-      # @return [String]
-      def ruby_to_html code
-        code
-      end
-    end
-    private_constant :Binder
-
-    # @param directory [String]
-    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
-      # @type [Proc]
-      # @param template [String]
-      # @param layout [Boolean]
-      # @param locals [Hash]
-      @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
-
-    # @param template [String]
-    # @param layout [Boolean]
-    # @param locals [Hash]
-    # @return [String]
-    def render template, layout: true, locals: {}
-      @render_method.call(template, layout: layout, locals: locals)
-    end
-
-    # @param directories [Array<String>]
-    # @param name [String]
-    # @return [String]
-    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
+# frozen_string_literal: true
+
+require 'ostruct'
+require 'tilt'
+require 'yard'
+require 'cgi'
+
+module Solargraph
+  class Page
+    class Binder < OpenStruct
+      # @param locals [Hash]
+      # @param render_method [Proc]
+      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
+
+      # @param text [String]
+      # @return [String]
+      def htmlify text
+        YARD::Templates::Helpers::Markup::RDocMarkup.new(text).to_html
+      end
+
+      # @param text [String]
+      # @return [String]
+      def escape text
+        CGI.escapeHTML(text)
+      end
+
+      # @param code [String]
+      # @return [String]
+      def ruby_to_html code
+        code
+      end
+    end
+    private_constant :Binder
+
+    # @param directory [String]
+    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
+      # @type [Proc]
+      # @param template [String]
+      # @param layout [Boolean]
+      # @param locals [Hash]
+      @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
+
+    # @param template [String]
+    # @param layout [Boolean]
+    # @param locals [Hash]
+    # @return [String]
+    def render template, layout: true, locals: {}
+      @render_method.call(template, layout: layout, locals: locals)
+    end
+
+    # @param directories [Array<String>]
+    # @param name [String]
+    # @return [String]
+    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

data/lib/solargraph/parser/comment_ripper.rb

@@ -1,52 +1,52 @@
-require 'ripper'
-
-module Solargraph
-  module Parser
-    class CommentRipper < Ripper::SexpBuilderPP
-      def initialize src, filename = '(ripper)', lineno = 0
-        super
-        @buffer = src
-        @buffer_lines = @buffer.lines
-      end
-
-      def on_comment *args
-        result = super
-        if @buffer_lines[result[2][0]][0..result[2][1]].strip =~ /^#/
-          chomped = result[1].chomp
-          if result[2][0] == 0 && chomped.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '').match(/^#\s*frozen_string_literal:/)
-            chomped = '#'
-          end
-          @comments[result[2][0]] = Snippet.new(Range.from_to(result[2][0], result[2][1], result[2][0], result[2][1] + chomped.length), chomped)
-        end
-        result
-      end
-
-      def on_embdoc_beg *args
-        result = super
-        chomped = result[1].chomp
-        @comments[result[2][0]] = Snippet.new(Range.from_to(result[2][0], result[2][1], result[2][0], result[2][1] + chomped.length), chomped)
-        result
-      end
-
-      def on_embdoc *args
-        result = super
-        chomped = result[1].chomp
-        @comments[result[2][0]] = Snippet.new(Range.from_to(result[2][0], result[2][1], result[2][0], result[2][1] + chomped.length), chomped)
-        result
-      end
-
-      def on_embdoc_end *args
-        result = super
-        chomped = result[1].chomp
-        @comments[result[2][0]] = Snippet.new(Range.from_to(result[2][0], result[2][1], result[2][0], result[2][1] + chomped.length), chomped)
-        result
-      end
-
-      def parse
-        @comments = {}
-        super
-        @comments
-      end
-    end
-  end
-end
+require 'ripper'
+
+module Solargraph
+  module Parser
+    class CommentRipper < Ripper::SexpBuilderPP
+      def initialize src, filename = '(ripper)', lineno = 0
+        super
+        @buffer = src
+        @buffer_lines = @buffer.lines
+      end
+
+      def on_comment *args
+        result = super
+        if @buffer_lines[result[2][0]][0..result[2][1]].strip =~ /^#/
+          chomped = result[1].chomp
+          if result[2][0] == 0 && chomped.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '').match(/^#\s*frozen_string_literal:/)
+            chomped = '#'
+          end
+          @comments[result[2][0]] = Snippet.new(Range.from_to(result[2][0], result[2][1], result[2][0], result[2][1] + chomped.length), chomped)
+        end
+        result
+      end
+
+      def on_embdoc_beg *args
+        result = super
+        chomped = result[1].chomp
+        @comments[result[2][0]] = Snippet.new(Range.from_to(result[2][0], result[2][1], result[2][0], result[2][1] + chomped.length), chomped)
+        result
+      end
+
+      def on_embdoc *args
+        result = super
+        chomped = result[1].chomp
+        @comments[result[2][0]] = Snippet.new(Range.from_to(result[2][0], result[2][1], result[2][0], result[2][1] + chomped.length), chomped)
+        result
+      end
+
+      def on_embdoc_end *args
+        result = super
+        chomped = result[1].chomp
+        @comments[result[2][0]] = Snippet.new(Range.from_to(result[2][0], result[2][1], result[2][0], result[2][1] + chomped.length), chomped)
+        result
+      end
+
+      def parse
+        @comments = {}
+        super
+        @comments
+      end
+    end
+  end
+end

data/lib/solargraph/parser/legacy/class_methods.rb

@@ -1,135 +1,135 @@
-require 'parser/current'
-
-module Solargraph
-  module Parser
-    module Legacy
-      module ClassMethods
-        # @param code [String]
-        # @param filename [String]
-        # @return [Array(Parser::AST::Node, Array<Parser::Source::Comment>)]
-        def parse_with_comments code, filename = nil
-          buffer = ::Parser::Source::Buffer.new(filename, 0)
-          buffer.source = code
-          node = parser.parse(buffer)
-          comments = CommentRipper.new(code, filename, 0).parse
-          [node, comments]
-        rescue ::Parser::SyntaxError => e
-          raise Parser::SyntaxError, e.message
-        end
-
-        # @param code [String]
-        # @param filename [String, nil]
-        # @param line [Integer]
-        # @return [Parser::AST::Node]
-        def parse code, filename = nil, line = 0
-          buffer = ::Parser::Source::Buffer.new(filename, line)
-          buffer.source = code
-          parser.parse(buffer)
-        rescue ::Parser::SyntaxError => e
-          raise Parser::SyntaxError, e.message
-        end
-
-        # @return [Parser::Base]
-        def parser
-          # @todo Consider setting an instance variable. We might not need to
-          #   recreate the parser every time we use it.
-          parser = ::Parser::CurrentRuby.new(FlawedBuilder.new)
-          parser.diagnostics.all_errors_are_fatal = true
-          parser.diagnostics.ignore_warnings      = true
-          parser
-        end
-
-        def map source
-          NodeProcessor.process(source.node, Region.new(source: source))
-        end
-
-        def returns_from node
-          NodeMethods.returns_from(node)
-        end
-
-        def references source, name
-          if name.end_with?("=")
-            reg = /#{Regexp.escape name[0..-2]}\s*=/
-            extract_offset = ->(code, offset) { reg.match(code, offset).offset(0) }
-          else
-            extract_offset = ->(code, offset) { [soff = code.index(name, offset), soff + name.length] }
-          end
-          inner_node_references(name, source.node).map do |n|
-            rng = Range.from_node(n)
-            offset = Position.to_offset(source.code, rng.start)
-            soff, eoff = extract_offset[source.code, offset]
-            Location.new(
-              source.filename,
-              Range.new(
-                Position.from_offset(source.code, soff),
-                Position.from_offset(source.code, eoff)
-              )
-            )
-          end
-        end
-
-        # @param name [String]
-        # @param top [AST::Node]
-        # @return [Array<AST::Node>]
-        def inner_node_references name, top
-          result = []
-          if top.is_a?(AST::Node) && top.to_s.include?(":#{name}")
-            result.push top if top.children.any? { |c| c.to_s == name }
-            top.children.each { |c| result.concat inner_node_references(name, c) }
-          end
-          result
-        end
-
-        def chain *args
-          NodeChainer.chain *args
-        end
-
-        def chain_string *args
-          NodeChainer.load_string *args
-        end
-
-        def process_node *args
-          Solargraph::Parser::NodeProcessor.process *args
-        end
-
-        def infer_literal_node_type node
-          NodeMethods.infer_literal_node_type node
-        end
-
-        def version
-          parser.version
-        end
-
-        def is_ast_node? node
-          node.is_a?(::Parser::AST::Node)
-        end
-
-        def node_range node
-          st = Position.new(node.loc.line, node.loc.column)
-          en = Position.new(node.loc.last_line, node.loc.last_column)
-          Range.new(st, en)
-        end
-
-        def string_ranges node
-          return [] unless is_ast_node?(node)
-          result = []
-          if node.type == :str
-            result.push Range.from_node(node)
-          end
-          node.children.each do |child|
-            result.concat string_ranges(child)
-          end
-          if node.type == :dstr && node.children.last.nil?
-            last = node.children[-2]
-            unless last.nil?
-              rng = Range.from_node(last)
-              pos = Position.new(rng.ending.line, rng.ending.column - 1)
-              result.push Range.new(pos, pos)
-            end
-          end
-          result
-        end  
-      end
-    end
-  end
-end
+require 'parser/current'
+
+module Solargraph
+  module Parser
+    module Legacy
+      module ClassMethods
+        # @param code [String]
+        # @param filename [String]
+        # @return [Array(Parser::AST::Node, Array<Parser::Source::Comment>)]
+        def parse_with_comments code, filename = nil
+          buffer = ::Parser::Source::Buffer.new(filename, 0)
+          buffer.source = code
+          node = parser.parse(buffer)
+          comments = CommentRipper.new(code, filename, 0).parse
+          [node, comments]
+        rescue ::Parser::SyntaxError => e
+          raise Parser::SyntaxError, e.message
+        end
+
+        # @param code [String]
+        # @param filename [String, nil]
+        # @param line [Integer]
+        # @return [Parser::AST::Node]
+        def parse code, filename = nil, line = 0
+          buffer = ::Parser::Source::Buffer.new(filename, line)
+          buffer.source = code
+          parser.parse(buffer)
+        rescue ::Parser::SyntaxError => e
+          raise Parser::SyntaxError, e.message
+        end
+
+        # @return [Parser::Base]
+        def parser
+          # @todo Consider setting an instance variable. We might not need to
+          #   recreate the parser every time we use it.
+          parser = ::Parser::CurrentRuby.new(FlawedBuilder.new)
+          parser.diagnostics.all_errors_are_fatal = true
+          parser.diagnostics.ignore_warnings      = true
+          parser
+        end
+
+        def map source
+          NodeProcessor.process(source.node, Region.new(source: source))
+        end
+
+        def returns_from node
+          NodeMethods.returns_from(node)
+        end
+
+        def references source, name
+          if name.end_with?("=")
+            reg = /#{Regexp.escape name[0..-2]}\s*=/
+            extract_offset = ->(code, offset) { reg.match(code, offset).offset(0) }
+          else
+            extract_offset = ->(code, offset) { [soff = code.index(name, offset), soff + name.length] }
+          end
+          inner_node_references(name, source.node).map do |n|
+            rng = Range.from_node(n)
+            offset = Position.to_offset(source.code, rng.start)
+            soff, eoff = extract_offset[source.code, offset]
+            Location.new(
+              source.filename,
+              Range.new(
+                Position.from_offset(source.code, soff),
+                Position.from_offset(source.code, eoff)
+              )
+            )
+          end
+        end
+
+        # @param name [String]
+        # @param top [AST::Node]
+        # @return [Array<AST::Node>]
+        def inner_node_references name, top
+          result = []
+          if top.is_a?(AST::Node) && top.to_s.include?(":#{name}")
+            result.push top if top.children.any? { |c| c.to_s == name }
+            top.children.each { |c| result.concat inner_node_references(name, c) }
+          end
+          result
+        end
+
+        def chain *args
+          NodeChainer.chain *args
+        end
+
+        def chain_string *args
+          NodeChainer.load_string *args
+        end
+
+        def process_node *args
+          Solargraph::Parser::NodeProcessor.process *args
+        end
+
+        def infer_literal_node_type node
+          NodeMethods.infer_literal_node_type node
+        end
+
+        def version
+          parser.version
+        end
+
+        def is_ast_node? node
+          node.is_a?(::Parser::AST::Node)
+        end
+
+        def node_range node
+          st = Position.new(node.loc.line, node.loc.column)
+          en = Position.new(node.loc.last_line, node.loc.last_column)
+          Range.new(st, en)
+        end
+
+        def string_ranges node
+          return [] unless is_ast_node?(node)
+          result = []
+          if node.type == :str
+            result.push Range.from_node(node)
+          end
+          node.children.each do |child|
+            result.concat string_ranges(child)
+          end
+          if node.type == :dstr && node.children.last.nil?
+            last = node.children[-2]
+            unless last.nil?
+              rng = Range.from_node(last)
+              pos = Position.new(rng.ending.line, rng.ending.column - 1)
+              result.push Range.new(pos, pos)
+            end
+          end
+          result
+        end  
+      end
+    end
+  end
+end