steep 1.6.0.pre.4 → 1.7.0.dev.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (311) hide show
  1. checksums.yaml +4 -4
  2. data/.github/dependabot.yml +6 -0
  3. data/.github/workflows/ruby-windows.yml +2 -1
  4. data/.github/workflows/ruby.yml +9 -10
  5. data/.gitignore +0 -1
  6. data/CHANGELOG.md +4 -0
  7. data/Gemfile +1 -1
  8. data/Gemfile.lock +31 -29
  9. data/bin/output_test.rb +1 -0
  10. data/doc/narrowing.md +195 -0
  11. data/gemfile_steep/Gemfile.lock +30 -15
  12. data/guides/src/getting-started/getting-started.md +10 -11
  13. data/lib/steep/ast/ignore.rb +148 -0
  14. data/lib/steep/cli.rb +6 -1
  15. data/lib/steep/diagnostic/ruby.rb +16 -0
  16. data/lib/steep/drivers/utils/driver_helper.rb +22 -11
  17. data/lib/steep/node_helper.rb +12 -0
  18. data/lib/steep/project/dsl.rb +18 -21
  19. data/lib/steep/project/options.rb +39 -2
  20. data/lib/steep/project.rb +11 -7
  21. data/lib/steep/server/change_buffer.rb +2 -2
  22. data/lib/steep/server/interaction_worker.rb +61 -11
  23. data/lib/steep/server/worker_process.rb +3 -1
  24. data/lib/steep/services/completion_provider.rb +39 -8
  25. data/lib/steep/services/file_loader.rb +3 -2
  26. data/lib/steep/services/signature_help_provider.rb +9 -8
  27. data/lib/steep/services/type_check_service.rb +36 -8
  28. data/lib/steep/source/ignore_ranges.rb +69 -0
  29. data/lib/steep/source.rb +10 -4
  30. data/lib/steep/type_construction.rb +6 -147
  31. data/lib/steep/type_inference/case_when.rb +301 -0
  32. data/lib/steep/version.rb +1 -1
  33. data/lib/steep.rb +14 -1
  34. data/rbs_collection.steep.lock.yaml +8 -6
  35. data/sig/shims/parser.rbs +10 -0
  36. data/sig/shims/yaml.rbs +4 -0
  37. data/sig/steep/ast/ignore.rbs +66 -0
  38. data/sig/steep/diagnostic/ruby.rbs +8 -0
  39. data/sig/steep/node_helper.rbs +2 -0
  40. data/sig/steep/project/dsl.rbs +8 -4
  41. data/sig/steep/project/options.rbs +21 -1
  42. data/sig/steep/project.rbs +3 -3
  43. data/sig/steep/server/change_buffer.rbs +6 -4
  44. data/sig/steep/server/interaction_worker.rbs +10 -0
  45. data/sig/steep/server/worker_process.rbs +4 -4
  46. data/sig/steep/services/completion_provider.rbs +14 -1
  47. data/sig/steep/services/type_check_service.rbs +6 -1
  48. data/sig/steep/source/ignore_ranges.rbs +38 -0
  49. data/sig/steep/source.rbs +5 -2
  50. data/sig/steep/subtyping/check.rbs +2 -2
  51. data/sig/steep/type_construction.rbs +1 -26
  52. data/sig/steep/type_inference/branch.rbs +15 -0
  53. data/sig/steep/type_inference/case_when.rbs +130 -0
  54. data/sig/steep.rbs +9 -0
  55. data/steep.gemspec +1 -1
  56. metadata +14 -260
  57. data/smoke/alias/Steepfile +0 -6
  58. data/smoke/alias/a.rb +0 -16
  59. data/smoke/alias/a.rbs +0 -10
  60. data/smoke/alias/b.rb +0 -6
  61. data/smoke/alias/c.rb +0 -8
  62. data/smoke/alias/test_expectations.yml +0 -96
  63. data/smoke/and/Steepfile +0 -6
  64. data/smoke/and/a.rb +0 -8
  65. data/smoke/and/test_expectations.yml +0 -29
  66. data/smoke/array/Steepfile +0 -6
  67. data/smoke/array/a.rb +0 -18
  68. data/smoke/array/b.rb +0 -12
  69. data/smoke/array/c.rb +0 -6
  70. data/smoke/array/test_expectations.yml +0 -103
  71. data/smoke/block/Steepfile +0 -6
  72. data/smoke/block/a.rb +0 -10
  73. data/smoke/block/a.rbs +0 -6
  74. data/smoke/block/b.rb +0 -13
  75. data/smoke/block/c.rb +0 -9
  76. data/smoke/block/c.rbs +0 -3
  77. data/smoke/block/d.rb +0 -11
  78. data/smoke/block/e.rb +0 -12
  79. data/smoke/block/e.rbs +0 -4
  80. data/smoke/block/test_expectations.yml +0 -133
  81. data/smoke/case/Steepfile +0 -6
  82. data/smoke/case/a.rb +0 -18
  83. data/smoke/case/test_expectations.yml +0 -47
  84. data/smoke/class/Steepfile +0 -6
  85. data/smoke/class/a.rb +0 -25
  86. data/smoke/class/a.rbs +0 -23
  87. data/smoke/class/b.rb +0 -5
  88. data/smoke/class/c.rb +0 -9
  89. data/smoke/class/f.rb +0 -10
  90. data/smoke/class/g.rb +0 -6
  91. data/smoke/class/h.rb +0 -19
  92. data/smoke/class/h.rbs +0 -6
  93. data/smoke/class/i.rb +0 -14
  94. data/smoke/class/i.rbs +0 -9
  95. data/smoke/class/test_expectations.yml +0 -117
  96. data/smoke/compact/Steepfile +0 -6
  97. data/smoke/compact/a.rb +0 -2
  98. data/smoke/compact/a.rbs +0 -5
  99. data/smoke/compact/b.rb +0 -2
  100. data/smoke/compact/test_expectations.yml +0 -18
  101. data/smoke/const/Steepfile +0 -6
  102. data/smoke/const/a.rb +0 -27
  103. data/smoke/const/b.rb +0 -7
  104. data/smoke/const/b.rbs +0 -5
  105. data/smoke/const/test_expectations.yml +0 -134
  106. data/smoke/diagnostics/Steepfile +0 -6
  107. data/smoke/diagnostics/a.rbs +0 -22
  108. data/smoke/diagnostics/argument_type_mismatch.rb +0 -1
  109. data/smoke/diagnostics/block_body_type_mismatch.rb +0 -1
  110. data/smoke/diagnostics/block_type_mismatch.rb +0 -3
  111. data/smoke/diagnostics/break_type_mismatch.rb +0 -1
  112. data/smoke/diagnostics/different_method_parameter_kind.rb +0 -9
  113. data/smoke/diagnostics/else_on_exhaustive_case.rb +0 -12
  114. data/smoke/diagnostics/incompatible_annotation.rb +0 -6
  115. data/smoke/diagnostics/incompatible_argument.rb +0 -1
  116. data/smoke/diagnostics/incompatible_assignment.rb +0 -8
  117. data/smoke/diagnostics/method_arity_mismatch.rb +0 -11
  118. data/smoke/diagnostics/method_body_type_mismatch.rb +0 -6
  119. data/smoke/diagnostics/method_definition_missing.rb +0 -2
  120. data/smoke/diagnostics/method_parameter_mismatch.rb +0 -10
  121. data/smoke/diagnostics/method_return_type_annotation_mismatch.rb +0 -7
  122. data/smoke/diagnostics/missing_keyword.rb +0 -1
  123. data/smoke/diagnostics/no_method.rb +0 -1
  124. data/smoke/diagnostics/proc_type_expected.rb +0 -3
  125. data/smoke/diagnostics/required_block_missing.rb +0 -1
  126. data/smoke/diagnostics/return_type_mismatch.rb +0 -6
  127. data/smoke/diagnostics/test_expectations.yml +0 -591
  128. data/smoke/diagnostics/unexpected_block_given.rb +0 -1
  129. data/smoke/diagnostics/unexpected_dynamic_method.rb +0 -3
  130. data/smoke/diagnostics/unexpected_jump.rb +0 -4
  131. data/smoke/diagnostics/unexpected_jump_value.rb +0 -3
  132. data/smoke/diagnostics/unexpected_keyword.rb +0 -1
  133. data/smoke/diagnostics/unexpected_splat.rb +0 -1
  134. data/smoke/diagnostics/unexpected_yield.rb +0 -6
  135. data/smoke/diagnostics/unknown_constant_assigned.rb +0 -7
  136. data/smoke/diagnostics/unresolved_overloading.rb +0 -1
  137. data/smoke/diagnostics/unsupported_syntax.rb +0 -2
  138. data/smoke/diagnostics-rbs/Steepfile +0 -8
  139. data/smoke/diagnostics-rbs/duplicated-method-definition.rbs +0 -20
  140. data/smoke/diagnostics-rbs/generic-parameter-mismatch.rbs +0 -7
  141. data/smoke/diagnostics-rbs/inherit-module.rbs +0 -2
  142. data/smoke/diagnostics-rbs/invalid-method-overload.rbs +0 -3
  143. data/smoke/diagnostics-rbs/invalid-type-application.rbs +0 -7
  144. data/smoke/diagnostics-rbs/invalid_variance_annotation.rbs +0 -3
  145. data/smoke/diagnostics-rbs/mixin-class-error.rbs +0 -6
  146. data/smoke/diagnostics-rbs/nonregular-type-alias.rbs +0 -3
  147. data/smoke/diagnostics-rbs/recursive-alias.rbs +0 -5
  148. data/smoke/diagnostics-rbs/recursive-class.rbs +0 -8
  149. data/smoke/diagnostics-rbs/recursive-type-alias.rbs +0 -3
  150. data/smoke/diagnostics-rbs/superclass-mismatch.rbs +0 -7
  151. data/smoke/diagnostics-rbs/test_expectations.yml +0 -300
  152. data/smoke/diagnostics-rbs/unknown-method-alias.rbs +0 -3
  153. data/smoke/diagnostics-rbs/unknown-type-name-2.rbs +0 -5
  154. data/smoke/diagnostics-rbs/unknown-type-name.rbs +0 -13
  155. data/smoke/diagnostics-rbs-duplicated/Steepfile +0 -6
  156. data/smoke/diagnostics-rbs-duplicated/a.rbs +0 -5
  157. data/smoke/diagnostics-rbs-duplicated/test_expectations.yml +0 -13
  158. data/smoke/diagnostics-ruby-unsat/Steepfile +0 -6
  159. data/smoke/diagnostics-ruby-unsat/a.rbs +0 -3
  160. data/smoke/diagnostics-ruby-unsat/test_expectations.yml +0 -27
  161. data/smoke/diagnostics-ruby-unsat/unsatisfiable_constraint.rb +0 -6
  162. data/smoke/dstr/Steepfile +0 -6
  163. data/smoke/dstr/a.rb +0 -5
  164. data/smoke/dstr/test_expectations.yml +0 -13
  165. data/smoke/ensure/Steepfile +0 -6
  166. data/smoke/ensure/a.rb +0 -18
  167. data/smoke/ensure/test_expectations.yml +0 -62
  168. data/smoke/enumerator/Steepfile +0 -6
  169. data/smoke/enumerator/a.rb +0 -6
  170. data/smoke/enumerator/b.rb +0 -17
  171. data/smoke/enumerator/test_expectations.yml +0 -47
  172. data/smoke/extension/Steepfile +0 -6
  173. data/smoke/extension/a.rb +0 -10
  174. data/smoke/extension/a.rbs +0 -13
  175. data/smoke/extension/b.rb +0 -10
  176. data/smoke/extension/c.rb +0 -9
  177. data/smoke/extension/d.rb +0 -2
  178. data/smoke/extension/e.rb +0 -2
  179. data/smoke/extension/e.rbs +0 -7
  180. data/smoke/extension/f.rb +0 -2
  181. data/smoke/extension/f.rbs +0 -3
  182. data/smoke/extension/test_expectations.yml +0 -73
  183. data/smoke/hash/Steepfile +0 -6
  184. data/smoke/hash/a.rb +0 -17
  185. data/smoke/hash/a.rbs +0 -8
  186. data/smoke/hash/b.rb +0 -6
  187. data/smoke/hash/c.rb +0 -15
  188. data/smoke/hash/d.rb +0 -5
  189. data/smoke/hash/e.rb +0 -1
  190. data/smoke/hash/e.rbs +0 -3
  191. data/smoke/hash/f.rb +0 -11
  192. data/smoke/hash/test_expectations.yml +0 -81
  193. data/smoke/hello/Steepfile +0 -6
  194. data/smoke/hello/hello.rb +0 -11
  195. data/smoke/hello/hello.rbs +0 -7
  196. data/smoke/hello/test_expectations.yml +0 -25
  197. data/smoke/if/Steepfile +0 -6
  198. data/smoke/if/a.rb +0 -20
  199. data/smoke/if/test_expectations.yml +0 -34
  200. data/smoke/implements/Steepfile +0 -6
  201. data/smoke/implements/a.rb +0 -12
  202. data/smoke/implements/a.rbs +0 -6
  203. data/smoke/implements/b.rb +0 -13
  204. data/smoke/implements/b.rbs +0 -12
  205. data/smoke/implements/test_expectations.yml +0 -23
  206. data/smoke/initialize/Steepfile +0 -6
  207. data/smoke/initialize/a.rb +0 -12
  208. data/smoke/initialize/a.rbs +0 -3
  209. data/smoke/initialize/test_expectations.yml +0 -1
  210. data/smoke/integer/Steepfile +0 -6
  211. data/smoke/integer/a.rb +0 -26
  212. data/smoke/integer/test_expectations.yml +0 -110
  213. data/smoke/interface/Steepfile +0 -6
  214. data/smoke/interface/a.rb +0 -12
  215. data/smoke/interface/a.rbs +0 -12
  216. data/smoke/interface/test_expectations.yml +0 -23
  217. data/smoke/kwbegin/Steepfile +0 -6
  218. data/smoke/kwbegin/a.rb +0 -7
  219. data/smoke/kwbegin/test_expectations.yml +0 -17
  220. data/smoke/lambda/Steepfile +0 -6
  221. data/smoke/lambda/a.rb +0 -10
  222. data/smoke/lambda/test_expectations.yml +0 -17
  223. data/smoke/literal/Steepfile +0 -6
  224. data/smoke/literal/a.rb +0 -11
  225. data/smoke/literal/b.rb +0 -7
  226. data/smoke/literal/literal_methods.rbs +0 -4
  227. data/smoke/literal/test_expectations.yml +0 -106
  228. data/smoke/map/Steepfile +0 -6
  229. data/smoke/map/a.rb +0 -5
  230. data/smoke/map/test_expectations.yml +0 -1
  231. data/smoke/method/Steepfile +0 -6
  232. data/smoke/method/a.rb +0 -21
  233. data/smoke/method/a.rbs +0 -4
  234. data/smoke/method/b.rb +0 -25
  235. data/smoke/method/c.rb +0 -5
  236. data/smoke/method/d.rb +0 -1
  237. data/smoke/method/d.rbs +0 -3
  238. data/smoke/method/test_expectations.yml +0 -121
  239. data/smoke/module/Steepfile +0 -6
  240. data/smoke/module/a.rb +0 -19
  241. data/smoke/module/a.rbs +0 -16
  242. data/smoke/module/b.rb +0 -6
  243. data/smoke/module/c.rb +0 -22
  244. data/smoke/module/d.rb +0 -4
  245. data/smoke/module/e.rb +0 -13
  246. data/smoke/module/f.rb +0 -11
  247. data/smoke/module/test_expectations.yml +0 -75
  248. data/smoke/regexp/Steepfile +0 -6
  249. data/smoke/regexp/a.rb +0 -109
  250. data/smoke/regexp/b.rb +0 -79
  251. data/smoke/regexp/test_expectations.yml +0 -615
  252. data/smoke/regression/Steepfile +0 -6
  253. data/smoke/regression/array.rb +0 -7
  254. data/smoke/regression/block_param_split.rb +0 -7
  255. data/smoke/regression/block_param_split.rbs +0 -3
  256. data/smoke/regression/empty_yield.rb +0 -5
  257. data/smoke/regression/empty_yield.rbs +0 -3
  258. data/smoke/regression/enumerator_product.rb +0 -1
  259. data/smoke/regression/fun.rb +0 -8
  260. data/smoke/regression/fun.rbs +0 -4
  261. data/smoke/regression/hash.rb +0 -7
  262. data/smoke/regression/hello world.rb +0 -1
  263. data/smoke/regression/issue_328.rb +0 -1
  264. data/smoke/regression/issue_328.rbs +0 -0
  265. data/smoke/regression/issue_332.rb +0 -11
  266. data/smoke/regression/issue_332.rbs +0 -19
  267. data/smoke/regression/issue_372.rb +0 -8
  268. data/smoke/regression/issue_372.rbs +0 -4
  269. data/smoke/regression/lambda.rb +0 -3
  270. data/smoke/regression/masgn.rb +0 -4
  271. data/smoke/regression/poly_new.rb +0 -2
  272. data/smoke/regression/poly_new.rbs +0 -4
  273. data/smoke/regression/range.rb +0 -5
  274. data/smoke/regression/set_divide.rb +0 -12
  275. data/smoke/regression/test_expectations.yml +0 -120
  276. data/smoke/regression/thread.rb +0 -7
  277. data/smoke/rescue/Steepfile +0 -6
  278. data/smoke/rescue/a.rb +0 -48
  279. data/smoke/rescue/test_expectations.yml +0 -79
  280. data/smoke/self/Steepfile +0 -6
  281. data/smoke/self/a.rb +0 -21
  282. data/smoke/self/a.rbs +0 -4
  283. data/smoke/self/test_expectations.yml +0 -23
  284. data/smoke/skip/Steepfile +0 -6
  285. data/smoke/skip/skip.rb +0 -13
  286. data/smoke/skip/test_expectations.yml +0 -23
  287. data/smoke/stdout/Steepfile +0 -6
  288. data/smoke/stdout/a.rb +0 -8
  289. data/smoke/stdout/a.rbs +0 -7
  290. data/smoke/stdout/test_expectations.yml +0 -1
  291. data/smoke/super/Steepfile +0 -6
  292. data/smoke/super/a.rb +0 -30
  293. data/smoke/super/a.rbs +0 -10
  294. data/smoke/super/test_expectations.yml +0 -69
  295. data/smoke/toplevel/Steepfile +0 -6
  296. data/smoke/toplevel/a.rb +0 -3
  297. data/smoke/toplevel/a.rbs +0 -3
  298. data/smoke/toplevel/test_expectations.yml +0 -15
  299. data/smoke/tsort/Steepfile +0 -7
  300. data/smoke/tsort/a.rb +0 -12
  301. data/smoke/tsort/test_expectations.yml +0 -1
  302. data/smoke/type_case/Steepfile +0 -6
  303. data/smoke/type_case/a.rb +0 -24
  304. data/smoke/type_case/test_expectations.yml +0 -58
  305. data/smoke/unexpected/Steepfile +0 -6
  306. data/smoke/unexpected/test_expectations.yml +0 -13
  307. data/smoke/unexpected/unexpected.rbs +0 -3
  308. data/smoke/yield/Steepfile +0 -6
  309. data/smoke/yield/a.rb +0 -15
  310. data/smoke/yield/b.rb +0 -6
  311. data/smoke/yield/test_expectations.yml +0 -88
