solargraph 0.44.1 → 0.44.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 346926f891270e103d6c7170fe5897587c1d5da45ea33b2a7f4238914b38b236
-  data.tar.gz: 451b09bf70dc9d760ebfdeb726821e6e653f196bd867da8c7638888803e33a72
+  metadata.gz: 8fd55900ebfdb84f10fa5ba2cb7e5fcc6dc7af0e51efe6a5d230ebaf497ec75c
+  data.tar.gz: 859e3d6738c17b1fc9241dbc4ed9e7f4fa117556bb7767915de0178fc2a50721
 SHA512:
-  metadata.gz: 624d1de49ef2762477d7a413adf282a058143a71689ea8cdfcc91177db94c765b997fca00fefd8d0d4915e44e6cd4ae1867297671611ba6d119d610116c5b80a
-  data.tar.gz: 9f146a371e075407cb8be7b96de08ff24583cf18eb1a29310c1a711c1bd347715d07b0ff6603e9a98b71be7406148e17c907abdcf3bd1a2aba58bd5aeff14685
+  metadata.gz: fb53ed887a2d25be28655486de35cb87deac7a604eae688bc20be8c34a696dc86d9dbcf6d069f908316078d653e06f4f00154e23eae411876a8f5cd191dfa51d
+  data.tar.gz: f7e65200040c8a2bfd7f73e4ad7aa718dc7378fcb99850802fcd2b7ab212b59cf6ae215e21dcd7f1158291551ab211bc836113e9c06d389f6c17fb69de27457f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.44.2 - November 23, 2021
+- Scope local variables in class_eval blocks (#503)
+- Fix invalid UTF-8 in node comments (#504)
+
 ## 0.44.1 - November 18, 2021
 - Chain nil safety navigation operator (#420)
 - Update closure and context for class_eval receiver (#487)

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

@@ -48,10 +48,16 @@ module Solargraph
         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|
-            offset = Position.to_offset(source.code, NodeMethods.get_node_start_position(n))
-            soff = source.code.index(name, offset)
-            eoff = soff + name.length
+            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(

data/lib/solargraph/parser/legacy/node_processors/block_node.rb

@@ -8,17 +8,24 @@ module Solargraph
           include Legacy::NodeMethods
 
           def process
-            if other_class_eval?
-              other_class = Solargraph::Pin::Namespace.new(
+            location = get_node_location(node)
+            parent = if other_class_eval?
+              Solargraph::Pin::Namespace.new(
+                location: location,
                 type: :class,
                 name: unpack_name(node.children[0].children[0])
               )
-              make_block_in other_class.context
-              process_children region.update(closure: other_class)
             else
-              make_block_in nil
-              process_children region.update(closure: pins.last)
+              region.closure
             end
+            pins.push Solargraph::Pin::Block.new(
+              location: location,
+              closure: parent,
+              receiver: node.children[0],
+              comments: comments_for(node),
+              scope: region.scope || region.closure.context.scope
+            )
+            process_children region.update(closure: pins.last)
           end
 
           private
@@ -28,17 +35,6 @@ module Solargraph
               node.children[0].children[1] == :class_eval &&
               [:cbase, :const].include?(node.children[0].children[0]&.type)
           end
-
-          def make_block_in context
-            pins.push Solargraph::Pin::Block.new(
-              location: get_node_location(node),
-              context: context,
-              closure: region.closure,
-              receiver: node.children[0],
-              comments: comments_for(node),
-              scope: region.scope || region.closure.context.scope
-            )
-          end
         end
       end
     end

data/lib/solargraph/parser/rubyvm/node_processors/block_node.rb

@@ -8,17 +8,24 @@ module Solargraph
           include NodeMethods
 
           def process
-            if other_class_eval?
-              other_class = Solargraph::Pin::Namespace.new(
+            location = get_node_location(node)
+            parent = if other_class_eval?
+              Solargraph::Pin::Namespace.new(
+                location: location,
                 type: :class,
                 name: unpack_name(node.children[0].children[0])
               )
-              make_block_in other_class.context
-              process_children region.update(closure: other_class)
             else
-              make_block_in nil
-              process_children region.update(closure: pins.last)
+              region.closure
             end
+            pins.push Solargraph::Pin::Block.new(
+              location: location,
+              closure: parent,
+              receiver: node.children[0],
+              comments: comments_for(node),
+              scope: region.scope || region.closure.context.scope
+            )
+            process_children region.update(closure: pins.last)
           end
 
           private
@@ -28,17 +35,6 @@ module Solargraph
               node.children[0].children[1] == :class_eval &&
               [:COLON2, :CONST].include?(node.children[0].children[0].type)
           end
-
-          def make_block_in context
-            pins.push Solargraph::Pin::Block.new(
-              location: get_node_location(node),
-              context: context,
-              closure: region.closure,
-              receiver: node.children[0],
-              comments: comments_for(node),
-              scope: region.scope || region.closure.context.scope
-            )
-          end
         end
       end
     end

data/lib/solargraph/pin/local_variable.rb

@@ -41,7 +41,7 @@ module Solargraph
       end
 
       def match_named_closure needle, haystack
-        return true if needle == haystack
+        return true if needle == haystack || haystack.is_a?(Pin::Block)
         cursor = haystack
         until cursor.nil?
           return true if needle.path == cursor.path

data/lib/solargraph/pin/namespace.rb

@@ -9,8 +9,8 @@ module Solargraph
       # @return [::Symbol] :class or :module
       attr_reader :type
 
-      # @param type [Symbol] :class or :module
-      # @param visibility [Symbol] :public or :private
+      # @param type [::Symbol] :class or :module
+      # @param visibility [::Symbol] :public or :private
       # @param gates [Array<String>]
       def initialize type: :class, visibility: :public, gates: [''], **splat
         # super(location, namespace, name, comments)

data/lib/solargraph/source.rb

@@ -360,7 +360,7 @@ module Solargraph
       skip = nil
       comments.lines.each { |l|
         # Trim the comment and minimum leading whitespace
-        p = l.gsub(/^#+/, '')
+        p = l.encode('UTF-8', invalid: :replace, replace: '?').gsub(/^#+/, '')
         if p.strip.empty?
           next unless started
           ctxt.concat p

data/lib/solargraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.44.1'
+  VERSION = '0.44.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.44.1
+  version: 0.44.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport