yoda-language-server 0.7.1 → 0.9.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (392) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/test.yml +23 -0
  3. data/.gitignore +1 -1
  4. data/.rspec +1 -0
  5. data/CHANGELOG.md +9 -0
  6. data/Gemfile +2 -0
  7. data/README.md +23 -11
  8. data/Rakefile +32 -0
  9. data/bin/bench +12 -0
  10. data/bin/local +7 -0
  11. data/client/atom/.gitignore +1 -0
  12. data/{package.json → client/atom/package.json} +1 -1
  13. data/{yarn.lock → client/atom/yarn.lock} +0 -0
  14. data/client/vscode/.gitignore +1 -1
  15. data/client/vscode/.vscode/launch.json +0 -11
  16. data/client/vscode/.vscode/settings.json +5 -1
  17. data/client/vscode/LICENSE.txt +21 -0
  18. data/client/vscode/README.md +4 -55
  19. data/client/vscode/package-lock.json +4299 -1373
  20. data/client/vscode/package.json +40 -15
  21. data/client/vscode/src/check-versions.ts +55 -0
  22. data/client/vscode/src/config.ts +20 -0
  23. data/client/vscode/src/extension.ts +12 -27
  24. data/client/vscode/src/install-tools.ts +109 -0
  25. data/client/vscode/src/language-server.ts +59 -0
  26. data/client/vscode/src/status.ts +3 -0
  27. data/client/vscode/src/test/runTest.ts +30 -0
  28. data/client/vscode/src/test/{completion.test.ts → suite/completion.test.ts} +2 -1
  29. data/client/vscode/src/test/suite/hover.test.ts +31 -0
  30. data/client/vscode/src/test/suite/index.ts +26 -0
  31. data/client/vscode/src/utils.ts +11 -0
  32. data/client/vscode/tsconfig.json +4 -1
  33. data/exe/yoda +1 -1
  34. data/lib/yoda/ast/array_node.rb +10 -0
  35. data/lib/yoda/ast/assignment_node.rb +15 -0
  36. data/lib/yoda/ast/block_call_node.rb +20 -0
  37. data/lib/yoda/ast/block_node.rb +10 -0
  38. data/lib/yoda/ast/case_node.rb +20 -0
  39. data/lib/yoda/ast/center_operator_node.rb +20 -0
  40. data/lib/yoda/ast/class_node.rb +22 -0
  41. data/lib/yoda/ast/comment_block/base_part.rb +12 -0
  42. data/lib/yoda/ast/comment_block/range_calculation.rb +58 -0
  43. data/lib/yoda/ast/comment_block/tag_part.rb +88 -0
  44. data/lib/yoda/ast/comment_block/tag_text_name_part.rb +35 -0
  45. data/lib/yoda/ast/comment_block/tag_text_type_part.rb +52 -0
  46. data/lib/yoda/ast/comment_block/text_part.rb +28 -0
  47. data/lib/yoda/ast/comment_block/token.rb +44 -0
  48. data/lib/yoda/ast/comment_block.rb +119 -0
  49. data/lib/yoda/ast/conditional_loop_node.rb +15 -0
  50. data/lib/yoda/ast/constant_assignment_node.rb +20 -0
  51. data/lib/yoda/ast/constant_base_node.rb +42 -0
  52. data/lib/yoda/ast/constant_node.rb +53 -0
  53. data/lib/yoda/ast/def_node.rb +27 -0
  54. data/lib/yoda/ast/def_singleton_node.rb +32 -0
  55. data/lib/yoda/ast/empty_vnode.rb +24 -0
  56. data/lib/yoda/ast/ensure_node.rb +15 -0
  57. data/lib/yoda/ast/for_node.rb +20 -0
  58. data/lib/yoda/ast/hash_node.rb +10 -0
  59. data/lib/yoda/ast/if_node.rb +20 -0
  60. data/lib/yoda/ast/interpolation_text_node.rb +10 -0
  61. data/lib/yoda/ast/kwsplat_node.rb +10 -0
  62. data/lib/yoda/ast/left_operator_node.rb +15 -0
  63. data/lib/yoda/ast/literal_node.rb +18 -0
  64. data/lib/yoda/ast/method_traversable.rb +22 -0
  65. data/lib/yoda/ast/module_node.rb +17 -0
  66. data/lib/yoda/ast/multiple_left_hand_side_node.rb +31 -0
  67. data/lib/yoda/ast/name_vnode.rb +28 -0
  68. data/lib/yoda/ast/namespace.rb +36 -0
  69. data/lib/yoda/ast/namespace_traversable.rb +39 -0
  70. data/lib/yoda/ast/node.rb +52 -0
  71. data/lib/yoda/ast/optional_parameter_node.rb +20 -0
  72. data/lib/yoda/ast/pair_node.rb +15 -0
  73. data/lib/yoda/ast/parameter_node.rb +25 -0
  74. data/lib/yoda/ast/parameters_node.rb +62 -0
  75. data/lib/yoda/ast/rescue_clause_node.rb +20 -0
  76. data/lib/yoda/ast/rescue_node.rb +20 -0
  77. data/lib/yoda/ast/root_vnode.rb +48 -0
  78. data/lib/yoda/ast/send_node.rb +100 -0
  79. data/lib/yoda/ast/singleton_class_node.rb +17 -0
  80. data/lib/yoda/ast/special_call_node.rb +10 -0
  81. data/lib/yoda/ast/traversable.rb +34 -0
  82. data/lib/yoda/ast/value_vnode.rb +28 -0
  83. data/lib/yoda/ast/variable_node.rb +15 -0
  84. data/lib/yoda/ast/vnode.rb +170 -0
  85. data/lib/yoda/ast/when_node.rb +15 -0
  86. data/lib/yoda/ast.rb +140 -0
  87. data/lib/yoda/cli/analyze_deps.rb +102 -0
  88. data/lib/yoda/{commands → cli}/base.rb +1 -1
  89. data/lib/yoda/{commands → cli}/complete.rb +12 -9
  90. data/lib/yoda/cli/console.rb +17 -0
  91. data/lib/yoda/{commands → cli}/file_cursor_parsable.rb +1 -1
  92. data/lib/yoda/{commands → cli}/infer.rb +4 -4
  93. data/lib/yoda/cli.rb +117 -0
  94. data/lib/yoda/has_services.rb +40 -0
  95. data/lib/yoda/instrument.rb +21 -5
  96. data/lib/yoda/logger.rb +4 -2
  97. data/lib/yoda/missing_delegatable.rb +34 -0
  98. data/lib/yoda/model/completion_item.rb +43 -11
  99. data/lib/yoda/model/descriptions/base.rb +11 -0
  100. data/lib/yoda/model/descriptions/comment_token_description.rb +46 -0
  101. data/lib/yoda/model/descriptions/function_description.rb +19 -2
  102. data/lib/yoda/model/descriptions/node_description.rb +19 -8
  103. data/lib/yoda/model/descriptions/variable_description.rb +41 -0
  104. data/lib/yoda/model/descriptions.rb +2 -0
  105. data/lib/yoda/model/environment/accessor_interface.rb +43 -0
  106. data/lib/yoda/model/environment/instance_accessor.rb +121 -0
  107. data/lib/yoda/model/environment/namespace_members.rb +104 -0
  108. data/lib/yoda/model/environment/singleton_accessor.rb +66 -0
  109. data/lib/yoda/model/environment/value_factory.rb +151 -0
  110. data/lib/yoda/model/environment/value_resolve_context.rb +62 -0
  111. data/lib/yoda/model/environment/with_cache.rb +14 -0
  112. data/lib/yoda/model/environment.rb +122 -0
  113. data/lib/yoda/model/function_signatures/base.rb +22 -2
  114. data/lib/yoda/model/function_signatures/constructor.rb +17 -1
  115. data/lib/yoda/model/function_signatures/method.rb +18 -2
  116. data/lib/yoda/model/function_signatures/overload.rb +17 -1
  117. data/lib/yoda/model/function_signatures/parameter_list.rb +17 -0
  118. data/lib/yoda/model/function_signatures/rbs_method.rb +91 -0
  119. data/lib/yoda/model/function_signatures/type_builder.rb +63 -31
  120. data/lib/yoda/model/function_signatures/wrapper.rb +46 -0
  121. data/lib/yoda/model/function_signatures.rb +2 -0
  122. data/lib/yoda/model/lexical_context.rb +40 -0
  123. data/lib/yoda/model/node_signatures/base.rb +42 -0
  124. data/lib/yoda/model/node_signatures/const.rb +20 -0
  125. data/lib/yoda/model/node_signatures/method_definition.rb +20 -0
  126. data/lib/yoda/model/node_signatures/node.rb +11 -0
  127. data/lib/yoda/model/node_signatures/send.rb +20 -0
  128. data/lib/yoda/model/node_signatures.rb +35 -0
  129. data/lib/yoda/model/parameters/base.rb +14 -0
  130. data/lib/yoda/model/parameters/binder.rb +148 -0
  131. data/lib/yoda/model/parameters/multiple.rb +36 -0
  132. data/lib/yoda/model/parameters/named.rb +20 -0
  133. data/lib/yoda/model/parameters/unnamed.rb +12 -0
  134. data/lib/yoda/model/parameters.rb +11 -0
  135. data/lib/yoda/model/path.rb +16 -0
  136. data/lib/yoda/model/primary_source_inferencer.rb +34 -0
  137. data/lib/yoda/model/scoped_path.rb +13 -2
  138. data/lib/yoda/model/{types → type_expressions}/any_type.rb +7 -3
  139. data/lib/yoda/model/{types → type_expressions}/base.rb +10 -3
  140. data/lib/yoda/model/{types → type_expressions}/duck_type.rb +8 -2
  141. data/lib/yoda/model/type_expressions/function_type/parameter.rb +95 -0
  142. data/lib/yoda/model/{types → type_expressions}/function_type.rb +61 -70
  143. data/lib/yoda/model/type_expressions/generator.rb +28 -0
  144. data/lib/yoda/model/{types → type_expressions}/generic_type.rb +17 -2
  145. data/lib/yoda/model/{types → type_expressions}/instance_type.rb +10 -2
  146. data/lib/yoda/model/{types → type_expressions}/module_type.rb +7 -1
  147. data/lib/yoda/model/type_expressions/self_type.rb +38 -0
  148. data/lib/yoda/model/{types → type_expressions}/sequence_type.rb +6 -1
  149. data/lib/yoda/model/{types → type_expressions}/union_type.rb +7 -3
  150. data/lib/yoda/model/{types → type_expressions}/unknown_type.rb +6 -1
  151. data/lib/yoda/model/{types → type_expressions}/value_type.rb +17 -1
  152. data/lib/yoda/model/type_expressions/void_type.rb +37 -0
  153. data/lib/yoda/model/type_expressions.rb +40 -0
  154. data/lib/yoda/model/values/base.rb +23 -8
  155. data/lib/yoda/model/values/empty_value.rb +39 -0
  156. data/lib/yoda/model/values/instance_value.rb +24 -43
  157. data/lib/yoda/model/values/intersection_value.rb +48 -0
  158. data/lib/yoda/model/values/literal_value.rb +23 -0
  159. data/lib/yoda/model/values/union_value.rb +50 -0
  160. data/lib/yoda/model/values.rb +5 -1
  161. data/lib/yoda/model/yard_type_parser.rb +35 -0
  162. data/lib/yoda/model.rb +7 -2
  163. data/lib/yoda/parsing/comment_tokenizer.rb +21 -4
  164. data/lib/yoda/parsing/location.rb +1 -1
  165. data/lib/yoda/parsing/node_objects/args_node.rb +85 -0
  166. data/lib/yoda/parsing/node_objects/const_node.rb +3 -3
  167. data/lib/yoda/parsing/node_objects/mlhs_node.rb +31 -0
  168. data/lib/yoda/parsing/node_objects.rb +2 -0
  169. data/lib/yoda/parsing/parser.rb +44 -5
  170. data/lib/yoda/parsing/query/current_comment_token_query.rb +4 -3
  171. data/lib/yoda/parsing/query/current_commenting_node_query.rb +7 -7
  172. data/lib/yoda/parsing/scopes/base.rb +1 -1
  173. data/lib/yoda/parsing/scopes/builder.rb +1 -1
  174. data/lib/yoda/parsing/source_cutter.rb +6 -2
  175. data/lib/yoda/parsing/traverser/matcher.rb +65 -0
  176. data/lib/yoda/parsing/traverser/query_interface.rb +68 -0
  177. data/lib/yoda/parsing/traverser/result_set.rb +37 -0
  178. data/lib/yoda/parsing/traverser.rb +29 -0
  179. data/lib/yoda/parsing/type_parser.rb +24 -20
  180. data/lib/yoda/parsing.rb +27 -1
  181. data/lib/yoda/presentation/code_completion/constant.rb +27 -0
  182. data/lib/yoda/server/concurrent_writer.rb +1 -1
  183. data/lib/yoda/server/lifecycle_handler.rb +125 -25
  184. data/lib/yoda/server/notifier.rb +79 -1
  185. data/lib/yoda/server/providers/completion.rb +31 -17
  186. data/lib/yoda/server/providers/definition.rb +38 -10
  187. data/lib/yoda/server/providers/hover.rb +26 -10
  188. data/lib/yoda/server/providers/reportable_progress.rb +75 -0
  189. data/lib/yoda/server/providers/signature.rb +20 -7
  190. data/lib/yoda/server/providers/text_document_did_change.rb +1 -1
  191. data/lib/yoda/server/providers/text_document_did_open.rb +1 -1
  192. data/lib/yoda/server/providers/with_timeout.rb +36 -0
  193. data/lib/yoda/server/providers/workspace_did_change_workspace_folders.rb +33 -0
  194. data/lib/yoda/server/providers/workspace_did_create_files.rb +21 -0
  195. data/lib/yoda/server/providers/workspace_did_delete_files.rb +21 -0
  196. data/lib/yoda/server/providers/workspace_did_rename_files.rb +22 -0
  197. data/lib/yoda/server/providers/workspace_symbol.rb +82 -0
  198. data/lib/yoda/server/providers.rb +12 -0
  199. data/lib/yoda/server/root_handler.rb +27 -23
  200. data/lib/yoda/server/rootless_workspace.rb +62 -0
  201. data/lib/yoda/server/scheduler.rb +50 -0
  202. data/lib/yoda/server/session.rb +71 -25
  203. data/lib/yoda/server/uri_decoder.rb +16 -0
  204. data/lib/yoda/server/workspace.rb +117 -0
  205. data/lib/yoda/server.rb +9 -2
  206. data/lib/yoda/services/code_completion/base_provider.rb +52 -0
  207. data/lib/yoda/{evaluation → services}/code_completion/const_provider.rb +35 -25
  208. data/lib/yoda/services/code_completion/keyword_provider.rb +67 -0
  209. data/lib/yoda/services/code_completion/local_variable_provider.rb +51 -0
  210. data/lib/yoda/{evaluation → services}/code_completion/method_provider.rb +14 -32
  211. data/lib/yoda/services/code_completion.rb +74 -0
  212. data/lib/yoda/{evaluation → services}/comment_completion/base_provider.rb +11 -6
  213. data/lib/yoda/{evaluation → services}/comment_completion/param_provider.rb +1 -1
  214. data/lib/yoda/{evaluation → services}/comment_completion/tag_provider.rb +1 -1
  215. data/lib/yoda/{evaluation → services}/comment_completion/type_provider.rb +6 -5
  216. data/lib/yoda/{evaluation → services}/comment_completion.rb +13 -13
  217. data/lib/yoda/services/current_node_explain/comment_signature.rb +77 -0
  218. data/lib/yoda/services/current_node_explain.rb +72 -0
  219. data/lib/yoda/services/evaluator.rb +44 -0
  220. data/lib/yoda/services/signature_discovery.rb +74 -0
  221. data/lib/yoda/services.rb +9 -0
  222. data/lib/yoda/store/actions/build_core_index.rb +38 -9
  223. data/lib/yoda/store/actions/import_core_library.rb +14 -19
  224. data/lib/yoda/store/actions/import_gem.rb +65 -33
  225. data/lib/yoda/store/actions/import_project_dependencies.rb +47 -0
  226. data/lib/yoda/store/actions/import_std_library.rb +13 -18
  227. data/lib/yoda/store/actions/read_file.rb +21 -6
  228. data/lib/yoda/store/actions/read_project_files.rb +7 -1
  229. data/lib/yoda/store/actions.rb +1 -0
  230. data/lib/yoda/store/adapters/base.rb +39 -0
  231. data/lib/yoda/store/adapters/gdbm_adapter/namespace_accessor.rb +152 -0
  232. data/lib/yoda/store/adapters/gdbm_adapter.rb +56 -0
  233. data/lib/yoda/store/adapters/lazy_adapter.rb +34 -0
  234. data/lib/yoda/store/adapters/memory_adapter.rb +21 -0
  235. data/lib/yoda/store/adapters.rb +12 -4
  236. data/lib/yoda/store/config.rb +43 -0
  237. data/lib/yoda/store/file_tree.rb +131 -0
  238. data/lib/yoda/store/objects/base.rb +73 -4
  239. data/lib/yoda/store/objects/class_object.rb +16 -7
  240. data/lib/yoda/store/objects/connected_delegation.rb +25 -0
  241. data/lib/yoda/store/objects/libraries_status.rb +67 -0
  242. data/lib/yoda/store/objects/library/core.rb +72 -0
  243. data/lib/yoda/store/objects/library/gem.rb +141 -0
  244. data/lib/yoda/store/objects/library/std.rb +72 -0
  245. data/lib/yoda/store/objects/library/with_registry.rb +28 -0
  246. data/lib/yoda/store/objects/library.rb +24 -0
  247. data/lib/yoda/store/objects/map.rb +61 -0
  248. data/lib/yoda/store/objects/merger.rb +6 -5
  249. data/lib/yoda/store/objects/meta_class_object.rb +28 -1
  250. data/lib/yoda/store/objects/method_object.rb +39 -6
  251. data/lib/yoda/store/objects/module_object.rb +3 -0
  252. data/lib/yoda/store/objects/namespace_object.rb +38 -1
  253. data/lib/yoda/store/objects/overload.rb +1 -1
  254. data/lib/yoda/store/objects/patch.rb +53 -10
  255. data/lib/yoda/store/objects/serializable.rb +17 -2
  256. data/lib/yoda/store/objects/serializable_set.rb +23 -0
  257. data/lib/yoda/store/objects/tag.rb +1 -1
  258. data/lib/yoda/store/objects/value_object.rb +5 -1
  259. data/lib/yoda/store/objects.rb +5 -1
  260. data/lib/yoda/store/project/dependency.rb +83 -0
  261. data/lib/yoda/store/project/file_finder.rb +101 -0
  262. data/lib/yoda/store/project/rbs_loader.rb +41 -0
  263. data/lib/yoda/store/project/setuper.rb +68 -0
  264. data/lib/yoda/store/project.rb +99 -41
  265. data/lib/yoda/store/query/ancestor_tree.rb +126 -0
  266. data/lib/yoda/store/query/associators/associate_ancestors.rb +5 -78
  267. data/lib/yoda/store/query/associators/associate_methods.rb +11 -8
  268. data/lib/yoda/store/query/constant_member_set.rb +33 -0
  269. data/lib/yoda/store/query/find_constant.rb +23 -6
  270. data/lib/yoda/store/query/find_meta_class.rb +1 -1
  271. data/lib/yoda/store/query/find_method.rb +12 -25
  272. data/lib/yoda/store/query/find_signature.rb +11 -3
  273. data/lib/yoda/store/query/find_workspace_objects.rb +36 -0
  274. data/lib/yoda/store/query/method_member_set.rb +50 -0
  275. data/lib/yoda/store/query.rb +4 -0
  276. data/lib/yoda/store/{registry_cache.rb → registry/cache.rb} +26 -1
  277. data/lib/yoda/store/registry/composer.rb +47 -0
  278. data/lib/yoda/store/registry/index.rb +116 -0
  279. data/lib/yoda/store/registry/library_registry.rb +71 -0
  280. data/lib/yoda/store/registry/library_registry_set.rb +133 -0
  281. data/lib/yoda/store/registry/local_store.rb +38 -0
  282. data/lib/yoda/store/registry/project_registry.rb +72 -0
  283. data/lib/yoda/store/registry.rb +25 -97
  284. data/lib/yoda/store/transformers/core_visibility.rb +61 -0
  285. data/lib/yoda/store/transformers.rb +7 -0
  286. data/lib/yoda/store/version_store.rb +71 -0
  287. data/lib/yoda/store/yard_importer.rb +22 -20
  288. data/lib/yoda/store.rb +15 -2
  289. data/lib/yoda/typing/constant_resolver/cbase_query.rb +14 -0
  290. data/lib/yoda/typing/constant_resolver/member_query.rb +27 -0
  291. data/lib/yoda/typing/constant_resolver/node_tracer.rb +36 -0
  292. data/lib/yoda/typing/constant_resolver/query.rb +59 -0
  293. data/lib/yoda/typing/constant_resolver/relative_base_query.rb +14 -0
  294. data/lib/yoda/typing/constant_resolver.rb +105 -0
  295. data/lib/yoda/typing/contexts/base_context.rb +83 -0
  296. data/lib/yoda/typing/contexts/block_context.rb +14 -0
  297. data/lib/yoda/typing/contexts/context_derivation.rb +59 -0
  298. data/lib/yoda/typing/contexts/method_context.rb +14 -0
  299. data/lib/yoda/typing/contexts/namespace_block_context.rb +29 -0
  300. data/lib/yoda/typing/contexts/namespace_context.rb +14 -0
  301. data/lib/yoda/typing/contexts.rb +25 -0
  302. data/lib/yoda/typing/environment.rb +1 -1
  303. data/lib/yoda/typing/inferencer/arguments.rb +38 -0
  304. data/lib/yoda/typing/inferencer/arguments_binder.rb +24 -0
  305. data/lib/yoda/typing/inferencer/ast_traverser.rb +408 -0
  306. data/lib/yoda/typing/inferencer/method_resolver.rb +81 -0
  307. data/lib/yoda/typing/inferencer/object_resolver.rb +55 -0
  308. data/lib/yoda/typing/inferencer/parameter_binder.rb +176 -0
  309. data/lib/yoda/typing/inferencer/tracer.rb +177 -0
  310. data/lib/yoda/typing/inferencer/type_binding.rb +46 -0
  311. data/lib/yoda/typing/inferencer.rb +52 -0
  312. data/lib/yoda/typing/node_info.rb +78 -0
  313. data/lib/yoda/typing/relation.rb +2 -2
  314. data/lib/yoda/typing/traces/base.rb +2 -2
  315. data/lib/yoda/typing/traces/normal.rb +3 -3
  316. data/lib/yoda/typing/traces/send.rb +4 -4
  317. data/lib/yoda/typing/tree/base.rb +46 -0
  318. data/lib/yoda/typing/tree/begin.rb +15 -0
  319. data/lib/yoda/typing/tree/block.rb +12 -0
  320. data/lib/yoda/typing/tree/case.rb +29 -0
  321. data/lib/yoda/typing/tree/class_tree.rb +31 -0
  322. data/lib/yoda/typing/tree/const.rb +12 -0
  323. data/lib/yoda/typing/tree/constant_assignment.rb +12 -0
  324. data/lib/yoda/typing/tree/defined.rb +11 -0
  325. data/lib/yoda/typing/tree/escape.rb +12 -0
  326. data/lib/yoda/typing/tree/for.rb +8 -0
  327. data/lib/yoda/typing/tree/hash_body.rb +36 -0
  328. data/lib/yoda/typing/tree/if.rb +17 -0
  329. data/lib/yoda/typing/tree/literal.rb +46 -0
  330. data/lib/yoda/typing/tree/literal_with_interpolation.rb +21 -0
  331. data/lib/yoda/typing/tree/logical_assignment.rb +16 -0
  332. data/lib/yoda/typing/tree/logical_operator.rb +15 -0
  333. data/lib/yoda/typing/tree/method.rb +43 -0
  334. data/lib/yoda/typing/tree/module_tree.rb +31 -0
  335. data/lib/yoda/typing/tree/multiple_assignment.rb +20 -0
  336. data/lib/yoda/typing/tree/rescue_body.rb +12 -0
  337. data/lib/yoda/typing/tree/self.rb +11 -0
  338. data/lib/yoda/typing/tree/send.rb +71 -0
  339. data/lib/yoda/typing/tree/singleton_method.rb +47 -0
  340. data/lib/yoda/typing/tree/super.rb +12 -0
  341. data/lib/yoda/typing/tree/variable.rb +20 -0
  342. data/lib/yoda/typing/tree/variable_assignment.rb +20 -0
  343. data/lib/yoda/typing/tree/while.rb +12 -0
  344. data/lib/yoda/typing/tree/yield.rb +12 -0
  345. data/lib/yoda/typing/tree.rb +96 -0
  346. data/lib/yoda/typing/types/any.rb +15 -0
  347. data/lib/yoda/typing/types/associative_array.rb +28 -0
  348. data/lib/yoda/typing/types/base.rb +25 -0
  349. data/lib/yoda/typing/types/converter.rb +67 -0
  350. data/lib/yoda/typing/types/function.rb +68 -0
  351. data/lib/yoda/typing/types/generator.rb +306 -0
  352. data/lib/yoda/typing/types/generic.rb +29 -0
  353. data/lib/yoda/typing/types/instance.rb +30 -0
  354. data/lib/yoda/typing/types/instance_type.rb +74 -0
  355. data/lib/yoda/typing/types/method.rb +39 -0
  356. data/lib/yoda/typing/types/rbs_type_wrapper_interface.rb +44 -0
  357. data/lib/yoda/typing/types/singleton_type.rb +75 -0
  358. data/lib/yoda/typing/types/tuple.rb +24 -0
  359. data/lib/yoda/typing/types/type.rb +60 -0
  360. data/lib/yoda/typing/types/union.rb +38 -0
  361. data/lib/yoda/typing/types/var.rb +38 -0
  362. data/lib/yoda/typing/types.rb +24 -0
  363. data/lib/yoda/typing.rb +5 -2
  364. data/lib/yoda/version.rb +1 -1
  365. data/lib/yoda.rb +6 -2
  366. data/scripts/benchmark.rb +1 -1
  367. data/yoda-language-server.gemspec +16 -15
  368. metadata +337 -111
  369. data/.travis.yml +0 -8
  370. data/client/vscode/src/test/index.ts +0 -24
  371. data/lib/yoda/commands/setup.rb +0 -51
  372. data/lib/yoda/commands.rb +0 -69
  373. data/lib/yoda/evaluation/code_completion/base_provider.rb +0 -57
  374. data/lib/yoda/evaluation/code_completion/variable_provider.rb +0 -18
  375. data/lib/yoda/evaluation/code_completion.rb +0 -65
  376. data/lib/yoda/evaluation/current_node_explain.rb +0 -71
  377. data/lib/yoda/evaluation/evaluator.rb +0 -105
  378. data/lib/yoda/evaluation/signature_discovery.rb +0 -85
  379. data/lib/yoda/evaluation.rb +0 -9
  380. data/lib/yoda/model/node_signature.rb +0 -43
  381. data/lib/yoda/model/types.rb +0 -84
  382. data/lib/yoda/model/values/module_value.rb +0 -72
  383. data/lib/yoda/parsing/source_analyzer.rb +0 -59
  384. data/lib/yoda/server/file_store.rb +0 -57
  385. data/lib/yoda/store/adapters/leveldb_adapter.rb +0 -80
  386. data/lib/yoda/store/adapters/lmdb_adapter.rb +0 -113
  387. data/lib/yoda/store/objects/project_status.rb +0 -169
  388. data/lib/yoda/store/project/cache.rb +0 -78
  389. data/lib/yoda/store/project/library_doc_loader.rb +0 -114
  390. data/lib/yoda/typing/context.rb +0 -96
  391. data/lib/yoda/typing/evaluator.rb +0 -259
  392. data/scripts/build_core_index.sh +0 -16
@@ -1,6 +1,6 @@
1
1
  module Yoda
2
2
  module Model
3
- module Types
3
+ module TypeExpressions
4
4
  class ModuleType < Base
5
5
  # @return [ScopedPath]
6
6
  attr_reader :path
@@ -32,6 +32,12 @@ module Yoda
32
32
  [Store::Query::FindMetaClass.new(registry).find(path)].compact
33
33
  end
34
34
 
35
+ # @param env [Environment]
36
+ def to_rbs_type(env)
37
+ name = env.resolve_rbs_type_name(path)
38
+ name ? RBS::Types::Interface.new(name: name, args: [], location: nil) : RBS::Types::Bases::Any.new(location: nil)
39
+ end
40
+
35
41
  # @return [String]
36
42
  def to_s
37
43
  "#{path.path.to_s}.module"
@@ -0,0 +1,38 @@
1
+ module Yoda
2
+ module Model
3
+ module TypeExpressions
4
+ class SelfType < Base
5
+ # @param another [Object]
6
+ def eql?(another)
7
+ another.is_a?(SelfType)
8
+ end
9
+
10
+ def hash
11
+ [self.class.name].hash
12
+ end
13
+
14
+ # @param paths [Array<Path>]
15
+ # @return [self]
16
+ def change_root(paths)
17
+ self
18
+ end
19
+
20
+ # @param registry [Registry]
21
+ # @return [Array<YARD::CodeObjects::Base>]
22
+ def resolve(registry)
23
+ fail NotImplementedError
24
+ end
25
+
26
+ # @return [String]
27
+ def to_s
28
+ 'self'
29
+ end
30
+
31
+ # @param env [Environment]
32
+ def to_rbs_type(env)
33
+ RBS::Types::Bases::Self.new(location: nil)
34
+ end
35
+ end
36
+ end
37
+ end
38
+ end
@@ -1,6 +1,6 @@
1
1
  module Yoda
2
2
  module Model
3
- module Types
3
+ module TypeExpressions
4
4
  class SequenceType < Base
5
5
  attr_reader :base_type, :types
6
6
 
@@ -43,6 +43,11 @@ module Yoda
43
43
  "#{base_type}(#{types.map(&:to_s).join(', ')})"
44
44
  end
45
45
 
46
+ # @param env [Environment]
47
+ def to_rbs_type(env)
48
+ RBS::Types::Tuple.new(types: types.map { |t| t.to_rbs_type(env) }, location: nil)
49
+ end
50
+
46
51
  # @return [self]
47
52
  def map(&block)
48
53
  self.class.new(base_type.map(&block), types.map(&block))
@@ -2,7 +2,7 @@ require 'set'
2
2
 
3
3
  module Yoda
4
4
  module Model
5
- module Types
5
+ module TypeExpressions
6
6
  class UnionType < Base
7
7
  attr_reader :types
8
8
 
@@ -21,8 +21,7 @@ module Yoda
21
21
  end
22
22
 
23
23
  def eql?(another)
24
- another.is_a?(UnionType) &&
25
- Set.new(types) == Set.new(another.types)
24
+ another.is_a?(UnionType) && Set.new(types) == Set.new(another.types)
26
25
  end
27
26
 
28
27
  def hash
@@ -46,6 +45,11 @@ module Yoda
46
45
  types.map(&:to_s).join(' | ')
47
46
  end
48
47
 
48
+ # @param env [Environment]
49
+ def to_rbs_type(env)
50
+ RBS::Types::Union.new(types: types.map { |t| t.to_rbs_type(env) }, location: nil)
51
+ end
52
+
49
53
  # @return [self]
50
54
  def map(&block)
51
55
  self.class.new(types.map(&block))
@@ -1,6 +1,6 @@
1
1
  module Yoda
2
2
  module Model
3
- module Types
3
+ module TypeExpressions
4
4
  class UnknownType < Base
5
5
  attr_reader :name
6
6
 
@@ -34,6 +34,11 @@ module Yoda
34
34
  def to_s
35
35
  'any'
36
36
  end
37
+
38
+ # @param env [Environment]
39
+ def to_rbs_type(env)
40
+ RBS::Types::Bases::Any.new(location: nil)
41
+ end
37
42
  end
38
43
  end
39
44
  end
@@ -1,6 +1,6 @@
1
1
  module Yoda
2
2
  module Model
3
- module Types
3
+ module TypeExpressions
4
4
  class ValueType < Base
5
5
  attr_reader :value
6
6
 
@@ -48,6 +48,22 @@ module Yoda
48
48
  end