data/smoke/regexp/a.rb DELETED
@@ -1,109 +0,0 @@
1
- new_1 = Regexp.new("a")
2
- new_1.foo
3
-
4
- new_2 = Regexp.new("a", nil)
5
- new_2.foo
6
-
7
- new_3 = Regexp.new("a", Regexp::EXTENDED | Regexp::IGNORECASE)
8
- new_3.foo
9
-
10
- new_4 = Regexp.new(/a/)
11
- new_4.foo
12
-
13
- compile_1 = Regexp.compile("a")
14
- compile_1.foo
15
-
16
- compile_2 = Regexp.compile("a", false)
17
- compile_2.foo
18
-
19
- compile_3 = Regexp.compile("a", Regexp::EXTENDED | Regexp::IGNORECASE)
20
- compile_3.foo
21
-
22
- compile_4 = Regexp.compile(/a/)
23
- compile_4.foo
24
-
25
- escape_1 = Regexp.escape("a")
26
- escape_1.foo
27
-
28
- last_match_1 = Regexp.last_match
29
- last_match_1.foo
30
-
31
- last_match_2 = Regexp.last_match(1)
32
- last_match_2.foo
33
-
34
- quote_1 = Regexp.quote("a")
35
- quote_1.foo
36
-
37
- try_convert_1 = Regexp.try_convert(Object.new)
38
- try_convert_1.foo
39
-
40
- union_1 = Regexp.union
41
- union_1.foo
42
-
43
- union_2 = Regexp.union("a")
44
- union_2.foo
45
-
46
- union_3 = Regexp.union("a", "b")
47
- union_3.foo
48
-
49
- union_4 = Regexp.union(["a", "b"])
50
- union_4.foo
51
-
52
- union_5 = Regexp.union(/a/)
53
- union_5.foo
54
-
55
- union_6 = Regexp.union(/a/, /b/)
56
- union_6.foo
57
-
58
- union_7 = Regexp.union([/a/, /b/])
59
- union_7.foo
60
-
61
- op_eqeqeq_1 = /a/ === "a"
62
- op_eqeqeq_1.foo
63
-
64
- op_match_1 = /a/ =~ "a"
65
- op_match_1.foo
66
-
67
- casefold_1 = /a/.casefold?
68
- casefold_1.foo
69
-
70
- encoding_1 = /a/.encoding
71
- encoding_1.foo
72
-
73
- fixed_encoding_1 = /a/.fixed_encoding?
74
- fixed_encoding_1.foo
75
-
76
- match_1 = /a/.match("a")
77
- match_1.foo
78
-
79
- match_2 = /a/.match("a", 0)
80
- match_2.foo
81
-
82
- /a/.match("a") do |m|
83
- m.foo
84
- end
85
-
86
- /a/.match("a", 0) do |m|
87
- m.foo
88
- end
89
-
90
- match_q_1 = /a/.match?("a")
91
- match_q_1.foo
92
-
93
- match_q_2 = /a/.match?("a", 0)
94
- match_q_2.foo
95
-
96
- named_captures_1 = /(?<foo>.)/.named_captures
97
- named_captures_1.foo
98
-
99
- names_1 = /(?<foo>.)/.names
100
- names_1.foo
101
-
102
- options_1 = /a/ix.options
103
- options_1.foo
104
-
105
- source_1 = /a/ix.source
106
- source_1.foo
107
-
108
- op_unary_match_1 = ~ /a/
109
- op_unary_match_1.foo
data/smoke/regexp/b.rb DELETED
@@ -1,79 +0,0 @@
1
- /(?<foo>a)/.match("a") do |match|
2
- match_ref_1 = match[0]
3
- match_ref_1.foo
4
-
5
- match_ref_2 = match["foo"]
6
- match_ref_2.foo
7
-
8
- match_ref_3 = match[:foo]
9
- match_ref_3.foo
10
-
11
- match_ref_4 = match[0, 1]
12
- match_ref_4.foo
13
-
14
- match_ref_5 = match[0..1]
15
- match_ref_5.foo
16
-
17
- begin_1 = match.begin(0)
18
- begin_1.foo
19
-
20
- begin_2 = match.begin("foo")
21
- begin_2.foo
22
-
23
- begin_3 = match.begin(:foo)
24
- begin_3.foo
25
-
26
- captures_1 = match.captures
27
- captures_1.foo
28
-
29
- end_1 = match.end(0)
30
- end_1.foo
31
-
32
- end_2 = match.end("foo")
33
- end_2.foo
34
-
35
- end_3 = match.end(:foo)
36
- end_3.foo
37
-
38
- length_1 = match.length
39
- length_1.foo
40
-
41
- named_captures_1 = match.named_captures
42
- named_captures_1.foo
43
-
44
- names_1 = match.names
45
- names_1.foo
46
-
47
- offset_1 = match.offset(0)
48
- offset_1.foo
49
-
50
- offset_2 = match.offset("foo")
51
- offset_2.foo
52
-
53
- offset_3 = match.offset(:foo)
54
- offset_3.foo
55
-
56
- post_match_1 = match.post_match
57
- post_match_1.foo
58
-
59
- pre_match_1 = match.pre_match
60
- pre_match_1.foo
61
-
62
- regexp_1 = match.regexp
63
- regexp_1.foo
64
-
65
- size_1 = match.size
66
- size_1.foo
67
-
68
- string_1 = match.string
69
- string_1.foo
70
-
71
- to_a_1 = match.to_a
72
- to_a_1.foo
73
-
74
- values_at_1 = match.values_at
75
- values_at_1.foo
76
-
77
- values_at_2 = match.values_at(0, "foo", :foo)
78
- values_at_2.foo
79
- end