steep 0.14.0 → 0.15.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (190) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +5 -0
  3. data/exe/rbs +1 -1
  4. data/lib/steep/annotation_parser.rb +4 -4
  5. data/lib/steep/ast/buffer.rb +11 -7
  6. data/lib/steep/ast/builtin.rb +8 -0
  7. data/lib/steep/ast/types/factory.rb +55 -55
  8. data/lib/steep/drivers/check.rb +20 -4
  9. data/lib/steep/drivers/langserver.rb +6 -1
  10. data/lib/steep/drivers/vendor.rb +2 -2
  11. data/lib/steep/project/completion_provider.rb +5 -11
  12. data/lib/steep/project/dsl.rb +14 -0
  13. data/lib/steep/project/file.rb +42 -46
  14. data/lib/steep/project/hover_content.rb +11 -5
  15. data/lib/steep/project/options.rb +25 -3
  16. data/lib/steep/project/target.rb +10 -4
  17. data/lib/steep/signature/errors.rb +1 -1
  18. data/lib/steep/signature/validator.rb +8 -8
  19. data/lib/steep/source.rb +1 -1
  20. data/lib/steep/type_construction.rb +987 -711
  21. data/lib/steep/type_inference/constant_env.rb +1 -1
  22. data/lib/steep/type_inference/context.rb +7 -3
  23. data/lib/steep/type_inference/context_array.rb +111 -0
  24. data/lib/steep/type_inference/local_variable_type_env.rb +226 -0
  25. data/lib/steep/type_inference/logic.rb +130 -0
  26. data/lib/steep/type_inference/type_env.rb +5 -69
  27. data/lib/steep/typing.rb +79 -22
  28. data/lib/steep/version.rb +1 -1
  29. data/lib/steep.rb +6 -1
  30. data/smoke/alias/Steepfile +1 -0
  31. data/smoke/and/Steepfile +1 -0
  32. data/smoke/array/Steepfile +1 -0
  33. data/smoke/array/b.rb +0 -2
  34. data/smoke/block/Steepfile +1 -0
  35. data/smoke/case/Steepfile +1 -0
  36. data/smoke/class/Steepfile +1 -0
  37. data/smoke/const/Steepfile +1 -0
  38. data/smoke/dstr/Steepfile +1 -0
  39. data/smoke/ensure/Steepfile +1 -0
  40. data/smoke/enumerator/Steepfile +1 -0
  41. data/smoke/extension/Steepfile +1 -0
  42. data/smoke/extension/c.rb +1 -0
  43. data/smoke/hash/Steepfile +1 -0
  44. data/smoke/hello/Steepfile +1 -0
  45. data/smoke/if/Steepfile +1 -0
  46. data/smoke/if/a.rb +1 -1
  47. data/smoke/implements/Steepfile +1 -0
  48. data/smoke/initialize/Steepfile +1 -0
  49. data/smoke/integer/Steepfile +1 -0
  50. data/smoke/interface/Steepfile +1 -0
  51. data/smoke/kwbegin/Steepfile +1 -0
  52. data/smoke/lambda/Steepfile +1 -0
  53. data/smoke/literal/Steepfile +1 -0
  54. data/smoke/map/Steepfile +1 -0
  55. data/smoke/method/Steepfile +1 -0
  56. data/smoke/module/Steepfile +1 -0
  57. data/smoke/regexp/Steepfile +1 -0
  58. data/smoke/regression/Steepfile +1 -0
  59. data/smoke/rescue/Steepfile +1 -0
  60. data/smoke/rescue/a.rb +1 -1
  61. data/smoke/self/Steepfile +1 -0
  62. data/smoke/skip/Steepfile +1 -0
  63. data/smoke/stdout/Steepfile +1 -0
  64. data/smoke/super/Steepfile +1 -0
  65. data/smoke/type_case/Steepfile +1 -0
  66. data/smoke/yield/Steepfile +1 -0
  67. data/steep.gemspec +1 -1
  68. data/vendor/ruby-signature/.gitignore +2 -2
  69. data/vendor/ruby-signature/README.md +2 -2
  70. data/vendor/ruby-signature/Rakefile +2 -2
  71. data/vendor/ruby-signature/bin/annotate-with-rdoc +14 -13
  72. data/vendor/ruby-signature/bin/console +1 -1
  73. data/vendor/ruby-signature/bin/sort +7 -6
  74. data/vendor/ruby-signature/bin/test_runner.rb +0 -1
  75. data/vendor/ruby-signature/docs/CONTRIBUTING.md +1 -1
  76. data/vendor/ruby-signature/docs/sigs.md +3 -3
  77. data/vendor/ruby-signature/docs/stdlib.md +1 -1
  78. data/vendor/ruby-signature/docs/syntax.md +9 -9
  79. data/vendor/ruby-signature/exe/rbs +5 -1
  80. data/vendor/ruby-signature/lib/rbs/ast/annotation.rb +27 -0
  81. data/vendor/ruby-signature/lib/rbs/ast/comment.rb +27 -0
  82. data/vendor/ruby-signature/lib/rbs/ast/declarations.rb +395 -0
  83. data/vendor/ruby-signature/lib/rbs/ast/members.rb +362 -0
  84. data/vendor/ruby-signature/lib/rbs/buffer.rb +50 -0
  85. data/vendor/ruby-signature/lib/rbs/builtin_names.rb +55 -0
  86. data/vendor/ruby-signature/lib/rbs/cli.rb +558 -0
  87. data/vendor/ruby-signature/lib/rbs/constant.rb +26 -0
  88. data/vendor/ruby-signature/lib/rbs/constant_table.rb +150 -0
  89. data/vendor/ruby-signature/lib/rbs/definition.rb +170 -0
  90. data/vendor/ruby-signature/lib/rbs/definition_builder.rb +919 -0
  91. data/vendor/ruby-signature/lib/rbs/environment.rb +281 -0
  92. data/vendor/ruby-signature/lib/rbs/environment_loader.rb +136 -0
  93. data/vendor/ruby-signature/lib/rbs/environment_walker.rb +124 -0
  94. data/vendor/ruby-signature/lib/rbs/errors.rb +187 -0
  95. data/vendor/ruby-signature/lib/rbs/location.rb +102 -0
  96. data/vendor/ruby-signature/lib/rbs/method_type.rb +123 -0
  97. data/vendor/ruby-signature/lib/rbs/namespace.rb +91 -0
  98. data/vendor/ruby-signature/lib/{ruby/signature → rbs}/parser.rb +21 -23
  99. data/vendor/ruby-signature/lib/{ruby/signature → rbs}/parser.y +18 -18
  100. data/vendor/ruby-signature/lib/rbs/prototype/rb.rb +553 -0
  101. data/vendor/ruby-signature/lib/rbs/prototype/rbi.rb +587 -0
  102. data/vendor/ruby-signature/lib/rbs/prototype/runtime.rb +381 -0
  103. data/vendor/ruby-signature/lib/rbs/substitution.rb +46 -0
  104. data/vendor/ruby-signature/lib/rbs/test/errors.rb +61 -0
  105. data/vendor/ruby-signature/lib/rbs/test/hook.rb +294 -0
  106. data/vendor/ruby-signature/lib/{ruby/signature → rbs}/test/setup.rb +7 -7
  107. data/vendor/ruby-signature/lib/rbs/test/spy.rb +325 -0
  108. data/vendor/ruby-signature/lib/rbs/test/test_helper.rb +183 -0
  109. data/vendor/ruby-signature/lib/rbs/test/type_check.rb +254 -0
  110. data/vendor/ruby-signature/lib/rbs/test.rb +26 -0
  111. data/vendor/ruby-signature/lib/rbs/type_name.rb +70 -0
  112. data/vendor/ruby-signature/lib/rbs/types.rb +936 -0
  113. data/vendor/ruby-signature/lib/rbs/variance_calculator.rb +138 -0
  114. data/vendor/ruby-signature/lib/rbs/vendorer.rb +47 -0
  115. data/vendor/ruby-signature/lib/rbs/version.rb +3 -0
  116. data/vendor/ruby-signature/lib/rbs/writer.rb +269 -0
  117. data/vendor/ruby-signature/lib/rbs.rb +64 -0
  118. data/vendor/ruby-signature/lib/ruby/signature.rb +4 -61
  119. data/vendor/ruby-signature/{ruby-signature.gemspec → rbs.gemspec} +4 -4
  120. data/vendor/ruby-signature/stdlib/abbrev/abbrev.rbs +58 -1
  121. data/vendor/ruby-signature/stdlib/base64/base64.rbs +69 -13
  122. data/vendor/ruby-signature/stdlib/benchmark/benchmark.rbs +372 -0
  123. data/vendor/ruby-signature/stdlib/builtin/builtin.rbs +9 -0
  124. data/vendor/ruby-signature/stdlib/builtin/dir.rbs +1 -7
  125. data/vendor/ruby-signature/stdlib/builtin/encoding.rbs +2 -1
  126. data/vendor/ruby-signature/stdlib/builtin/exception.rbs +3 -2
  127. data/vendor/ruby-signature/stdlib/builtin/file.rbs +902 -302
  128. data/vendor/ruby-signature/stdlib/builtin/gc.rbs +190 -68
  129. data/vendor/ruby-signature/stdlib/builtin/integer.rbs +3 -6
  130. data/vendor/ruby-signature/stdlib/builtin/kernel.rbs +6 -4
  131. data/vendor/ruby-signature/stdlib/builtin/marshal.rbs +146 -120
  132. data/vendor/ruby-signature/stdlib/builtin/math.rbs +310 -7
  133. data/vendor/ruby-signature/stdlib/builtin/method.rbs +11 -8
  134. data/vendor/ruby-signature/stdlib/builtin/module.rbs +959 -103
  135. data/vendor/ruby-signature/stdlib/builtin/proc.rbs +3 -0
  136. data/vendor/ruby-signature/stdlib/builtin/process.rbs +981 -108
  137. data/vendor/ruby-signature/stdlib/builtin/random.rbs +215 -41
  138. data/vendor/ruby-signature/stdlib/builtin/rb_config.rbs +47 -0
  139. data/vendor/ruby-signature/stdlib/builtin/string.rbs +9 -2
  140. data/vendor/ruby-signature/stdlib/builtin/string_io.rbs +282 -11
  141. data/vendor/ruby-signature/stdlib/builtin/symbol.rbs +11 -13
  142. data/vendor/ruby-signature/stdlib/builtin/thread.rbs +25 -29
  143. data/vendor/ruby-signature/stdlib/builtin/thread_group.rbs +1 -1
  144. data/vendor/ruby-signature/stdlib/builtin/time.rbs +875 -567
  145. data/vendor/ruby-signature/stdlib/builtin/trace_point.rbs +243 -44
  146. data/vendor/ruby-signature/stdlib/builtin/unbound_method.rbs +103 -109
  147. data/vendor/ruby-signature/stdlib/coverage/coverage.rbs +62 -0
  148. data/vendor/ruby-signature/stdlib/csv/csv.rbs +773 -0
  149. data/vendor/ruby-signature/stdlib/erb/erb.rbs +375 -1
  150. data/vendor/ruby-signature/stdlib/find/find.rbs +0 -4
  151. data/vendor/ruby-signature/stdlib/ipaddr/ipaddr.rbs +247 -0
  152. data/vendor/ruby-signature/stdlib/pathname/pathname.rbs +1088 -16
  153. data/vendor/ruby-signature/stdlib/set/set.rbs +251 -27
  154. metadata +49 -44
  155. data/exe/ruby-signature +0 -3
  156. data/vendor/ruby-signature/exe/ruby-signature +0 -7
  157. data/vendor/ruby-signature/lib/ruby/signature/ast/annotation.rb +0 -29
  158. data/vendor/ruby-signature/lib/ruby/signature/ast/comment.rb +0 -29
  159. data/vendor/ruby-signature/lib/ruby/signature/ast/declarations.rb +0 -391
  160. data/vendor/ruby-signature/lib/ruby/signature/ast/members.rb +0 -364
  161. data/vendor/ruby-signature/lib/ruby/signature/buffer.rb +0 -52
  162. data/vendor/ruby-signature/lib/ruby/signature/builtin_names.rb +0 -54
  163. data/vendor/ruby-signature/lib/ruby/signature/cli.rb +0 -555
  164. data/vendor/ruby-signature/lib/ruby/signature/constant.rb +0 -28
  165. data/vendor/ruby-signature/lib/ruby/signature/constant_table.rb +0 -152
  166. data/vendor/ruby-signature/lib/ruby/signature/definition.rb +0 -172
  167. data/vendor/ruby-signature/lib/ruby/signature/definition_builder.rb +0 -921
  168. data/vendor/ruby-signature/lib/ruby/signature/environment.rb +0 -283
  169. data/vendor/ruby-signature/lib/ruby/signature/environment_loader.rb +0 -138
  170. data/vendor/ruby-signature/lib/ruby/signature/environment_walker.rb +0 -126
  171. data/vendor/ruby-signature/lib/ruby/signature/errors.rb +0 -189
  172. data/vendor/ruby-signature/lib/ruby/signature/location.rb +0 -104
  173. data/vendor/ruby-signature/lib/ruby/signature/method_type.rb +0 -125
  174. data/vendor/ruby-signature/lib/ruby/signature/namespace.rb +0 -93
  175. data/vendor/ruby-signature/lib/ruby/signature/prototype/rb.rb +0 -444
  176. data/vendor/ruby-signature/lib/ruby/signature/prototype/rbi.rb +0 -579
  177. data/vendor/ruby-signature/lib/ruby/signature/prototype/runtime.rb +0 -383
  178. data/vendor/ruby-signature/lib/ruby/signature/substitution.rb +0 -48
  179. data/vendor/ruby-signature/lib/ruby/signature/test/errors.rb +0 -63
  180. data/vendor/ruby-signature/lib/ruby/signature/test/hook.rb +0 -290
  181. data/vendor/ruby-signature/lib/ruby/signature/test/spy.rb +0 -327
  182. data/vendor/ruby-signature/lib/ruby/signature/test/test_helper.rb +0 -185
  183. data/vendor/ruby-signature/lib/ruby/signature/test/type_check.rb +0 -256
  184. data/vendor/ruby-signature/lib/ruby/signature/test.rb +0 -28
  185. data/vendor/ruby-signature/lib/ruby/signature/type_name.rb +0 -72
  186. data/vendor/ruby-signature/lib/ruby/signature/types.rb +0 -932
  187. data/vendor/ruby-signature/lib/ruby/signature/variance_calculator.rb +0 -140
  188. data/vendor/ruby-signature/lib/ruby/signature/vendorer.rb +0 -49
  189. data/vendor/ruby-signature/lib/ruby/signature/version.rb +0 -5
  190. data/vendor/ruby-signature/lib/ruby/signature/writer.rb +0 -271
