Skip to content

Commit 1d9271a

Browse files
vinistockkddnewton
andauthored
Remove on_node from folding range (#1079)
Co-authored-by: Kevin Newton <[email protected]>
1 parent 5d272b3 commit 1d9271a

File tree

3 files changed

+28
-5
lines changed

3 files changed

+28
-5
lines changed

lib/ruby_lsp/requests/folding_ranges.rb

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,81 +98,92 @@ def on_interpolated_string(node)
9898

9999
sig { params(node: YARP::ArrayNode).void }
100100
def on_array(node)
101+
emit_requires_range
101102
add_simple_range(node)
102103
end
103104

104105
sig { params(node: YARP::BlockNode).void }
105106
def on_block(node)
107+
emit_requires_range
106108
add_simple_range(node)
107109
end
108110

109111
sig { params(node: YARP::CaseNode).void }
110112
def on_case(node)
113+
emit_requires_range
111114
add_simple_range(node)
112115
end
113116

114117
sig { params(node: YARP::ClassNode).void }
115118
def on_class(node)
119+
emit_requires_range
116120
add_simple_range(node)
117121
end
118122

119123
sig { params(node: YARP::ModuleNode).void }
120124
def on_module(node)
125+
emit_requires_range
121126
add_simple_range(node)
122127
end
123128

124129
sig { params(node: YARP::ForNode).void }
125130
def on_for(node)
131+
emit_requires_range
126132
add_simple_range(node)
127133
end
128134

129135
sig { params(node: YARP::HashNode).void }
130136
def on_hash(node)
137+
emit_requires_range
131138
add_simple_range(node)
132139
end
133140

134141
sig { params(node: YARP::SingletonClassNode).void }
135142
def on_singleton_class(node)
143+
emit_requires_range
136144
add_simple_range(node)
137145
end
138146

139147
sig { params(node: YARP::UnlessNode).void }
140148
def on_unless(node)
149+
emit_requires_range
141150
add_simple_range(node)
142151
end
143152

144153
sig { params(node: YARP::UntilNode).void }
145154
def on_until(node)
155+
emit_requires_range
146156
add_simple_range(node)
147157
end
148158

149159
sig { params(node: YARP::WhileNode).void }
150160
def on_while(node)
161+
emit_requires_range
151162
add_simple_range(node)
152163
end
153164

154165
sig { params(node: YARP::ElseNode).void }
155166
def on_else(node)
167+
emit_requires_range
156168
add_simple_range(node)
157169
end
158170

159171
sig { params(node: YARP::EnsureNode).void }
160172
def on_ensure(node)
173+
emit_requires_range
161174
add_simple_range(node)
162175
end
163176

164177
sig { params(node: YARP::BeginNode).void }
165178
def on_begin(node)
166-
add_simple_range(node)
167-
end
179+
emit_requires_range
168180

169-
sig { params(node: YARP::Node).void }
170-
def on_node(node)
171-
emit_requires_range unless node.is_a?(YARP::CallNode)
181+
add_simple_range(node)
172182
end
173183

174184
sig { params(node: YARP::StringConcatNode).void }
175185
def on_string_concat(node)
186+
emit_requires_range
176187
left = T.let(node.left, YARP::Node)
177188
left = left.left while left.is_a?(YARP::StringConcatNode)
178189

@@ -181,6 +192,7 @@ def on_string_concat(node)
181192

182193
sig { params(node: YARP::DefNode).void }
183194
def on_def(node)
195+
emit_requires_range
184196
params = node.parameters
185197
parameter_loc = params&.location
186198
location = node.location
@@ -203,6 +215,7 @@ def on_call(node)
203215
return
204216
end
205217

218+
emit_requires_range
206219
location = node.location
207220
add_lines_range(location.start_line, location.end_line - 1)
208221
end

test/expectations/folding_ranges/command_requires.exp.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"startLine": 0,
55
"endLine": 3,
66
"kind": "imports"
7+
},
8+
{
9+
"startLine": 7,
10+
"endLine": 8,
11+
"kind": "imports"
712
}
813
]
914
}

test/fixtures/command_requires.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@
22
require_relative "bar"
33

44
require "baz"
5+
6+
A.some_other_random_node
7+
8+
require "qux"
9+
require_relative "quux"

0 commit comments

Comments
 (0)