ruby-lsp-ree 0.1.11 → 0.1.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d34821c4dab78822a47dd7fc927dbfaa8172992c8b51e62efe5650e4ed82a258
4
- data.tar.gz: a2e0d86639041a0f0810da2309e3d0d1a5d95d60069d1815a01d27d1d720889a
3
+ metadata.gz: 655e8856a825a3b31fef950de21f56c6a4feb279693d2892000db1147db9b48e
4
+ data.tar.gz: 85145dce503767be96a2f3c3f351be8a77f860713cceadb9e03757c0a97a65c1
5
5
  SHA512:
6
- metadata.gz: 4c234cf9d220472e15fce43d01a5e304fb16a63de4c9b913110567f9e7f099950221308ce7b93f0637bc2d24492a4d3cafcc1da32e877fa7d0feb2a0aea2d4fa
7
- data.tar.gz: 8323e4a46dcce71fd00c480374c58022415ba34603c640af812e7356bf8d0ce314fd0a8a919dc6bc54f0b23c82f2dc34c0df3f097930dc8f37bfadf56cc8a327
6
+ metadata.gz: 4956cc2138f636e9bb2068287e456833215b12d56c8f8e4bccf42b9d6ac92db19b54c1fb04fecd4cd18a41355fdb86896f62cbbdb4b0377a0543af88017b8ddc
7
+ data.tar.gz: 5f7a6ab9e5003f0c68351306a5df06005aad772fd3fb9dee262ef7e65f8071364f003f985d797f9bdd05ee4e04078092ef4561b63b1a8c0131452412870ebc2d
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- ruby-lsp-ree (0.1.11)
4
+ ruby-lsp-ree (0.1.12)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
@@ -69,11 +69,22 @@ class RubyLsp::Ree::ParsedClassDocument < RubyLsp::Ree::ParsedBaseDocument
69
69
  return unless has_body?
70
70
 
71
71
  @class_includes ||= class_node.body.body.select{ node_name(_1) == :include }.map do |class_include|
72
- parent_name = class_include.arguments.arguments.first.parent.name.to_s
73
- module_name = class_include.arguments.arguments.first.name
72
+ first_arg = class_include.arguments.arguments.first
73
+
74
+ include_name = case first_arg
75
+ when Prism::ConstantPathNode
76
+ parent_name = class_include.arguments.arguments.first.parent.name.to_s
77
+ module_name = class_include.arguments.arguments.first.name
78
+
79
+ [parent_name, module_name].compact.join('::')
80
+ when Prism::ConstantReadNode
81
+ first_arg.name.to_s
82
+ else
83
+ ''
84
+ end
74
85
 
75
86
  OpenStruct.new(
76
- name: [parent_name, module_name].compact.join('::')
87
+ name: include_name, location: class_include.location
77
88
  )
78
89
  end
79
90
  end
@@ -108,7 +108,7 @@ class RubyLsp::Ree::ParsedMethodNode
108
108
  elsif node.respond_to?(:statements)
109
109
  call_nodes += parse_body_call_objects(node.statements.body)
110
110
  elsif node.respond_to?(:block) && node.block
111
- call_nodes += parse_body_call_objects(node.block.body.body)
111
+ call_nodes += parse_body_call_objects(get_method_body(node.block))
112
112
  end
113
113
  end
114
114
 
@@ -68,8 +68,13 @@ module RubyLsp
68
68
  links_container_node.arguments.location.end_column + 1
69
69
  end
70
70
  elsif parsed_doc.includes_link_dsl?
71
- fn_line = parsed_doc.link_nodes.last.location.start_line
72
- position = parsed_doc.link_nodes.last.location.end_column + 1
71
+ if parsed_doc.link_nodes.size > 0
72
+ fn_line = parsed_doc.link_nodes.last.location.start_line
73
+ position = parsed_doc.link_nodes.last.location.end_column + 1
74
+ else
75
+ fn_line = parsed_doc.class_includes.last.location.start_line
76
+ position = parsed_doc.class_includes.last.location.end_column + 1
77
+ end
73
78
  elsif parsed_doc.allows_root_links?
74
79
  root_node_location = parsed_doc.root_node_line_location
75
80
 
@@ -2,6 +2,6 @@
2
2
 
3
3
  module RubyLsp
4
4
  module Ree
5
- VERSION = "0.1.11"
5
+ VERSION = "0.1.12"
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ruby-lsp-ree
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.11
4
+ version: 0.1.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ruslan Gatiyatov