@@ -0,0 +1,138 @@
1
+ module RBS
2
+ class VarianceCalculator
3
+ class Result
4
+ attr_reader :result
5
+
6
+ def initialize(variables:)
7
+ @result = {}
8
+ variables.each do |x|
9
+ result[x] = :unused
10
+ end
11
+ end
12
+
13
+ def covariant(x)
14
+ case result[x]
15
+ when :unused
16
+ result[x] = :covariant
17
+ when :contravariant
18
+ result[x] = :invariant
19
+ end
20
+ end
21
+
22
+ def contravariant(x)
23
+ case result[x]
24
+ when :unused
25
+ result[x] = :contravariant
26
+ when :covariant
27
+ result[x] = :invariant
28
+ end
29
+ end
30
+
31
+ def invariant(x)
32
+ result[x] = :invariant
33
+ end
34
+
35
+ def each(&block)
36
+ result.each(&block)
37
+ end
38
+
39
+ def include?(name)
40
+ result.key?(name)
41
+ end
42
+
43
+ def compatible?(var, with_annotation:)
44
+ variance = result[var]
45
+
46
+ case
47
+ when variance == :unused
48
+ true
49
+ when with_annotation == :invariant
50
+ true
51
+ when variance == with_annotation
52
+ true
53
+ else
54
+ false
55
+ end
56
+ end
57
+ end
58
+
59
+ attr_reader :builder
60
+
61
+ def initialize(builder:)
62
+ @builder = builder
63
+ end
64
+
65
+ def env
66
+ builder.env
67
+ end
68
+
69
+ def in_method_type(method_type:, variables:)
70
+ result = Result.new(variables: variables)
71
+
72
+ method_type.type.each_param do |param|
73
+ type(param.type, result: result, context: :contravariant)
74
+ end
75
+
76
+ if method_type.block
77
+ method_type.block.type.each_param do |param|
78
+ type(param.type, result: result, context: :covariant)
79
+ end
80
+ type(method_type.block.type.return_type, result: result, context: :contravariant)
81
+ end
82
+
83
+ type(method_type.type.return_type, result: result, context: :covariant)
84
+
85
+ result
86
+ end
87
+
88
+ def in_inherit(name:, args:, variables:)
89
+ type = Types::ClassInstance.new(name: name, args: args, location: nil)
90
+
91
+ Result.new(variables: variables).tap do |result|
92
+ type(type, result: result, context: :covariant)
93
+ end
94
+ end
95
+
96
+ def type(type, result:, context:)
97
+ case type
98
+ when Types::Variable
99
+ if result.include?(type.name)
100
+ case context
101
+ when :covariant
102
+ result.covariant(type.name)
103
+ when :contravariant
104
+ result.contravariant(type.name)
105
+ when :invariant
106
+ result.invariant(type.name)
107
+ end
108
+ end
109
+ when Types::ClassInstance, Types::Interface
110
+ decl = env.find_class(type.name)
111
+ type.args.each.with_index do |ty, i|
112
+ var = decl.type_params.params[i]
113
+ case var.variance
114
+ when :invariant
115
+ type(ty, result: result, context: :invariant)
116
+ when :covariant
117
+ type(ty, result: result, context: context)
118
+ when :contravariant
119
+ con = case context
120
+ when :invariant
121
+ :invariant
122
+ when :covariant
123
+ :contravariant
124
+ when :contravariant
125
+ :covariant
126
+ end
127
+ type(ty, result: result, context: con)
128
+ end
129
+ end
130
+ when Types::Tuple, Types::Record, Types::Union, Types::Intersection
131
+ # Covariant types
132
+ type.each_type do |ty|
133
+ type(ty, result: result, context: context)
134
+ end
135
+ end
136
+ end
137
+ end
138
+ end
@@ -0,0 +1,47 @@
1
+ module RBS
2
+ class Vendorer
3
+ attr_reader :vendor_dir
4
+
5
+ def initialize(vendor_dir:)
6
+ @vendor_dir = vendor_dir
7
+ end
8
+
9
+ def ensure_dir
10
+ unless vendor_dir.directory?
11
+ vendor_dir.mkpath
12
+ end
13
+
14
+ yield
15
+ end
16
+
17
+ def clean!
18
+ ensure_dir do
19
+ RBS.logger.info "Cleaning vendor root: #{vendor_dir}..."
20
+ vendor_dir.rmtree
21
+ end
22
+ end
23
+
24
+ def stdlib!()
25
+ ensure_dir do
26
+ RBS.logger.info "Vendoring stdlib: #{EnvironmentLoader::STDLIB_ROOT} => #{vendor_dir + "stdlib"}..."
27
+ FileUtils.copy_entry EnvironmentLoader::STDLIB_ROOT, vendor_dir + "stdlib"
28
+ end
29
+ end
30
+
31
+ def gem!(name, version)
32
+ ensure_dir do
33
+ sig_path = EnvironmentLoader.gem_sig_path(name, version)
34
+ RBS.logger.debug "Checking gem signature path: name=#{name}, version=#{version}, path=#{sig_path}"
35
+
36
+ if sig_path&.directory?
37
+ gems_dir = vendor_dir + "gems"
38
+ gems_dir.mkpath unless gems_dir.directory?
39
+
40
+ gem_dir = gems_dir + name
41
+ RBS.logger.info "Vendoring gem(#{name}:#{version}): #{sig_path} => #{gem_dir}..."
42
+ FileUtils.copy_entry sig_path, gem_dir
43
+ end
44
+ end
45
+ end
46
+ end
47
+ end
@@ -0,0 +1,3 @@
1
+ module RBS
2
+ VERSION = "0.1.0"
3
+ end
@@ -0,0 +1,269 @@
1
+ module RBS
2
+ class Writer
3
+ attr_reader :out
4
+
5
+ def initialize(out:)
6
+ @out = out
7
+ end
8
+
9
+ def write_annotation(annotations, level:)
10
+ prefix = " " * level
11
+
12
+ annotations.each do |annotation|
13
+ string = annotation.string
14
+ case
15
+ when string !~ /\}/
16
+ out.puts "#{prefix}%a{#{string}}"
17
+ when string !~ /\)/
18
+ out.puts "#{prefix}%a(#{string})"
19
+ when string !~ /\]/
20
+ out.puts "#{prefix}%a[#{string}]"
21
+ when string !~ /\>/
22
+ out.puts "#{prefix}%a<#{string}>"
23
+ when string !~ /\|/
24
+ out.puts "#{prefix}%a|#{string}|"
25
+ end
26
+ end
27
+ end
28
+
29
+ def write_comment(comment, level:)
30
+ if comment
31
+ prefix = " " * level
32
+ comment.string.lines.each do |line|
33
+ line = " #{line}" unless line.chomp.empty?
34
+ out.puts "#{prefix}##{line}"
35
+ end
36
+ end
37
+ end
38
+
39
+ def write(decls)
40
+ [nil, *decls].each_cons(2) do |prev, decl|
41
+ preserve_empty_line(prev, decl)
42
+ write_decl decl
43
+ end
44
+ end
45
+
46
+ def write_decl(decl)
47
+ case decl
48
+ when AST::Declarations::Class
49
+ super_class = if decl.super_class
50
+ " < #{name_and_args(decl.super_class.name, decl.super_class.args)}"
51
+ end
52
+ write_comment decl.comment, level: 0
53
+ write_annotation decl.annotations, level: 0
54
+ out.puts "class #{name_and_params(decl.name, decl.type_params)}#{super_class}"
55
+
56
+ [nil, *decl.members].each_cons(2) do |prev, member|
57
+ preserve_empty_line prev, member
58
+ write_member member
59
+ end
60
+
61
+ out.puts "end"
62
+
63
+ when AST::Declarations::Module
64
+ self_type = if decl.self_type
65
+ " : #{decl.self_type}"
66
+ end
67
+
68
+ write_comment decl.comment, level: 0
69
+ write_annotation decl.annotations, level: 0
70
+ out.puts "module #{name_and_params(decl.name, decl.type_params)}#{self_type}"
71
+ decl.members.each.with_index do |member, index|
72
+ if index > 0
73
+ out.puts
74
+ end
75
+ write_member member
76
+ end
77
+ out.puts "end"
78
+ when AST::Declarations::Constant
79
+ write_comment decl.comment, level: 0
80
+ out.puts "#{decl.name}: #{decl.type}"
81
+
82
+ when AST::Declarations::Global
83
+ write_comment decl.comment, level: 0
84
+ out.puts "#{decl.name}: #{decl.type}"
85
+
86
+ when AST::Declarations::Alias
87
+ write_comment decl.comment, level: 0
88
+ write_annotation decl.annotations, level: 0
89
+ out.puts "type #{decl.name} = #{decl.type}"
90
+
91
+ when AST::Declarations::Interface
92
+ write_comment decl.comment, level: 0
93
+ write_annotation decl.annotations, level: 0
94
+ out.puts "interface #{name_and_params(decl.name, decl.type_params)}"
95
+ decl.members.each.with_index do |member, index|
96
+ if index > 0
97
+ out.puts
98
+ end
99
+ write_member member
100
+ end
101
+ out.puts "end"
102
+
103
+ when AST::Declarations::Extension
104
+ write_comment decl.comment, level: 0
105
+ write_annotation decl.annotations, level: 0
106
+ out.puts "extension #{name_and_args(decl.name, decl.type_params)} (#{decl.extension_name})"
107
+ decl.members.each.with_index do |member, index|
108
+ if index > 0
109
+ out.puts
110
+ end
111
+ write_member member
112
+ end
113
+ out.puts "end"
114
+ end
115
+ end
116
+
117
+ def name_and_params(name, params)
118
+ if params.empty?
119
+ "#{name}"
120
+ else
121
+ ps = params.each.map do |param|
122
+ s = ""
123
+ if param.skip_validation
124
+ s << "unchecked "
125
+ end
126
+ case param.variance
127
+ when :invariant
128
+ # nop
129
+ when :covariant
130
+ s << "out "
131
+ when :contravariant
132
+ s << "in "
133
+ end
134
+ s + param.name.to_s
135
+ end
136
+
137
+ "#{name}[#{ps.join(", ")}]"
138
+ end
139
+ end
140
+
141
+ def name_and_args(name, args)
142
+ if name && args
143
+ if args.empty?
144
+ "#{name}"
145
+ else
146
+ "#{name}[#{args.join(", ")}]"
147
+ end
148
+ end
149
+ end
150
+
151
+ def write_member(member)
152
+ case member
153
+ when AST::Members::Include
154
+ write_comment member.comment, level: 2
155
+ write_annotation member.annotations, level: 2
156
+ out.puts " include #{name_and_args(member.name, member.args)}"
157
+ when AST::Members::Extend
158
+ write_comment member.comment, level: 2
159
+ write_annotation member.annotations, level: 2
160
+ out.puts " extend #{name_and_args(member.name, member.args)}"
161
+ when AST::Members::Prepend
162
+ write_comment member.comment, level: 2
163
+ write_annotation member.annotations, level: 2
164
+ out.puts " prepend #{name_and_args(member.name, member.args)}"
165
+ when AST::Members::AttrAccessor
166
+ write_comment member.comment, level: 2
167
+ write_annotation member.annotations, level: 2
168
+ out.puts " #{attribute(:accessor, member)}"
169
+ when AST::Members::AttrReader
170
+ write_comment member.comment, level: 2
171
+ write_annotation member.annotations, level: 2
172
+ out.puts " #{attribute(:reader, member)}"
173
+ when AST::Members::AttrWriter
174
+ write_comment member.comment, level: 2
175
+ write_annotation member.annotations, level: 2
176
+ out.puts " #{attribute(:writer, member)}"
177
+ when AST::Members::Public
178
+ out.puts " public"
179
+ when AST::Members::Private
180
+ out.puts " private"
181
+ when AST::Members::Alias
182
+ write_comment member.comment, level: 2
183
+ write_annotation member.annotations, level: 2
184
+ new_name = member.singleton? ? "self.#{member.new_name}" : member.new_name
185
+ old_name = member.singleton? ? "self.#{member.old_name}" : member.old_name
186
+ out.puts " alias #{new_name} #{old_name}"
187
+ when AST::Members::InstanceVariable
188
+ write_comment member.comment, level: 2
189
+ out.puts " #{member.name}: #{member.type}"
190
+ when AST::Members::ClassInstanceVariable
191
+ write_comment member.comment, level: 2
192
+ out.puts " self.#{member.name}: #{member.type}"
193
+ when AST::Members::ClassVariable
194
+ write_comment member.comment, level: 2
195
+ out.puts " #{member.name}: #{member.type}"
196
+ when AST::Members::MethodDefinition
197
+ write_comment member.comment, level: 2
198
+ write_annotation member.annotations, level: 2
199
+ write_def member
200
+ end
201
+ end
202
+
203
+ def method_name(name)
204
+ s = name.to_s
205
+
206
+ if /\A#{Parser::KEYWORDS_RE}\z/.match?(s)
207
+ "`#{s}`"
208
+ else
209
+ s
210
+ end
211
+ end
212
+
213
+ def write_def(member)
214
+ name = case member.kind
215
+ when :instance
216
+ "#{method_name(member.name)}"
217
+ when :singleton_instance
218
+ "self?.#{method_name(member.name)}"
219
+ when :singleton
220
+ "self.#{method_name(member.name)}"
221
+ end
222
+
223
+ attrs = member.attributes.empty? ? "" : member.attributes.join(" ") + " "
224
+ prefix = " #{attrs}def #{name}:"
225
+ padding = " " * (prefix.size-1)
226
+
227
+ out.print prefix
228
+
229
+ member.types.each.with_index do |type, index|
230
+ if index > 0
231
+ out.print padding
232
+ out.print "|"
233
+ end
234
+ out.puts " #{type}"
235
+ end
236
+ end
237
+
238
+ def attribute(kind, attr)
239
+ var = case attr.ivar_name
240
+ when nil
241
+ ""
242
+ when false
243
+ "()"
244
+ else
245
+ "(#{attr.ivar_name})"
246
+ end
247
+ "attr_#{kind} #{attr.name}#{var}: #{attr.type}"
248
+ end
249
+
250
+ def preserve_empty_line(prev, decl)
251
+ return unless prev
252
+
253
+ decl = decl.comment if decl.respond_to?(:comment) && decl.comment
254
+
255
+ # When the signature is not constructed by the parser,
256
+ # it always inserts an empty line.
257
+ if !prev.location || !decl.location
258
+ out.puts
259
+ return
260
+ end
261
+
262
+ prev_end_line = prev.location.end_line
263
+ start_line = decl.location.start_line
264
+ if start_line - prev_end_line > 1
265
+ out.puts
266
+ end
267
+ end
268
+ end
269
+ end
@@ -0,0 +1,64 @@
1
+ require "rbs/version"
2
+
3
+ require "set"
4
+ require "json"
5
+ require "pathname"
6
+ require "pp"
7
+ require "ripper"
8
+ require "logger"
9
+ require "tsort"
10
+
11
+ require "rbs/errors"
12
+ require "rbs/buffer"
13
+ require "rbs/location"
14
+ require "rbs/namespace"
15
+ require "rbs/type_name"
16
+ require "rbs/types"
17
+ require "rbs/method_type"
18
+ require "rbs/ast/declarations"
19
+ require "rbs/ast/members"
20
+ require "rbs/ast/annotation"
21
+ require "rbs/environment"
22
+ require "rbs/environment_loader"
23
+ require "rbs/builtin_names"
24
+ require "rbs/definition"
25
+ require "rbs/definition_builder"
26
+ require "rbs/variance_calculator"
27
+ require "rbs/substitution"
28
+ require "rbs/constant"
29
+ require "rbs/constant_table"
30
+ require "rbs/ast/comment"
31
+ require "rbs/writer"
32
+ require "rbs/prototype/rbi"
33
+ require "rbs/prototype/rb"
34
+ require "rbs/prototype/runtime"
35
+ require "rbs/environment_walker"
36
+ require "rbs/vendorer"
37
+
38
+ begin
39
+ require "rbs/parser"
40
+ rescue LoadError
41
+ STDERR.puts "Missing parser Ruby code? Running `rake parser` may solve the issue"
42
+ raise
43
+ end
44
+
45
+ module RBS
46
+ class <<self
47
+ attr_reader :logger_level
48
+ attr_reader :logger_output
49
+
50
+ def logger
51
+ @logger ||= Logger.new(logger_output || STDERR, level: logger_level || "warn", progname: "rbs")
52
+ end
53
+
54
+ def logger_output=(val)
55
+ @logger_output = val
56
+ @logger = nil
57
+ end
58
+
59
+ def logger_level=(level)
60
+ @logger_level = level
61
+ @logger = nil
62
+ end
63
+ end
64
+ end
@@ -1,64 +1,7 @@
1
- require "ruby/signature/version"
1
+ STDERR.puts "🚨🚨 ruby-signature is renamed to rbs. require 'rbs' instead of 'ruby/signature'. 🚨🚨"
2
2
 
