solargraph 0.58.2 → 0.59.0.dev.1

data/lib/solargraph/location.rb

@@ -6,6 +6,7 @@ module Solargraph
   #
   class Location
     include Equality
+    include Comparable
 
     # @return [String]
     attr_reader :filename
@@ -13,14 +14,15 @@ module Solargraph
     # @return [Solargraph::Range]
     attr_reader :range
 
-    # @param filename [String]
+    # @param filename [String, nil]
     # @param range [Solargraph::Range]
     def initialize filename, range
+      raise "Use nil to represent no-file" if filename&.empty?
+
       @filename = filename
       @range = range
     end
 
-    # @sg-ignore Fix "Not enough arguments to Module#protected"
     protected def equality_fields
       [filename, range]
     end
@@ -64,14 +66,17 @@ module Solargraph
     # @return [Location, nil]
     def self.from_node(node)
       return nil if node.nil? || node.loc.nil?
+      filename = node.loc.expression.source_buffer.name
+      # @sg-ignore flow sensitive typing needs to create separate ranges for postfix if
+      filename = nil if filename.empty?
       range = Range.from_node(node)
-      self.new(node.loc.expression.source_buffer.name, range)
+      # @sg-ignore Need to add nil check here
+      self.new(filename, range)
     end
 
     # @param other [BasicObject]
     def == other
       return false unless other.is_a?(Location)
-      # @sg-ignore https://github.com/castwide/solargraph/pull/1114
       filename == other.filename and range == other.range
     end
 

data/lib/solargraph/logging.rb

@@ -29,9 +29,29 @@ module Solargraph
 
     module_function
 
+    # override this in your class to temporarily set a custom
+    # filtering log level for the class (e.g., suppress any debug
+    # message by setting it to :info even if it is set elsewhere, or
+    # show existing debug messages by setting to :debug).
+    #
+    # @return [Symbol]
+    def log_level
+      :warn
+    end
+
     # @return [Logger]
     def logger
-      @@logger
+      if LOG_LEVELS[log_level.to_s] == DEFAULT_LOG_LEVEL
+        @@logger
+      else
+        new_log_level = LOG_LEVELS[log_level.to_s]
+        logger = Logger.new(STDERR, level: new_log_level)
+
+        # @sg-ignore Wrong argument type for Logger#formatter=: arg_0
+        #   expected nil, received Logger::_Formatter, nil
+        logger.formatter = @@logger.formatter
+        logger
+      end
     end
   end
 end

data/lib/solargraph/parser/comment_ripper.rb

@@ -23,6 +23,7 @@ module Solargraph
         # @sg-ignore
         # @type [Array(Symbol, String, Array([Integer, nil], [Integer, nil]))]
         result = super
+        # @sg-ignore Need to add nil check here
         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:/)
@@ -40,20 +41,26 @@ module Solargraph
         @comments[result[2][0]] = Snippet.new(Range.from_to(result[2][0] || 0, result[2][1] || 0, result[2][0] || 0, (result[2][1] || 0) + chomped.length), chomped)
       end
 
+      # @sg-ignore @override is adding, not overriding
       def on_embdoc_beg *args
         result = super
+        # @sg-ignore @override is adding, not overriding
         create_snippet(result)
         result
       end
 
+      # @sg-ignore @override is adding, not overriding
       def on_embdoc *args
         result = super
+        # @sg-ignore @override is adding, not overriding
         create_snippet(result)
         result
       end
 
+      # @sg-ignore @override is adding, not overriding
       def on_embdoc_end *args
         result = super
+        # @sg-ignore @override is adding, not overriding
         create_snippet(result)
         result
       end