49
49
  end
50
50
 
51
+ # @param env [Environment]
52
+ def to_rbs_type(env)
53
+ case value_class
54
+ when '::TrueClass'
55
+ RBS::Types::Literal.new(literal: true, location: nil)
56
+ when '::FalseClass'
57
+ RBS::Types::Literal.new(literal: false, location: nil)
58
+ when '::NilClass'
59
+ RBS::Types::Bases::Nil.new(location: nil)
60
+ when '::Numeric'
61
+ RBS::Types::Literal.new(literal: value.to_i, location: nil)
62
+ else
63
+ RBS::Types::Literal.new(literal: value, location: nil)
64
+ end
65
+ end
66
+
51
67
  # @return [String]
52
68
  def to_s
53
69
  value
@@ -0,0 +1,37 @@
1
+ module Yoda
2
+ module Model
3
+ module TypeExpressions
4
+ class VoidType < Base
5
+ def eql?(another)
6
+ false
7
+ end
8
+
9
+ def hash
10
+ [self.class.name].hash
11
+ end
12
+
13
+ # @param paths [Array<Paths>]
14
+ # @return [self]
15
+ def change_root(paths)
16
+ self
17
+ end
18
+
19
+ # @param registry [Registry]
20
+ # @return [Array<Store::Objects::Base>]
21
+ def resolve(registry)
22
+ []
23
+ end
24
+
25
+ # @param env [Environment]
26
+ def to_rbs_type(env)
27
+ RBS::Types::Bases::Void.new(location: nil)
28
+ end
29
+
30
+ # @return [String]
31
+ def to_s
32
+ 'void'
33
+ end
34
+ end
35
+ end
36
+ end
37
+ end
@@ -0,0 +1,40 @@
1
+ require 'parslet'
2
+ require 'yoda/model/yard_type_parser'
3
+
4
+ module Yoda
5
+ module Model
6
+ # Each type expression represents type annotations.
7
+ # Unlike type for symbolic execution, each type expression has {LexicalScope}
8
+ # and the corresponding constants are not determined yet.
9
+ module TypeExpressions
10
+ require 'yoda/model/type_expressions/base'
11
+ require 'yoda/model/type_expressions/any_type'
12
+ require 'yoda/model/type_expressions/value_type'
13
+ require 'yoda/model/type_expressions/instance_type'
14
+ require 'yoda/model/type_expressions/function_type'
15
+ require 'yoda/model/type_expressions/generator'
16
+ require 'yoda/model/type_expressions/duck_type'
17
+ require 'yoda/model/type_expressions/module_type'
18
+ require 'yoda/model/type_expressions/sequence_type'
19
+ require 'yoda/model/type_expressions/self_type'
20
+ require 'yoda/model/type_expressions/generic_type'
21
+ require 'yoda/model/type_expressions/union_type'
22
+ require 'yoda/model/type_expressions/unknown_type'
23
+ require 'yoda/model/type_expressions/void_type'
24
+
25
+ # @param string [String]
26
+ # @return [TypeExpressions::Base]
27
+ def self.parse(string)
28
+ Generator.new.apply(YardTypeParser.new.parse(string))
29
+ rescue Parslet::ParseFailed => failure
30
+ TypeExpressions::UnknownType.new(string)
31
+ end
32
+
33
+ # @param strings [Array<String>]
34
+ # @return [TypeExpressions::Base]
35
+ def self.parse_type_strings(strings)
36
+ TypeExpressions::UnionType.new(strings.map { |string| parse(string) })
37
+ end
38
+ end
39
+ end
40
+ end
@@ -4,26 +4,41 @@ module Yoda
4
4
  # @abstract