3
- require "set"
4
- require "json"
5
- require "pathname"
6
- require "pp"
7
- require "ripper"
8
- require "logger"
9
- require "tsort"
3
+ require "rbs"
10
4
 
11
- require "ruby/signature/errors"
12
- require "ruby/signature/buffer"
13
- require "ruby/signature/location"
14
- require "ruby/signature/namespace"
15
- require "ruby/signature/type_name"
16
- require "ruby/signature/types"
17
- require "ruby/signature/method_type"
18
- require "ruby/signature/ast/declarations"
19
- require "ruby/signature/ast/members"
20
- require "ruby/signature/ast/annotation"
21
- require "ruby/signature/environment"
22
- require "ruby/signature/environment_loader"
23
- require "ruby/signature/builtin_names"
24
- require "ruby/signature/definition"
25
- require "ruby/signature/definition_builder"
26
- require "ruby/signature/variance_calculator"
27
- require "ruby/signature/substitution"
28
- require "ruby/signature/constant"
29
- require "ruby/signature/constant_table"
30
- require "ruby/signature/ast/comment"
31
- require "ruby/signature/writer"
32
- require "ruby/signature/prototype/rbi"
33
- require "ruby/signature/prototype/rb"
34
- require "ruby/signature/prototype/runtime"
35
- require "ruby/signature/environment_walker"
36
- require "ruby/signature/vendorer"
37
-
38
- begin
39
- require "ruby/signature/parser"
40
- rescue LoadError
41
- STDERR.puts "Missing parser Ruby code? Running `rake parser` may solve the issue"
42
- raise
43
- end
44
-
45
- module Ruby::Signature
46
- class <<self
47
- attr_reader :logger_level
48
- attr_reader :logger_output
49
-
50
- def logger
51
- @logger ||= Logger.new(logger_output || STDERR, level: logger_level || "warn", progname: "ruby-signature")
52
- end
53
-
54
- def logger_output=(val)
55
- @logger_output = val
56
- @logger = nil
57
- end
58
-
59
- def logger_level=(level)
60
- @logger_level = level
61
- @logger = nil
62
- end
63
- end
5
+ module Ruby
6
+ Signature = RBS
64
7
  end
