ruby-lsp-ree 0.1.14 → 0.1.15
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 +4 -4
- data/CHANGELOG.md +5 -0
- data/Gemfile.lock +1 -1
- data/lib/ruby_lsp/ruby_lsp_ree/completion/completion_items_mapper.rb +183 -0
- data/lib/ruby_lsp/ruby_lsp_ree/formatters/base_formatter.rb +3 -0
- data/lib/ruby_lsp/ruby_lsp_ree/formatters/unused_links_formatter.rb +19 -13
- data/lib/ruby_lsp/ruby_lsp_ree/handlers/completion_handler.rb +13 -208
- data/lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_link_node.rb +34 -6
- data/lib/ruby_lsp/ruby_lsp_ree/ree_source_editor.rb +2 -2
- data/lib/ruby_lsp_ree/version.rb +1 -1
- metadata +5 -4
- /data/lib/ruby_lsp/ruby_lsp_ree/{handlers → completion}/const_additional_text_edits_creator.rb +0 -0
- /data/lib/ruby_lsp/ruby_lsp_ree/{handlers → completion}/method_additional_text_edits_creator.rb +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7f3673076ca0aee98f0f92d6db25a2939ae21a58464a70e1a1e534bfef3458d0
|
4
|
+
data.tar.gz: 2191d354bbe75911cc230ca20665e5882e15eabee5de30801db1960990d42c3b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ec2b1c6e15509e7e8f18758ef3a6912c14dccbdc6348d353331894fc53efbd072b043e49b1ee933c2b552e11404a4f322f8336aa29f267f3a842724d67fc8d7a
|
7
|
+
data.tar.gz: c584181adbf4ed1a02dc2545c1b65cf4ada307ade2d46aee661a97319adf43d67e6d21bb47f7b05d73bc4a2b913053ca990cae0cf1722587c350be942151e385
|
data/CHANGELOG.md
CHANGED
data/Gemfile.lock
CHANGED
@@ -0,0 +1,183 @@
|
|
1
|
+
require_relative 'method_additional_text_edits_creator'
|
2
|
+
require_relative 'const_additional_text_edits_creator'
|
3
|
+
|
4
|
+
module RubyLsp
|
5
|
+
module Ree
|
6
|
+
class CompletionItemsMapper
|
7
|
+
include Requests::Support::Common
|
8
|
+
include RubyLsp::Ree::ReeLspUtils
|
9
|
+
|
10
|
+
def initialize(index)
|
11
|
+
@index = index
|
12
|
+
end
|
13
|
+
|
14
|
+
def map_ree_object_methods(ree_object_methods, location, node, description)
|
15
|
+
default_range = Interface::Range.new(
|
16
|
+
start: Interface::Position.new(line: location.start_line - 1, character: location.end_column + 1),
|
17
|
+
end: Interface::Position.new(line: location.start_line - 1, character: location.end_column + 1),
|
18
|
+
)
|
19
|
+
|
20
|
+
ree_object_methods.map do |object_method|
|
21
|
+
signature = object_method.signatures&.first
|
22
|
+
|
23
|
+
label_details = Interface::CompletionItemLabelDetails.new(
|
24
|
+
description: description,
|
25
|
+
detail: get_detail_string(signature)
|
26
|
+
)
|
27
|
+
|
28
|
+
if node.arguments && node.name.to_s == object_method.name
|
29
|
+
new_text = object_method.name
|
30
|
+
method_range = range_from_location(node.message_loc)
|
31
|
+
else
|
32
|
+
new_text = get_method_string(object_method.name, signature)
|
33
|
+
method_range = default_range
|
34
|
+
end
|
35
|
+
|
36
|
+
Interface::CompletionItem.new(
|
37
|
+
label: object_method.name,
|
38
|
+
label_details: label_details,
|
39
|
+
filter_text: object_method.name,
|
40
|
+
text_edit: Interface::TextEdit.new(
|
41
|
+
range: method_range,
|
42
|
+
new_text: new_text
|
43
|
+
),
|
44
|
+
kind: Constant::CompletionItemKind::METHOD,
|
45
|
+
insert_text_format: Constant::InsertTextFormat::SNIPPET,
|
46
|
+
data: {
|
47
|
+
owner_name: "Object",
|
48
|
+
guessed_type: false,
|
49
|
+
}
|
50
|
+
)
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
54
|
+
def map_ree_objects(ree_objects, node, parsed_doc)
|
55
|
+
ree_objects.map do |ree_object|
|
56
|
+
ree_object_name = ree_object.name
|
57
|
+
package_name = package_name_from_uri(ree_object.uri)
|
58
|
+
signature = ree_object.signatures.first
|
59
|
+
ree_type = get_ree_type(ree_object)
|
60
|
+
|
61
|
+
label_details = Interface::CompletionItemLabelDetails.new(
|
62
|
+
description: "#{ree_type}, from: :#{package_name}",
|
63
|
+
detail: get_detail_string(signature)
|
64
|
+
)
|
65
|
+
|
66
|
+
if node.arguments && node.name.to_s == ree_object_name
|
67
|
+
new_text = ree_object_name
|
68
|
+
range = range_from_location(node.message_loc)
|
69
|
+
else
|
70
|
+
new_text = get_method_string(ree_object_name, signature)
|
71
|
+
range = range_from_location(node.location)
|
72
|
+
end
|
73
|
+
|
74
|
+
Interface::CompletionItem.new(
|
75
|
+
label: ree_object_name,
|
76
|
+
label_details: label_details,
|
77
|
+
filter_text: ree_object_name,
|
78
|
+
text_edit: Interface::TextEdit.new(
|
79
|
+
range: range,
|
80
|
+
new_text: new_text
|
81
|
+
),
|
82
|
+
kind: Constant::CompletionItemKind::METHOD,
|
83
|
+
insert_text_format: Constant::InsertTextFormat::SNIPPET,
|
84
|
+
data: {
|
85
|
+
owner_name: "Object",
|
86
|
+
guessed_type: false,
|
87
|
+
},
|
88
|
+
additional_text_edits: MethodAdditionalTextEditsCreator.call(parsed_doc, ree_object_name, package_name)
|
89
|
+
)
|
90
|
+
end
|
91
|
+
end
|
92
|
+
|
93
|
+
def map_class_name_objects(class_name_objects, node, parsed_doc)
|
94
|
+
imported_consts = []
|
95
|
+
not_imported_consts = []
|
96
|
+
|
97
|
+
class_name_objects.each do |full_class_name|
|
98
|
+
entries = @index[full_class_name]
|
99
|
+
|
100
|
+
entries.each do |entry|
|
101
|
+
class_name = full_class_name.split('::').last
|
102
|
+
package_name = package_name_from_uri(entry.uri)
|
103
|
+
file_name = File.basename(entry.uri.to_s)
|
104
|
+
entry_comment = entry.comments && entry.comments.size > 0 ? " (#{entry.comments})" : ''
|
105
|
+
|
106
|
+
matched_import = parsed_doc.find_import_for_package(class_name, package_name)
|
107
|
+
|
108
|
+
if matched_import
|
109
|
+
label_details = Interface::CompletionItemLabelDetails.new(
|
110
|
+
description: "imported from: :#{package_name}",
|
111
|
+
detail: entry_comment
|
112
|
+
)
|
113
|
+
|
114
|
+
imported_consts << Interface::CompletionItem.new(
|
115
|
+
label: class_name,
|
116
|
+
label_details: label_details,
|
117
|
+
filter_text: class_name,
|
118
|
+
text_edit: Interface::TextEdit.new(
|
119
|
+
range: range_from_location(node.location),
|
120
|
+
new_text: class_name,
|
121
|
+
),
|
122
|
+
kind: Constant::CompletionItemKind::CLASS,
|
123
|
+
additional_text_edits: []
|
124
|
+
)
|
125
|
+
else
|
126
|
+
label_details = Interface::CompletionItemLabelDetails.new(
|
127
|
+
description: "from: :#{package_name}",
|
128
|
+
detail: entry_comment + " #{file_name}"
|
129
|
+
)
|
130
|
+
|
131
|
+
not_imported_consts << Interface::CompletionItem.new(
|
132
|
+
label: class_name,
|
133
|
+
label_details: label_details,
|
134
|
+
filter_text: class_name,
|
135
|
+
text_edit: Interface::TextEdit.new(
|
136
|
+
range: range_from_location(node.location),
|
137
|
+
new_text: class_name,
|
138
|
+
),
|
139
|
+
kind: Constant::CompletionItemKind::CLASS,
|
140
|
+
additional_text_edits: ConstAdditionalTextEditsCreator.call(parsed_doc, class_name, package_name, entry)
|
141
|
+
)
|
142
|
+
end
|
143
|
+
end
|
144
|
+
end
|
145
|
+
|
146
|
+
imported_consts + not_imported_consts
|
147
|
+
end
|
148
|
+
|
149
|
+
private
|
150
|
+
|
151
|
+
def get_detail_string(signature)
|
152
|
+
return '' unless signature
|
153
|
+
|
154
|
+
"(#{get_parameters_string(signature)})"
|
155
|
+
end
|
156
|
+
|
157
|
+
def get_parameters_string(signature)
|
158
|
+
return '' unless signature
|
159
|
+
|
160
|
+
signature.parameters.map(&:decorated_name).join(', ')
|
161
|
+
end
|
162
|
+
|
163
|
+
def get_method_string(fn_name, signature)
|
164
|
+
return fn_name unless signature
|
165
|
+
|
166
|
+
"#{fn_name}(#{get_parameters_placeholder(signature)})"
|
167
|
+
end
|
168
|
+
|
169
|
+
def get_parameters_placeholder(signature)
|
170
|
+
return '' unless signature
|
171
|
+
|
172
|
+
signature.parameters.to_enum.with_index.map do |signature_param, index|
|
173
|
+
case signature_param
|
174
|
+
when RubyIndexer::Entry::KeywordParameter, RubyIndexer::Entry::OptionalKeywordParameter
|
175
|
+
"#{signature_param.name}: ${#{index+1}:#{signature_param.name}}"
|
176
|
+
else
|
177
|
+
"${#{index+1}:#{signature_param.name}}"
|
178
|
+
end
|
179
|
+
end.join(', ')
|
180
|
+
end
|
181
|
+
end
|
182
|
+
end
|
183
|
+
end
|
@@ -3,6 +3,9 @@ module RubyLsp
|
|
3
3
|
class BaseFormatter
|
4
4
|
def self.call(source, uri, message_queue, index)
|
5
5
|
new(message_queue, index).call(source, uri)
|
6
|
+
rescue => e
|
7
|
+
$stderr.puts("error in #{self.class}: #{e.message} : #{e.backtrace.first}")
|
8
|
+
source
|
6
9
|
end
|
7
10
|
|
8
11
|
def initialize(message_queue, index)
|
@@ -7,38 +7,34 @@ module RubyLsp
|
|
7
7
|
class UnusedLinksFormatter < BaseFormatter
|
8
8
|
include RubyLsp::Ree::ReeLspUtils
|
9
9
|
|
10
|
+
attr_reader :editor, :dsl_parser
|
11
|
+
|
10
12
|
def call(source, _uri)
|
11
13
|
parsed_doc = RubyLsp::Ree::ParsedDocumentBuilder.build_from_source(source)
|
12
14
|
return source if !parsed_doc
|
13
15
|
|
14
16
|
parsed_doc.parse_links
|
15
17
|
|
16
|
-
editor = RubyLsp::Ree::ReeSourceEditor.new(source)
|
17
|
-
dsl_parser = RubyLsp::Ree::ReeDslParser.new(parsed_doc, @index)
|
18
|
+
@editor = RubyLsp::Ree::ReeSourceEditor.new(source)
|
19
|
+
@dsl_parser = RubyLsp::Ree::ReeDslParser.new(parsed_doc, @index)
|
18
20
|
|
19
21
|
links_count = parsed_doc.link_nodes.size
|
20
22
|
|
21
23
|
removed_links = 0
|
22
24
|
|
23
25
|
parsed_doc.link_nodes.each do |link_node|
|
24
|
-
|
26
|
+
remove_imports = []
|
25
27
|
|
26
28
|
if link_node.has_import_section?
|
27
|
-
link_node.imports.
|
28
|
-
|
29
|
-
next if editor.contains_link_import_usage?(link_node, link_import) || dsl_parser.contains_object_usage?(link_import)
|
30
|
-
|
31
|
-
editor.remove_link_import(link_node, link_import)
|
32
|
-
removed_imports += 1
|
33
|
-
end
|
29
|
+
remove_imports = link_node.imports.reject{ |imp| import_is_used?(link_node, imp) }
|
30
|
+
editor.remove_link_imports(link_node, remove_imports)
|
34
31
|
|
35
|
-
if link_node.imports.size ==
|
32
|
+
if link_node.imports.size == remove_imports.size
|
36
33
|
editor.remove_link_import_arg(link_node)
|
37
34
|
end
|
38
35
|
end
|
39
36
|
|
40
|
-
|
41
|
-
next if editor.contains_link_usage?(link_node) || link_node.imports.size > removed_imports || dsl_parser.contains_object_usage?(link_node.name)
|
37
|
+
next if link_is_used?(link_node, remove_imports)
|
42
38
|
|
43
39
|
editor.remove_link(link_node)
|
44
40
|
removed_links += 1
|
@@ -51,6 +47,16 @@ module RubyLsp
|
|
51
47
|
|
52
48
|
editor.source
|
53
49
|
end
|
50
|
+
|
51
|
+
private
|
52
|
+
|
53
|
+
def import_is_used?(link_node, link_import)
|
54
|
+
editor.contains_link_import_usage?(link_node, link_import) || dsl_parser.contains_object_usage?(link_import)
|
55
|
+
end
|
56
|
+
|
57
|
+
def link_is_used?(link_node, remove_imports)
|
58
|
+
editor.contains_link_usage?(link_node) || link_node.imports.size > remove_imports.size || dsl_parser.contains_object_usage?(link_node.name)
|
59
|
+
end
|
54
60
|
end
|
55
61
|
end
|
56
62
|
end
|
@@ -1,7 +1,6 @@
|
|
1
1
|
require_relative "../utils/ree_lsp_utils"
|
2
2
|
require_relative "../ree_object_finder"
|
3
|
-
require_relative '
|
4
|
-
require_relative 'method_additional_text_edits_creator'
|
3
|
+
require_relative '../completion/completion_items_mapper'
|
5
4
|
|
6
5
|
module RubyLsp
|
7
6
|
module Ree
|
@@ -18,6 +17,7 @@ module RubyLsp
|
|
18
17
|
@node_context = node_context
|
19
18
|
@root_node = @node_context.instance_variable_get(:@nesting_nodes).first
|
20
19
|
@finder = ReeObjectFinder.new(@index)
|
20
|
+
@mapper = RubyLsp::Ree::CompletionItemsMapper.new(@index)
|
21
21
|
end
|
22
22
|
|
23
23
|
def get_ree_receiver(receiver_node)
|
@@ -31,115 +31,30 @@ module RubyLsp
|
|
31
31
|
|
32
32
|
case @finder.object_type(ree_receiver)
|
33
33
|
when :enum
|
34
|
-
get_enum_values_completion_items(ree_receiver, location)
|
34
|
+
get_enum_values_completion_items(ree_receiver, location, node)
|
35
35
|
when :bean, :async_bean
|
36
|
-
get_bean_methods_completion_items(ree_receiver, location)
|
36
|
+
get_bean_methods_completion_items(ree_receiver, location, node)
|
37
37
|
when :dao
|
38
|
-
get_dao_filters_completion_items(ree_receiver, location)
|
38
|
+
get_dao_filters_completion_items(ree_receiver, location, node)
|
39
39
|
else
|
40
40
|
[]
|
41
41
|
end
|
42
42
|
end
|
43
43
|
|
44
|
-
def get_bean_methods_completion_items(bean_obj, location)
|
44
|
+
def get_bean_methods_completion_items(bean_obj, location, node)
|
45
45
|
bean_node = RubyLsp::Ree::ParsedDocumentBuilder.build_from_uri(bean_obj.uri, :bean)
|
46
|
-
|
47
|
-
range = Interface::Range.new(
|
48
|
-
start: Interface::Position.new(line: location.start_line - 1, character: location.end_column + 1),
|
49
|
-
end: Interface::Position.new(line: location.start_line - 1, character: location.end_column + 1),
|
50
|
-
)
|
51
|
-
|
52
|
-
bean_node.bean_methods.map do |bean_method|
|
53
|
-
signature = bean_method.signatures.first
|
54
|
-
|
55
|
-
label_details = Interface::CompletionItemLabelDetails.new(
|
56
|
-
description: "method",
|
57
|
-
detail: get_detail_string(signature)
|
58
|
-
)
|
59
|
-
|
60
|
-
Interface::CompletionItem.new(
|
61
|
-
label: bean_method.name,
|
62
|
-
label_details: label_details,
|
63
|
-
filter_text: bean_method.name,
|
64
|
-
text_edit: Interface::TextEdit.new(
|
65
|
-
range: range,
|
66
|
-
new_text: get_method_string(bean_method.name, signature)
|
67
|
-
),
|
68
|
-
kind: Constant::CompletionItemKind::METHOD,
|
69
|
-
insert_text_format: Constant::InsertTextFormat::SNIPPET,
|
70
|
-
data: {
|
71
|
-
owner_name: "Object",
|
72
|
-
guessed_type: false,
|
73
|
-
}
|
74
|
-
)
|
75
|
-
end
|
46
|
+
@mapper.map_ree_object_methods(bean_node.bean_methods, location, node, "method")
|
76
47
|
end
|
77
48
|
|
78
|
-
def get_dao_filters_completion_items(dao_obj, location)
|
49
|
+
def get_dao_filters_completion_items(dao_obj, location, node)
|
79
50
|
dao_node = RubyLsp::Ree::ParsedDocumentBuilder.build_from_uri(dao_obj.uri, :dao)
|
80
|
-
|
81
|
-
range = Interface::Range.new(
|
82
|
-
start: Interface::Position.new(line: location.start_line - 1, character: location.end_column + 1),
|
83
|
-
end: Interface::Position.new(line: location.start_line - 1, character: location.end_column + 1),
|
84
|
-
)
|
85
|
-
|
86
|
-
dao_node.filters.map do |filter|
|
87
|
-
signature = filter.signatures.first
|
88
|
-
|
89
|
-
label_details = Interface::CompletionItemLabelDetails.new(
|
90
|
-
description: "filter",
|
91
|
-
detail: get_detail_string(signature)
|
92
|
-
)
|
93
|
-
|
94
|
-
Interface::CompletionItem.new(
|
95
|
-
label: filter.name,
|
96
|
-
label_details: label_details,
|
97
|
-
filter_text: filter.name,
|
98
|
-
text_edit: Interface::TextEdit.new(
|
99
|
-
range: range,
|
100
|
-
new_text: get_method_string(filter.name, signature)
|
101
|
-
),
|
102
|
-
kind: Constant::CompletionItemKind::METHOD,
|
103
|
-
insert_text_format: Constant::InsertTextFormat::SNIPPET,
|
104
|
-
data: {
|
105
|
-
owner_name: "Object",
|
106
|
-
guessed_type: false,
|
107
|
-
}
|
108
|
-
)
|
109
|
-
end
|
51
|
+
@mapper.map_ree_object_methods(dao_node.filters, location, node, "filter")
|
110
52
|
end
|
111
53
|
|
112
|
-
def get_enum_values_completion_items(enum_obj, location)
|
54
|
+
def get_enum_values_completion_items(enum_obj, location, node)
|
113
55
|
enum_node = RubyLsp::Ree::ParsedDocumentBuilder.build_from_uri(enum_obj.uri, :enum)
|
114
|
-
|
115
56
|
class_name = enum_node.full_class_name
|
116
|
-
|
117
|
-
label_details = Interface::CompletionItemLabelDetails.new(
|
118
|
-
description: "from: #{class_name}",
|
119
|
-
detail: ''
|
120
|
-
)
|
121
|
-
|
122
|
-
range = Interface::Range.new(
|
123
|
-
start: Interface::Position.new(line: location.start_line - 1, character: location.end_column + 1),
|
124
|
-
end: Interface::Position.new(line: location.start_line - 1, character: location.end_column + 1),
|
125
|
-
)
|
126
|
-
|
127
|
-
enum_node.values.map do |val|
|
128
|
-
Interface::CompletionItem.new(
|
129
|
-
label: val.name,
|
130
|
-
label_details: label_details,
|
131
|
-
filter_text: val.name,
|
132
|
-
text_edit: Interface::TextEdit.new(
|
133
|
-
range: range,
|
134
|
-
new_text: val.name
|
135
|
-
),
|
136
|
-
kind: Constant::CompletionItemKind::METHOD,
|
137
|
-
data: {
|
138
|
-
owner_name: "Object",
|
139
|
-
guessed_type: false,
|
140
|
-
}
|
141
|
-
)
|
142
|
-
end
|
57
|
+
@mapper.map_ree_object_methods(enum_node.values, location, node, "from: #{class_name}")
|
143
58
|
end
|
144
59
|
|
145
60
|
def get_class_name_completion_items(node)
|
@@ -150,59 +65,7 @@ module RubyLsp
|
|
150
65
|
|
151
66
|
parsed_doc = RubyLsp::Ree::ParsedDocumentBuilder.build_from_ast(@root_node, @uri)
|
152
67
|
|
153
|
-
|
154
|
-
not_imported_consts = []
|
155
|
-
|
156
|
-
class_name_objects.take(CANDIDATES_LIMIT).each do |full_class_name|
|
157
|
-
entries = @index[full_class_name]
|
158
|
-
|
159
|
-
entries.each do |entry|
|
160
|
-
class_name = full_class_name.split('::').last
|
161
|
-
package_name = package_name_from_uri(entry.uri)
|
162
|
-
file_name = File.basename(entry.uri.to_s)
|
163
|
-
entry_comment = entry.comments && entry.comments.size > 0 ? " (#{entry.comments})" : ''
|
164
|
-
|
165
|
-
matched_import = parsed_doc.find_import_for_package(class_name, package_name)
|
166
|
-
|
167
|
-
if matched_import
|
168
|
-
label_details = Interface::CompletionItemLabelDetails.new(
|
169
|
-
description: "imported from: :#{package_name}",
|
170
|
-
detail: entry_comment
|
171
|
-
)
|
172
|
-
|
173
|
-
imported_consts << Interface::CompletionItem.new(
|
174
|
-
label: class_name,
|
175
|
-
label_details: label_details,
|
176
|
-
filter_text: class_name,
|
177
|
-
text_edit: Interface::TextEdit.new(
|
178
|
-
range: range_from_location(node.location),
|
179
|
-
new_text: class_name,
|
180
|
-
),
|
181
|
-
kind: Constant::CompletionItemKind::CLASS,
|
182
|
-
additional_text_edits: []
|
183
|
-
)
|
184
|
-
else
|
185
|
-
label_details = Interface::CompletionItemLabelDetails.new(
|
186
|
-
description: "from: :#{package_name}",
|
187
|
-
detail: entry_comment + " #{file_name}"
|
188
|
-
)
|
189
|
-
|
190
|
-
not_imported_consts << Interface::CompletionItem.new(
|
191
|
-
label: class_name,
|
192
|
-
label_details: label_details,
|
193
|
-
filter_text: class_name,
|
194
|
-
text_edit: Interface::TextEdit.new(
|
195
|
-
range: range_from_location(node.location),
|
196
|
-
new_text: class_name,
|
197
|
-
),
|
198
|
-
kind: Constant::CompletionItemKind::CLASS,
|
199
|
-
additional_text_edits: ConstAdditionalTextEditsCreator.call(parsed_doc, class_name, package_name, entry)
|
200
|
-
)
|
201
|
-
end
|
202
|
-
end
|
203
|
-
end
|
204
|
-
|
205
|
-
imported_consts + not_imported_consts
|
68
|
+
@mapper.map_class_name_objects(class_name_objects.take(CANDIDATES_LIMIT), node, parsed_doc)
|
206
69
|
end
|
207
70
|
|
208
71
|
def get_ree_objects_completions_items(node)
|
@@ -212,65 +75,7 @@ module RubyLsp
|
|
212
75
|
|
213
76
|
parsed_doc = RubyLsp::Ree::ParsedDocumentBuilder.build_from_ast(@root_node, @uri)
|
214
77
|
|
215
|
-
ree_objects
|
216
|
-
ree_object_name = ree_object.name
|
217
|
-
package_name = package_name_from_uri(ree_object.uri)
|
218
|
-
signature = ree_object.signatures.first
|
219
|
-
ree_type = get_ree_type(ree_object)
|
220
|
-
|
221
|
-
label_details = Interface::CompletionItemLabelDetails.new(
|
222
|
-
description: "#{ree_type}, from: :#{package_name}",
|
223
|
-
detail: get_detail_string(signature)
|
224
|
-
)
|
225
|
-
|
226
|
-
Interface::CompletionItem.new(
|
227
|
-
label: ree_object_name,
|
228
|
-
label_details: label_details,
|
229
|
-
filter_text: ree_object_name,
|
230
|
-
text_edit: Interface::TextEdit.new(
|
231
|
-
range: range_from_location(node.location),
|
232
|
-
new_text: get_method_string(ree_object_name, signature)
|
233
|
-
),
|
234
|
-
kind: Constant::CompletionItemKind::METHOD,
|
235
|
-
insert_text_format: Constant::InsertTextFormat::SNIPPET,
|
236
|
-
data: {
|
237
|
-
owner_name: "Object",
|
238
|
-
guessed_type: false,
|
239
|
-
},
|
240
|
-
additional_text_edits: MethodAdditionalTextEditsCreator.call(parsed_doc, ree_object_name, package_name)
|
241
|
-
)
|
242
|
-
end
|
243
|
-
end
|
244
|
-
|
245
|
-
def get_detail_string(signature)
|
246
|
-
return '' unless signature
|
247
|
-
|
248
|
-
"(#{get_parameters_string(signature)})"
|
249
|
-
end
|
250
|
-
|
251
|
-
def get_parameters_string(signature)
|
252
|
-
return '' unless signature
|
253
|
-
|
254
|
-
signature.parameters.map(&:decorated_name).join(', ')
|
255
|
-
end
|
256
|
-
|
257
|
-
def get_method_string(fn_name, signature)
|
258
|
-
return fn_name unless signature
|
259
|
-
|
260
|
-
"#{fn_name}(#{get_parameters_placeholder(signature)})"
|
261
|
-
end
|
262
|
-
|
263
|
-
def get_parameters_placeholder(signature)
|
264
|
-
return '' unless signature
|
265
|
-
|
266
|
-
signature.parameters.to_enum.with_index.map do |signature_param, index|
|
267
|
-
case signature_param
|
268
|
-
when RubyIndexer::Entry::KeywordParameter, RubyIndexer::Entry::OptionalKeywordParameter
|
269
|
-
"#{signature_param.name}: ${#{index+1}:#{signature_param.name}}"
|
270
|
-
else
|
271
|
-
"${#{index+1}:#{signature_param.name}}"
|
272
|
-
end
|
273
|
-
end.join(', ')
|
78
|
+
@mapper.map_ree_objects(ree_objects, node, parsed_doc)
|
274
79
|
end
|
275
80
|
end
|
276
81
|
end
|
@@ -1,11 +1,28 @@
|
|
1
1
|
require 'prism'
|
2
2
|
|
3
3
|
class RubyLsp::Ree::ParsedLinkNode
|
4
|
-
attr_reader :node, :document_package, :name, :
|
4
|
+
attr_reader :node, :document_package, :name, :import_items
|
5
5
|
|
6
6
|
FROM_ARG_KEY = 'from'
|
7
7
|
IMPORT_ARG_KEY = 'import'
|
8
8
|
|
9
|
+
class ImportItem
|
10
|
+
attr_reader :name, :original_name
|
11
|
+
|
12
|
+
def initialize(name:, original_name: nil)
|
13
|
+
@name = name
|
14
|
+
@original_name = original_name
|
15
|
+
end
|
16
|
+
|
17
|
+
def to_s
|
18
|
+
if @original_name
|
19
|
+
"#{@original_name}.as(#{@name})"
|
20
|
+
else
|
21
|
+
@name
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
9
26
|
def initialize(node, document_package = nil)
|
10
27
|
@node = node
|
11
28
|
@document_package = document_package
|
@@ -72,7 +89,11 @@ class RubyLsp::Ree::ParsedLinkNode
|
|
72
89
|
end
|
73
90
|
|
74
91
|
def parse_imports
|
75
|
-
@
|
92
|
+
@import_items ||= get_import_items
|
93
|
+
end
|
94
|
+
|
95
|
+
def imports
|
96
|
+
@import_items.map(&:name)
|
76
97
|
end
|
77
98
|
|
78
99
|
def has_import_section?
|
@@ -116,7 +137,7 @@ class RubyLsp::Ree::ParsedLinkNode
|
|
116
137
|
end
|
117
138
|
end
|
118
139
|
|
119
|
-
def
|
140
|
+
def get_import_items
|
120
141
|
return [] if @node.arguments.arguments.size == 1
|
121
142
|
|
122
143
|
if object_name_type?
|
@@ -136,10 +157,17 @@ class RubyLsp::Ree::ParsedLinkNode
|
|
136
157
|
end
|
137
158
|
|
138
159
|
def parse_object_link_multiple_imports(import_body)
|
139
|
-
if import_body.is_a?(Prism::CallNode)
|
140
|
-
parse_object_link_multiple_imports(import_body.receiver) +
|
160
|
+
if import_body.is_a?(Prism::CallNode) && import_body.name == :&
|
161
|
+
parse_object_link_multiple_imports(import_body.receiver) + parse_object_link_multiple_imports(import_body.arguments.arguments.first)
|
162
|
+
elsif import_body.is_a?(Prism::CallNode) && import_body.name == :as
|
163
|
+
[
|
164
|
+
ImportItem.new(
|
165
|
+
name: import_body.arguments.arguments.first.name.to_s,
|
166
|
+
original_name: import_body.receiver.name.to_s
|
167
|
+
)
|
168
|
+
]
|
141
169
|
else
|
142
|
-
[import_body.name.to_s]
|
170
|
+
[ ImportItem.new(name: import_body.name.to_s) ]
|
143
171
|
end
|
144
172
|
end
|
145
173
|
end
|
@@ -27,8 +27,8 @@ module RubyLsp
|
|
27
27
|
set_empty_lines!(link_node.location.start_line-1, link_node.location.end_line-1)
|
28
28
|
end
|
29
29
|
|
30
|
-
def
|
31
|
-
imports_str = link_node.
|
30
|
+
def remove_link_imports(link_node, link_imports)
|
31
|
+
imports_str = link_node.import_items.reject{ link_imports.include?(_1.name) }.map(&:to_s).join(' & ')
|
32
32
|
|
33
33
|
block_start_col = link_node.import_block_open_location.start_column
|
34
34
|
block_line = link_node.import_block_open_location.start_line-1
|
data/lib/ruby_lsp_ree/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ruby-lsp-ree
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.15
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ruslan Gatiyatov
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2025-04-
|
11
|
+
date: 2025-04-18 00:00:00.000000000 Z
|
12
12
|
dependencies: []
|
13
13
|
description: A Ruby LSP addon that adds extra editor functionality for Ree applications
|
14
14
|
email:
|
@@ -26,6 +26,9 @@ files:
|
|
26
26
|
- README.md
|
27
27
|
- Rakefile
|
28
28
|
- lib/ruby_lsp/ruby_lsp_ree/addon.rb
|
29
|
+
- lib/ruby_lsp/ruby_lsp_ree/completion/completion_items_mapper.rb
|
30
|
+
- lib/ruby_lsp/ruby_lsp_ree/completion/const_additional_text_edits_creator.rb
|
31
|
+
- lib/ruby_lsp/ruby_lsp_ree/completion/method_additional_text_edits_creator.rb
|
29
32
|
- lib/ruby_lsp/ruby_lsp_ree/formatters/base_formatter.rb
|
30
33
|
- lib/ruby_lsp/ruby_lsp_ree/formatters/missing_error_contracts_formatter.rb
|
31
34
|
- lib/ruby_lsp/ruby_lsp_ree/formatters/missing_error_definitions_formatter.rb
|
@@ -33,10 +36,8 @@ files:
|
|
33
36
|
- lib/ruby_lsp/ruby_lsp_ree/formatters/sort_links_formatter.rb
|
34
37
|
- lib/ruby_lsp/ruby_lsp_ree/formatters/unused_links_formatter.rb
|
35
38
|
- lib/ruby_lsp/ruby_lsp_ree/handlers/completion_handler.rb
|
36
|
-
- lib/ruby_lsp/ruby_lsp_ree/handlers/const_additional_text_edits_creator.rb
|
37
39
|
- lib/ruby_lsp/ruby_lsp_ree/handlers/definition_handler.rb
|
38
40
|
- lib/ruby_lsp/ruby_lsp_ree/handlers/hover_handler.rb
|
39
|
-
- lib/ruby_lsp/ruby_lsp_ree/handlers/method_additional_text_edits_creator.rb
|
40
41
|
- lib/ruby_lsp/ruby_lsp_ree/listeners/completion_listener.rb
|
41
42
|
- lib/ruby_lsp/ruby_lsp_ree/listeners/definition_listener.rb
|
42
43
|
- lib/ruby_lsp/ruby_lsp_ree/listeners/hover_listener.rb
|
/data/lib/ruby_lsp/ruby_lsp_ree/{handlers → completion}/const_additional_text_edits_creator.rb
RENAMED
File without changes
|
/data/lib/ruby_lsp/ruby_lsp_ree/{handlers → completion}/method_additional_text_edits_creator.rb
RENAMED
File without changes
|