5
5
  class Base
6
6
  # @abstract
7
- # @return [Array<Functions::Base>]
8
- def methods
7
+ # @return [Array<Store::Objects::Base>]
8
+ def referred_objects
9
9
  fail NotImplementedError
10
10
  end
11
11
 
12
12
  # @abstract
13
- # @return [String]
14
- def path
13
+ # @param name [String, Symbol]
14
+ # @return [Enumerator<FunctionSignatures::Wrapper>]
15
+ def select_method(name)
15
16
  fail NotImplementedError
16
17
  end
17
18
 
18
19
  # @abstract
19
- # @return [String]
20
- def docstring
20
+ # @param name [String, Symbol]
21
+ # @return [RBS::Types::t]
22
+ def select_constant_type(name)
21
23
  fail NotImplementedError
22
24
  end
23
25
 
24
26
  # @abstract
25
- # @return [Array<[String, Integer]>]
26
- def defined_files
27
+ # @param name [String, Symbol]
28
+ # @return [Array<Symbol>]
29
+ def select_constant_paths(name)
30
+ fail NotImplementedError
31
+ end
32
+
33
+ # @abstract
34
+ # @return [Base]
35
+ def singleton_class_value
36
+ fail NotImplementedError
37
+ end
38
+
39
+ # @abstract
40
+ # @return [Base]
41
+ def instance_value
27
42
  fail NotImplementedError
28
43
  end
29
44
  end
@@ -0,0 +1,39 @@
1
+ module Yoda
2
+ module Model
3
+ module Values
4
+ class EmptyValue < Base
5
+ # @param name [String, Symbol]
6
+ # @return [Array<Functions::Base>]
7
+ def select_method(name, **kwargs)
8
+ []
9
+ end
10
+
11
+ def referred_objects
12
+ []
13
+ end
14
+
15
+ # @param name [String, Symbol]
16
+ # @return [RBS::Types::t]
17
+ def select_constant_type(name, **kwargs)
18
+ RBS::Types::Bases::Any.new(location: nil)
19
+ end
20
+
21
+ # @param name [String, Symbol]
22
+ # @return [Array<String>]
23
+ def select_constant_paths(name, **kwargs)
24
+ []
25
+ end
26
+
27
+ # @return [EmptyValue]
28
+ def singleton_class_value
29
+ self
30
+ end
31
+
32
+ # @return [EmptyValue]
33
+ def instance_value
34
+ self
35
+ end
36
+ end
37
+ end
38
+ end
39
+ end
@@ -1,63 +1,44 @@
1
+ require 'forwardable'
2
+
1
3
  module Yoda
2
4
  module Model
3
5
  module Values
4
6
  class InstanceValue < Base
5
- # @type Registry
6
- attr_reader :registry
7
-
8
- # @type ::YARD::CodeObjects::ClassObject | ::YARD::CodeObjects::Proxy
9
- attr_reader :class_object
7
+ extend Forwardable
10
8
 
11
- # @param registry [Registry]
12
- # @param class_object [::YARD::CodeObjects::ClassObject, ::YARD::CodeObjects::Proxy]
13
- def initialize(registry, class_object)
14
- fail ArgumentError, registry unless registry.is_a?(Registry)
15
- fail ArgumentError, class_object unless class_object.is_a?(::YARD::CodeObjects::NamespaceObject) || class_object.is_a?(::YARD::CodeObjects::Proxy)
16
- @registry = registry
17
- @class_object = class_object
18
- end
9
+ # @return [Environment::AccessorInterface]
10
+ attr_reader :class_accessor
19
11
 