@@ -1,11 +1,11 @@
1
1
 
2
2
  lib = File.expand_path("../lib", __FILE__)
3
3
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
- require "ruby/signature/version"
4
+ require "rbs/version"
5
5
 
6
6
  Gem::Specification.new do |spec|
7
- spec.name = "ruby-signature"
8
- spec.version = Ruby::Signature::VERSION
7
+ spec.name = "rbs"
8
+ spec.version = RBS::VERSION
9
9
  spec.authors = ["Soutaro Matsumoto"]
10
10
  spec.email = ["matsumoto@soutaro.com"]
11
11
 
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
30
30
  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
31
31
  `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
32
32
  end
33
- spec.files << "lib/ruby/signature/parser.rb"
33
+ spec.files << "lib/rbs/parser.rb"
34
34
  spec.bindir = "exe"
35
35
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
36
36
  spec.require_paths = ["lib"]
@@ -1,3 +1,60 @@
1
+ # Calculates the set of unambiguous abbreviations for a given set of strings.
2
+ #
3
+ # require 'abbrev'
4
+ # require 'pp'
5
+ #
6
+ # pp Abbrev.abbrev(['ruby'])
7
+ # #=> {"ruby"=>"ruby", "rub"=>"ruby", "ru"=>"ruby", "r"=>"ruby"}
8
+ #
9
+ # pp Abbrev.abbrev(%w{ ruby rules })
10
+ #
11
+ # *Generates:*
12
+ # { "ruby" => "ruby",
13
+ # "rub" => "ruby",
14
+ # "rules" => "rules",
15
+ # "rule" => "rules",
16
+ # "rul" => "rules" }
17
+ #
18
+ # It also provides an array core extension, Array#abbrev.
19
+ #
20
+ # pp %w{ summer winter }.abbrev
21
+ #
22
+ # *Generates:*
23
+ # { "summer" => "summer",
24
+ # "summe" => "summer",
25
+ # "summ" => "summer",
26
+ # "sum" => "summer",
27
+ # "su" => "summer",
28
+ # "s" => "summer",
29
+ # "winter" => "winter",
30
+ # "winte" => "winter",
31
+ # "wint" => "winter",
32
+ # "win" => "winter",
33
+ # "wi" => "winter",
34
+ # "w" => "winter" }
35
+ #
1
36
  module Abbrev
2
- def self?.abbrev: (Array[String], ?(String | Regexp | nil)) -> Hash[String, String]
37
+ # Given a set of strings, calculate the set of unambiguous abbreviations for
38
+ # those strings, and return a hash where the keys are all the possible
39
+ # abbreviations and the values are the full strings.
40
+ #
41
+ # Thus, given `words` is "car" and "cone", the keys pointing to "car" would be
42
+ # "ca" and "car", while those pointing to "cone" would be "co", "con", and
43
+ # "cone".
44
+ #
45
+ # require 'abbrev'
46
+ #
47
+ # Abbrev.abbrev(%w{ car cone })
48
+ # #=> {"ca"=>"car", "con"=>"cone", "co"=>"cone", "car"=>"car", "cone"=>"cone"}
49
+ #
50
+ # The optional `pattern` parameter is a pattern or a string. Only input strings
51
+ # that match the pattern or start with the string are included in the output
52
+ # hash.
53
+ #
54
+ # Abbrev.abbrev(%w{car box cone crab}, /b/)
55
+ # #=> {"box"=>"box", "bo"=>"box", "b"=>"box", "crab" => "crab"}
56
+ #
57
+ # Abbrev.abbrev(%w{car box cone}, 'ca')
58
+ # #=> {"car"=>"car", "ca"=>"car"}
59
+ def self?.abbrev: (Array[String], ?String | Regexp | nil) -> Hash[String, String]
3
60
  end