Skip to content

Commit c6c4015

Browse files
authored
Merge pull request #2691 from vpellan/to-json-accept-nil
Accept `nil` state parameter in `to_json` type signatures
2 parents 031f319 + 0b8ab62 commit c6c4015

23 files changed

+104
-69
lines changed

lib/rbs/ast/annotation.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def hash
2121
self.class.hash ^ string.hash
2222
end
2323

24-
def to_json(state = _ = nil)
24+
def to_json(state = nil)
2525
{ string: string, location: location }.to_json(state)
2626
end
2727
end

lib/rbs/ast/comment.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def hash
2121
self.class.hash ^ string.hash
2222
end
2323

24-
def to_json(state = _ = nil)
24+
def to_json(state = nil)
2525
{ string: string, location: location }.to_json(state)
2626
end
2727
end

lib/rbs/ast/declarations.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def hash
7474
self.class.hash ^ name.hash ^ args.hash
7575
end
7676

77-
def to_json(state = _ = nil)
77+
def to_json(state = nil)
7878
{
7979
name: name,
8080
args: args,
@@ -130,7 +130,7 @@ def hash
130130
self.class.hash ^ name.hash ^ type_params.hash ^ super_class.hash ^ members.hash
131131
end
132132

133-
def to_json(state = _ = nil)
133+
def to_json(state = nil)
134134
{
135135
declaration: :class,
136136
name: name,
@@ -166,7 +166,7 @@ def hash
166166
self.class.hash ^ name.hash ^ args.hash ^ location.hash
167167
end
168168

169-
def to_json(state = _ = nil)
169+
def to_json(state = nil)
170170
{
171171
name: name,
172172
args: args,
@@ -231,7 +231,7 @@ def hash
231231
self.class.hash ^ name.hash ^ type_params.hash ^ self_types.hash ^ members.hash
232232
end
233233

234-
def to_json(state = _ = nil)
234+
def to_json(state = nil)
235235
{
236236
declaration: :module,
237237
name: name,
@@ -288,7 +288,7 @@ def hash
288288
self.class.hash ^ type_params.hash ^ members.hash
289289
end
290290

291-
def to_json(state = _ = nil)
291+
def to_json(state = nil)
292292
{
293293
declaration: :interface,
294294
name: name,
@@ -331,7 +331,7 @@ def hash
331331
self.class.hash ^ name.hash ^ type_params.hash ^ type.hash
332332
end
333333

334-
def to_json(state = _ = nil)
334+
def to_json(state = nil)
335335
{
336336
declaration: :alias,
337337
name: name,
@@ -371,7 +371,7 @@ def hash
371371
self.class.hash ^ name.hash ^ type.hash
372372
end
373373

374-
def to_json(state = _ = nil)
374+
def to_json(state = nil)
375375
{
376376
declaration: :constant,
377377
name: name,
@@ -409,7 +409,7 @@ def hash
409409
self.class.hash ^ name.hash ^ type.hash
410410
end
411411

412-
def to_json(state = _ = nil)
412+
def to_json(state = nil)
413413
{
414414
declaration: :global,
415415
name: name,
@@ -445,7 +445,7 @@ def hash
445445
end
446446

447447
class ClassAlias < AliasDecl
448-
def to_json(state = _ = nil)
448+
def to_json(state = nil)
449449
{
450450
declaration: :class_alias,
451451
new_name: new_name,
@@ -457,7 +457,7 @@ def to_json(state = _ = nil)
457457
end
458458

459459
class ModuleAlias < AliasDecl
460-
def to_json(state = _ = nil)
460+
def to_json(state = nil)
461461
{
462462
declaration: :module_alias,
463463
new_name: new_name,

lib/rbs/ast/members.rb

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def sub(subst)
3535
update(method_type: self.method_type.sub(subst))
3636
end
3737

38-
def to_json(state = _ = nil)
38+
def to_json(state = nil)
3939
{
4040
annotations: annotations,
4141
method_type: method_type
@@ -103,7 +103,7 @@ def update(name: self.name, kind: self.kind, overloads: self.overloads, annotati
103103
)
104104
end
105105

106-
def to_json(state = _ = nil)
106+
def to_json(state = nil)
107107
{
108108
member: :method_definition,
109109
name: name,
@@ -145,7 +145,7 @@ def hash
145145
class InstanceVariable < Base
146146
include Var
147147

148-
def to_json(state = _ = nil)
148+
def to_json(state = nil)
149149
{
150150
member: :instance_variable,
151151
name: name,
@@ -159,7 +159,7 @@ def to_json(state = _ = nil)
159159
class ClassInstanceVariable < Base
160160
include Var
161161

162-
def to_json(state = _ = nil)
162+
def to_json(state = nil)
163163
{
164164
member: :class_instance_variable,
165165
name: name,
@@ -173,7 +173,7 @@ def to_json(state = _ = nil)
173173
class ClassVariable < Base
174174
include Var
175175

176-
def to_json(state = _ = nil)
176+
def to_json(state = nil)
177177
{
178178
member: :class_variable,
179179
name: name,
@@ -215,7 +215,7 @@ def hash
215215
class Include < Base
216216
include Mixin
217217

218-
def to_json(state = _ = nil)
218+
def to_json(state = nil)
219219
{
220220
member: :include,
221221
name: name,
@@ -230,7 +230,7 @@ def to_json(state = _ = nil)
230230
class Extend < Base
231231
include Mixin
232232

233-
def to_json(state = _ = nil)
233+
def to_json(state = nil)
234234
{
235235
member: :extend,
236236
name: name,
@@ -245,7 +245,7 @@ def to_json(state = _ = nil)
245245
class Prepend < Base
246246
include Mixin
247247

248-
def to_json(state = _ = nil)
248+
def to_json(state = nil)
249249
{
250250
member: :prepend,
251251
name: name,
@@ -311,7 +311,7 @@ def update(name: self.name, type: self.type, ivar_name: self.ivar_name, kind: se
311311
class AttrReader < Base
312312
include Attribute
313313

314-
def to_json(state = _ = nil)
314+
def to_json(state = nil)
315315
{
316316
member: :attr_reader,
317317
name: name,
@@ -329,7 +329,7 @@ def to_json(state = _ = nil)
329329
class AttrAccessor < Base
330330
include Attribute
331331

332-
def to_json(state = _ = nil)
332+
def to_json(state = nil)
333333
{
334334
member: :attr_accessor,
335335
name: name,
@@ -347,7 +347,7 @@ def to_json(state = _ = nil)
347347
class AttrWriter < Base
348348
include Attribute
349349

350-
def to_json(state = _ = nil)
350+
def to_json(state = nil)
351351
{
352352
member: :attr_writer,
353353
name: name,
@@ -383,15 +383,15 @@ def hash
383383
class Public < Base
384384
include LocationOnly
385385

386-
def to_json(state = _ = nil)
386+
def to_json(state = nil)
387387
{ member: :public, location: location }.to_json(state)
388388
end
389389
end
390390

391391
class Private < Base
392392
include LocationOnly
393393

394-
def to_json(state = _ = nil)
394+
def to_json(state = nil)
395395
{ member: :private, location: location }.to_json(state)
396396
end
397397
end
@@ -426,7 +426,7 @@ def hash
426426
new_name.hash ^ old_name.hash ^ kind.hash
427427
end
428428

429-
def to_json(state = _ = nil)
429+
def to_json(state = nil)
430430
{
431431
member: :alias,
432432
new_name: new_name,

lib/rbs/location_aux.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def ==(other)
8383
other.end_pos == end_pos
8484
end
8585

86-
def to_json(state = _ = nil)
86+
def to_json(state = nil)
8787
{
8888
start: {
8989
line: start_line,

lib/rbs/method_type.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def ==(other)
2121
other.block == block
2222
end
2323

24-
def to_json(state = _ = nil)
24+
def to_json(state = nil)
2525
{
2626
type_params: type_params,
2727
type: type,

lib/rbs/type_name.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def to_s
3636
"#{namespace.to_s}#{name}"
3737
end
3838

39-
def to_json(state = _ = nil)
39+
def to_json(state = nil)
4040
to_s.to_json(state)
4141
end
4242

0 commit comments

Comments
 (0)