20
- # @return [Array<Functions::Base>]
21
- def methods(visibility: nil)
22
- return [] if class_object.type == :proxy
23
- opts = { scope: :instance, visibility: visibility }.compact
24
- class_object.meths(opts).map { |meth| Functions::Method.new(meth) } + object_methods(visibility: visibility)
25
- end
12
+ delegate [:select_constant_type, :select_constant_paths, :select_method] => :class_accessor_members
26
13
 
27
- # @return [String]
28
- def path
29
- namespace.path
14
+ # @param class_accessor [Environment::AccessorInterface]
15
+ def initialize(class_accessor)
16
+ @class_accessor = class_accessor
30
17
  end
31
18
 
32
- def namespace
33
- class_object
19
+ def referred_objects
20
+ [class_accessor.class_object].compact
34
21
  end
35
22
 
36
- # @param [String]
37
- def docstring
38
- class_object.docstring
23
+ # @return [InstanceValue]
24
+ def singleton_class_value
25
+ InstanceValue.new(class_accessor.singleton_accessor)
39
26
  end
40
27
 
41
- # @return [Array<[String, Integer]>]
42
- def defined_files
43
- namespace.files
28
+ # @return [InstanceValue, EmptyValue]
29
+ def instance_value
30
+ if class_accessor.instance_accessor
31
+ InstanceValue.new(class_accessor.instance_accessor)
32
+ else
33
+ EmptyValue.new
34
+ end
44
35
  end
45
36
 
46
37
  private
47
38
 
48
- # @return [Array<Functions::Base>]
49
- def object_methods(visibility: nil)
50
- return [] if class_object.type == :proxy
51
- opts = { scope: :instance, visibility: visibility }.compact
52
- method_names = Set.new(class_object.meths(opts).map(&:name))
53
- if object = registry.find('::Object')
54
- object.meths(opts)
55
- .reject { |o| ![visibility].flatten.include?(:private) && o.namespace.name == :Kernel }
56
- .reject { |o| method_names.include?(o.name) }
57
- .map { |meth| Functions::Method.new(meth) }
58
- else
59
- []
60
- end
39
+ # @return [Environment::NamespaceMembers]
40
+ def class_accessor_members
41
+ class_accessor.members
61
42
  end
62
43
  end
63
44
  end
@@ -0,0 +1,48 @@
1
+ module Yoda
2
+ module Model
3
+ module Values
4
+ class IntersectionValue < Base
5
+ # @return [Environment::AccessorInterface]
6
+ attr_reader :values
7
+
8
+ # @param values [Array<Value>]
9
+ def initialize(*values)
10
+ @values = values
11
+ end
12
+
13
+ def referred_objects
14
+ values.flat_map(&:referred_objects)
15
+ end
16
+
17
+ # @param name [String, Symbol]
18
+ # @return [Array<FunctionSignatures::Base>]
19
+ def select_method(name, **kwargs)
20
+ values.flat_map { |value| select_method(name, **kwargs) }
21
+ end
22
+
23
+ # @param name [String, Symbol]
24
+ # @return [RBS::Types::t]
25
+ def select_constant_type(name, **kwargs)
26
+ types = values.flat_map { |value| select_constant_type(name, **kwargs) }
27
+ RBS::Types::Intersection.new(types: types, location: nil)
28
+ end
29
+
30
+ # @param name [String, Symbol]
31
+ # @return [Array<String>]
32
+ def select_constant_paths(name, **kwargs)
33
+ values.flat_map { |value| select_constant_type(name, **kwargs) }.uniq
34
+ end
35
+
36
+ # @return [UnionValue]
37
+ def singleton_class_value
38
+ IntersectionValue.new(*values.map(&:singleton_class_value))
39
+ end
40
+
41
+ # @return [UnionValue]
42
+ def instance_value
43
+ IntersectionValue.new(*values.map(&:instance_value))
44
+ end
45
+ end
46
+ end
47
+ end
48
+ end
@@ -0,0 +1,23 @@
1
+ require 'forwardable'
2
+
3
+ module Yoda
4
+ module Model
5
+ module Values
6
+ class LiteralValue
7
+ extend Forwardable
8
+
9
+ delegate [:referred_objects, :select_method, :select_constant_type, :select_constant_paths, :singleton_class_value, :instance_value] => :value
10
+
11
+ # @return [Base]
12
+ attr_reader :value
13
+
14
+ # @param value [Base]
15
+ # @param literal [Object]
16
+ def initialize(value:, literal:)
17
+ @value = value
18
+ @literal = literal
19
+ end
20
+ end
21
+ end
22
+ end
23
+ end
@@ -0,0 +1,50 @@
1
+ module Yoda
2
+ module Model
3
+ module Values
4
+ class UnionValue < Base
5
+ # @return [Array<Values::Base>]
6
+ attr_reader :values
7
+
8
+ # @param values [Array<Values::Base>]
9
+ def initialize(*values)
10
+ @values = values
11
+ end
12
+
13
+ def referred_objects
14
+ values.flat_map(&:referred_objects)
15
+ end
16
+
17
+ # @param name [String, Symbol]
18
+ # @return [Array<FunctionSignatures::Wrapper>]
19
+ def select_method(name, **kwargs)
20
+ # Choose methods of shared ancestors
21
+ values.first&.select_method(name, **kwargs) || []
22
+ end
23
+
24
+ # @param name [String, Symbol]
25
+ # @return [RBS::Types::t]
26
+ def select_constant_type(name, **kwargs)
27
+ # Choose methods of shared ancestors
28
+ values.first&.select_constant_type(name, **kwargs) || RBS::Types::Bases::Any.new(location: nil)
29
+ end
30
+
31
+ # @param name [String, Symbol]
32
+ # @return [Array<String>]
33
+ def select_constant_paths(name, **kwargs)
34
+ # Choose methods of shared ancestors
35
+ values.first&.select_constant_paths(name, **kwargs) || []
36
+ end
37
+
38
+ # @return [IntersectionValue]
39
+ def singleton_class_value
40
+ UnionValue.new(*values.map(&:singleton_class_value))
41
+ end
42
+
43
+ # @return [IntersectionValue]
44
+ def instance_value
45
+ UnionValue.new(*values.map(&:instance_value))
46
+ end
47
+ end
48
+ end
49
+ end
50
+ end
@@ -1,9 +1,13 @@
1
1
  module Yoda
2
2
  module Model
3
+ # Each Value represents the result for symbolic execution.
3
4
  module Values
4
5
  require 'yoda/model/values/base'
6
+ require 'yoda/model/values/empty_value'
5
7
  require 'yoda/model/values/instance_value'
6
- require 'yoda/model/values/module_value'
8
+ require 'yoda/model/values/intersection_value'
9
+ require 'yoda/model/values/literal_value'
10
+ require 'yoda/model/values/union_value'
7
11
  end
8
12
  end
9
13
  end
@@ -0,0 +1,35 @@
1
+ require 'parslet'
2
+
3
+ module Yoda
4
+ module Model
5
+ class YardTypeParser < Parslet::Parser
6
+ rule(:method_name) { match('[a-z]') >> match('[a-zA-Z0-9_]').repeat }
7
+ rule(:duck_type) { str('#') >> method_name.as(:method_name) }
8
+ rule(:constant_name) { match('[A-Z]') >> match('[a-zA-Z0-9_]').repeat }
9
+ rule(:constant_full_name) { str('::').maybe >> (constant_name >> (str('::') | str('.'))).repeat >> constant_name }
10
+ rule(:value_name) { match('[a-z0-9]') >> match('[a-zA-Z0-9_]').repeat }
11
+
12
+ rule(:space) { match('\s').repeat(1) }
13
+ rule(:space?) { space.maybe }
14
+
15
+ rule(:constant_type) { value_name.as(:value) | constant_full_name.as(:instance_type) }
16
+
17
+ rule(:key_value_type) { constant_type.as(:base_type) >> str('{') >> space? >> type.as(:key_type) >> space? >> str('=>') >> space? >> type.as(:value_type) >> space? >> str('}') }
18
+ rule(:sequence_type) { constant_type.as(:base_type) >> str('(') >> space? >> types.as(:value_types) >> space? >> str(')') }
19
+ rule(:generic_type) { constant_type.as(:base_type) >> (str('<') >> space? >> type >> space? >> str('>')).repeat(1).as(:type_arguments) }
20
+
21
+ rule(:shorthand_key_value) { str('{') >> space? >> type.as(:key_type) >> space? >> str('=>') >> space? >> type.as(:value_type) >> space? >> str('}') }
22
+ rule(:shorthand_sequence) { str('(') >> space? >> types.as(:value_types) >> space? >> str(')') }
23
+ rule(:shorthand_array) { str('<') >> space? >> type.as(:type_in_array) >> space? >> str('>') }
24
+
25
+ rule(:union_type) { types.as(:types) }
26
+
27
+ rule(:single_type) { duck_type | shorthand_key_value | shorthand_array | shorthand_sequence | generic_type | key_value_type | sequence_type | constant_type }
28
+ rule(:types) { (single_type >> str(',') >> space?).repeat >> space? >> single_type }
29
+
30
+ rule(:type) { union_type }
31
+ rule(:base) { space? >> type >> space? }
32
+ root :base
33
+ end
34
+ end
35
+ end
data/lib/yoda/model.rb CHANGED
@@ -1,12 +1,17 @@
1
1
  module Yoda
2
2
  module Model
3
3
  require 'yoda/model/function_signatures'
4
+ require 'yoda/model/environment'
4
5
  require 'yoda/model/descriptions'
5
- require 'yoda/model/node_signature'
6
+ require 'yoda/model/lexical_context'
7
+ require 'yoda/model/node_signatures'
6
8
  require 'yoda/model/path'
9
+ require 'yoda/model/primary_source_inferencer'
7
10
  require 'yoda/model/scoped_path'
8
- require 'yoda/model/types'
11
+ require 'yoda/model/type_expressions'
9
12
  require 'yoda/model/values'
10
13
  require 'yoda/model/completion_item'
14
+ require 'yoda/model/parameters'
15
+ require 'yoda/model/yard_type_parser'
11
16
  end
12
17
  end
@@ -3,14 +3,15 @@ require 'parslet'
3
3
  module Yoda
4
4
  module Parsing
5
5
  class CommentTokenizer
6
- # @return [Sequence]
6
+ # @return [Array<Sequence, String>]
7
7
  def parse(str)
8
8
  Generator.new.apply(Tokenizer.new.parse(str))
9
9
  end
10
10
 
11
11
  class Tokenizer < Parslet::Parser
12
- rule(:space) { match('\s').repeat(1) }
12
+ rule(:space) { match('[\s&&[^\n]]').repeat(1) }
13
13
  rule(:space?) { space.maybe }
14
+ rule(:newline) { match('\n') }
14
15
 
15
16
  rule(:comment_begin) { str('#') }
16
17
  rule(:tag) { str('@') >> (str('!').maybe >> match('[a-zA-Z0-9_-]').repeat) }
@@ -20,7 +21,10 @@ module Yoda
20
21
 
21
22
  rule(:comment_token) { sign | name }
22
23
 
23
- rule(:base) { comment_begin.maybe >> space? >> tag.maybe.as(:tag) >> space? >> (comment_token.as(:token) >> space?).repeat.as(:tokens) }
24
+ rule(:tagline) { space? >> comment_begin.maybe >> space? >> tag.maybe.as(:tag) >> space? >> (comment_token.as(:token) >> space?).repeat.as(:tokens) }
25
+ rule(:textline) { space? >> comment_begin.maybe >> space? >> match('[^\n]*').as(:text) }
26
+ rule(:base) { (((tagline | textline) >> newline).repeat >> (tagline | textline).maybe).as(:lines) }
27
+
24
28
  root :base
25
29
  end
26
30
 
@@ -28,10 +32,13 @@ module Yoda
28
32
  rule(token: simple(:token)) { token }
29
33
  rule(tag: simple(:tag), tokens: sequence(:tokens)) { Sequence.new(tag: tag, tokens: tokens) }
30
34
  rule(tag: simple(:tag), tokens: simple(:token)) { Sequence.new(tag: tag, tokens: [token]) }
35
+ rule(text: simple(:text)) { Text.new(text) }
36
+ rule(lines: sequence(:lines)) { lines }
37
+ rule(lines: simple(:lines)) { [lines] }
31
38
  end
32
39
 
33
40
  class Sequence
34
- # @type Parslet::Slice | nil
41
+ # @return [Parslet::Slice, nil]
35
42
  attr_reader :tag
36
43
 
37
44
  # @param tag [Parslet::Slice, nil]
@@ -54,6 +61,16 @@ module Yoda
54
61
  @tokens
55
62
  end
56
63
  end
64
+
65
+ class Text
66
+ # @return [Parslet::Slice]
67
+ attr_reader :content
68
+
69
+ # @param content [Parslet::Slice]
70
+ def initialize(content)
71
+ @content = content
72
+ end
73
+ end
57
74
  end
58
75
  end
59
76
  end