solargraph 0.56.0 → 0.58.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.gitattributes +2 -0
- data/.github/workflows/linting.yml +127 -0
- data/.github/workflows/plugins.yml +183 -7
- data/.github/workflows/rspec.yml +55 -5
- data/.github/workflows/typecheck.yml +6 -3
- data/.gitignore +6 -0
- data/.overcommit.yml +72 -0
- data/.rspec +1 -0
- data/.rubocop.yml +66 -0
- data/.rubocop_todo.yml +1279 -0
- data/.yardopts +1 -0
- data/CHANGELOG.md +92 -1
- data/README.md +8 -4
- data/Rakefile +125 -13
- data/bin/solargraph +3 -0
- data/lib/solargraph/api_map/cache.rb +110 -109
- data/lib/solargraph/api_map/constants.rb +279 -0
- data/lib/solargraph/api_map/index.rb +193 -175
- data/lib/solargraph/api_map/source_to_yard.rb +97 -88
- data/lib/solargraph/api_map/store.rb +384 -266
- data/lib/solargraph/api_map.rb +945 -973
- data/lib/solargraph/bench.rb +1 -0
- data/lib/solargraph/complex_type/type_methods.rb +228 -222
- data/lib/solargraph/complex_type/unique_type.rb +482 -475
- data/lib/solargraph/complex_type.rb +444 -423
- data/lib/solargraph/convention/active_support_concern.rb +111 -0
- data/lib/solargraph/convention/base.rb +17 -0
- data/lib/solargraph/convention/data_definition/data_assignment_node.rb +61 -0
- data/lib/solargraph/convention/data_definition/data_definition_node.rb +91 -0
- data/lib/solargraph/convention/data_definition.rb +105 -0
- data/lib/solargraph/convention/gemspec.rb +3 -2
- data/lib/solargraph/convention/struct_definition/struct_assignment_node.rb +61 -60
- data/lib/solargraph/convention/struct_definition/struct_definition_node.rb +102 -100
- data/lib/solargraph/convention/struct_definition.rb +164 -101
- data/lib/solargraph/convention.rb +32 -2
- data/lib/solargraph/diagnostics/require_not_found.rb +53 -53
- data/lib/solargraph/diagnostics/rubocop.rb +118 -113
- data/lib/solargraph/diagnostics/rubocop_helpers.rb +68 -66
- data/lib/solargraph/diagnostics/type_check.rb +55 -55
- data/lib/solargraph/doc_map.rb +439 -405
- data/lib/solargraph/environ.rb +9 -2
- data/lib/solargraph/equality.rb +34 -33
- data/lib/solargraph/gem_pins.rb +98 -88
- data/lib/solargraph/language_server/host/diagnoser.rb +89 -89
- data/lib/solargraph/language_server/host/dispatch.rb +130 -128
- data/lib/solargraph/language_server/host/message_worker.rb +112 -109
- data/lib/solargraph/language_server/host/sources.rb +99 -99
- data/lib/solargraph/language_server/host.rb +878 -871
- data/lib/solargraph/language_server/message/base.rb +2 -1
- data/lib/solargraph/language_server/message/extended/check_gem_version.rb +114 -114
- data/lib/solargraph/language_server/message/extended/document.rb +23 -23
- data/lib/solargraph/language_server/message/text_document/completion.rb +56 -56
- data/lib/solargraph/language_server/message/text_document/definition.rb +40 -38
- data/lib/solargraph/language_server/message/text_document/document_symbol.rb +26 -26
- data/lib/solargraph/language_server/message/text_document/formatting.rb +148 -131
- data/lib/solargraph/language_server/message/text_document/hover.rb +58 -58
- data/lib/solargraph/language_server/message/text_document/signature_help.rb +24 -24
- data/lib/solargraph/language_server/message/text_document/type_definition.rb +25 -24
- data/lib/solargraph/language_server/message/workspace/did_change_workspace_folders.rb +2 -0
- data/lib/solargraph/language_server/message/workspace/workspace_symbol.rb +23 -23
- data/lib/solargraph/language_server/progress.rb +8 -0
- data/lib/solargraph/language_server/request.rb +4 -1
- data/lib/solargraph/library.rb +683 -666
- data/lib/solargraph/location.rb +82 -79
- data/lib/solargraph/logging.rb +37 -28
- data/lib/solargraph/page.rb +3 -0
- data/lib/solargraph/parser/comment_ripper.rb +69 -62
- data/lib/solargraph/parser/flow_sensitive_typing.rb +255 -227
- data/lib/solargraph/parser/node_processor/base.rb +92 -87
- data/lib/solargraph/parser/node_processor.rb +62 -46
- data/lib/solargraph/parser/parser_gem/class_methods.rb +149 -159
- data/lib/solargraph/parser/parser_gem/flawed_builder.rb +1 -0
- data/lib/solargraph/parser/parser_gem/node_chainer.rb +166 -164
- data/lib/solargraph/parser/parser_gem/node_methods.rb +486 -497
- data/lib/solargraph/parser/parser_gem/node_processors/and_node.rb +22 -21
- data/lib/solargraph/parser/parser_gem/node_processors/args_node.rb +59 -59
- data/lib/solargraph/parser/parser_gem/node_processors/begin_node.rb +15 -15
- data/lib/solargraph/parser/parser_gem/node_processors/block_node.rb +46 -45
- data/lib/solargraph/parser/parser_gem/node_processors/casgn_node.rb +1 -21
- data/lib/solargraph/parser/parser_gem/node_processors/def_node.rb +53 -53
- data/lib/solargraph/parser/parser_gem/node_processors/if_node.rb +23 -21
- data/lib/solargraph/parser/parser_gem/node_processors/ivasgn_node.rb +40 -40
- data/lib/solargraph/parser/parser_gem/node_processors/lvasgn_node.rb +29 -29
- data/lib/solargraph/parser/parser_gem/node_processors/masgn_node.rb +59 -53
- data/lib/solargraph/parser/parser_gem/node_processors/namespace_node.rb +0 -22
- data/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb +98 -41
- data/lib/solargraph/parser/parser_gem/node_processors/orasgn_node.rb +17 -16
- data/lib/solargraph/parser/parser_gem/node_processors/resbody_node.rb +38 -37
- data/lib/solargraph/parser/parser_gem/node_processors/sclass_node.rb +52 -43
- data/lib/solargraph/parser/parser_gem/node_processors/send_node.rb +291 -271
- data/lib/solargraph/parser/parser_gem/node_processors/sym_node.rb +1 -0
- data/lib/solargraph/parser/parser_gem/node_processors/while_node.rb +29 -29
- data/lib/solargraph/parser/parser_gem/node_processors.rb +70 -66
- data/lib/solargraph/parser/region.rb +69 -66
- data/lib/solargraph/parser/snippet.rb +17 -15
- data/lib/solargraph/pin/base.rb +729 -651
- data/lib/solargraph/pin/base_variable.rb +126 -125
- data/lib/solargraph/pin/block.rb +104 -103
- data/lib/solargraph/pin/breakable.rb +9 -9
- data/lib/solargraph/pin/callable.rb +231 -218
- data/lib/solargraph/pin/closure.rb +72 -74
- data/lib/solargraph/pin/common.rb +79 -75
- data/lib/solargraph/pin/constant.rb +2 -0
- data/lib/solargraph/pin/conversions.rb +123 -123
- data/lib/solargraph/pin/delegated_method.rb +120 -120
- data/lib/solargraph/pin/documenting.rb +114 -114
- data/lib/solargraph/pin/instance_variable.rb +34 -34
- data/lib/solargraph/pin/keyword.rb +20 -20
- data/lib/solargraph/pin/local_variable.rb +75 -76
- data/lib/solargraph/pin/method.rb +672 -651
- data/lib/solargraph/pin/method_alias.rb +34 -31
- data/lib/solargraph/pin/namespace.rb +115 -115
- data/lib/solargraph/pin/parameter.rb +275 -261
- data/lib/solargraph/pin/proxy_type.rb +39 -35
- data/lib/solargraph/pin/reference/override.rb +47 -33
- data/lib/solargraph/pin/reference/superclass.rb +15 -10
- data/lib/solargraph/pin/reference.rb +39 -22
- data/lib/solargraph/pin/search.rb +61 -56
- data/lib/solargraph/pin/signature.rb +61 -59
- data/lib/solargraph/pin/symbol.rb +53 -48
- data/lib/solargraph/pin/until.rb +18 -18
- data/lib/solargraph/pin/while.rb +18 -18
- data/lib/solargraph/pin.rb +44 -44
- data/lib/solargraph/pin_cache.rb +245 -185
- data/lib/solargraph/position.rb +132 -116
- data/lib/solargraph/range.rb +112 -107
- data/lib/solargraph/rbs_map/conversions.rb +823 -773
- data/lib/solargraph/rbs_map/core_fills.rb +18 -0
- data/lib/solargraph/rbs_map/core_map.rb +58 -51
- data/lib/solargraph/rbs_map/stdlib_map.rb +43 -43
- data/lib/solargraph/rbs_map.rb +163 -150
- data/lib/solargraph/shell.rb +352 -268
- data/lib/solargraph/source/chain/call.rb +337 -333
- data/lib/solargraph/source/chain/constant.rb +26 -89
- data/lib/solargraph/source/chain/hash.rb +34 -34
- data/lib/solargraph/source/chain/if.rb +28 -28
- data/lib/solargraph/source/chain/instance_variable.rb +13 -13
- data/lib/solargraph/source/chain/link.rb +11 -2
- data/lib/solargraph/source/chain/literal.rb +48 -48
- data/lib/solargraph/source/chain/or.rb +23 -23
- data/lib/solargraph/source/chain.rb +291 -282
- data/lib/solargraph/source/change.rb +82 -82
- data/lib/solargraph/source/cursor.rb +166 -167
- data/lib/solargraph/source/encoding_fixes.rb +23 -23
- data/lib/solargraph/source/source_chainer.rb +194 -194
- data/lib/solargraph/source/updater.rb +55 -55
- data/lib/solargraph/source.rb +498 -495
- data/lib/solargraph/source_map/clip.rb +226 -234
- data/lib/solargraph/source_map/data.rb +34 -30
- data/lib/solargraph/source_map/mapper.rb +259 -259
- data/lib/solargraph/source_map.rb +212 -200
- data/lib/solargraph/type_checker/checks.rb +124 -124
- data/lib/solargraph/type_checker/param_def.rb +37 -35
- data/lib/solargraph/type_checker/problem.rb +32 -32
- data/lib/solargraph/type_checker/rules.rb +84 -62
- data/lib/solargraph/type_checker.rb +814 -699
- data/lib/solargraph/version.rb +5 -5
- data/lib/solargraph/workspace/config.rb +255 -239
- data/lib/solargraph/workspace/require_paths.rb +97 -0
- data/lib/solargraph/workspace.rb +220 -249
- data/lib/solargraph/yard_map/helpers.rb +44 -16
- data/lib/solargraph/yard_map/mapper/to_constant.rb +5 -5
- data/lib/solargraph/yard_map/mapper/to_method.rb +130 -134
- data/lib/solargraph/yard_map/mapper/to_namespace.rb +31 -30
- data/lib/solargraph/yard_map/mapper.rb +79 -79
- data/lib/solargraph/yard_map/to_method.rb +89 -88
- data/lib/solargraph/yardoc.rb +87 -49
- data/lib/solargraph.rb +105 -90
- data/rbs/fills/bundler/0/bundler.rbs +4271 -0
- data/rbs/fills/open3/0/open3.rbs +172 -0
- data/rbs/fills/rubygems/0/basic_specification.rbs +326 -0
- data/rbs/fills/rubygems/0/errors.rbs +364 -0
- data/rbs/fills/rubygems/0/spec_fetcher.rbs +107 -0
- data/rbs/fills/rubygems/0/specification.rbs +1753 -0
- data/rbs/fills/{tuple.rbs → tuple/tuple.rbs} +2 -3
- data/rbs/shims/ast/0/node.rbs +5 -0
- data/rbs/shims/ast/2.4/.rbs_meta.yaml +9 -0
- data/rbs/shims/ast/2.4/ast.rbs +73 -0
- data/rbs/shims/parser/3.2.0.1/builders/default.rbs +195 -0
- data/rbs/shims/parser/3.2.0.1/manifest.yaml +7 -0
- data/rbs/shims/parser/3.2.0.1/parser.rbs +201 -0
- data/rbs/shims/parser/3.2.0.1/polyfill.rbs +4 -0
- data/rbs/shims/thor/1.2.0.1/.rbs_meta.yaml +9 -0
- data/rbs/shims/thor/1.2.0.1/manifest.yaml +7 -0
- data/rbs/shims/thor/1.2.0.1/thor.rbs +17 -0
- data/rbs_collection.yaml +4 -4
- data/solargraph.gemspec +26 -5
- metadata +187 -15
- data/lib/.rubocop.yml +0 -22
- data/lib/solargraph/parser/node_methods.rb +0 -97
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Solargraph
|
|
4
|
+
module Convention
|
|
5
|
+
# ActiveSupport::Concern is syntactic sugar for a common
|
|
6
|
+
# pattern to include class methods while mixing-in a Module
|
|
7
|
+
# See https://api.rubyonrails.org/classes/ActiveSupport/Concern.html
|
|
8
|
+
class ActiveSupportConcern < Base
|
|
9
|
+
include Logging
|
|
10
|
+
|
|
11
|
+
# @return [Array<Pin::Base>]
|
|
12
|
+
attr_reader :pins
|
|
13
|
+
|
|
14
|
+
# @param api_map [ApiMap]
|
|
15
|
+
# @param rooted_tag [String]
|
|
16
|
+
# @param scope [Symbol] :class or :instance
|
|
17
|
+
# @param visibility [Array<Symbol>] :public, :protected, and/or :private
|
|
18
|
+
# @param deep [Boolean] whether to include methods from included modules
|
|
19
|
+
# @param skip [Set<String>]
|
|
20
|
+
# @param _no_core [Boolean]n whether to skip core methods
|
|
21
|
+
def object api_map, rooted_tag, scope, visibility, deep, skip, _no_core
|
|
22
|
+
moo = ObjectProcessor.new(api_map, rooted_tag, scope, visibility, deep, skip)
|
|
23
|
+
moo.environ
|
|
24
|
+
end
|
|
25
|
+
|
|
26
|
+
# yard-activesupport-concern pulls methods inside
|
|
27
|
+
# 'class_methods' blocks into main class visible from YARD
|
|
28
|
+
#
|
|
29
|
+
# @param _doc_map [DocMap]
|
|
30
|
+
def global _doc_map
|
|
31
|
+
Environ.new(yard_plugins: ['activesupport-concern'])
|
|
32
|
+
end
|
|
33
|
+
|
|
34
|
+
# Process an object to add any class methods brought in via
|
|
35
|
+
# ActiveSupport::Concern
|
|
36
|
+
class ObjectProcessor
|
|
37
|
+
include Logging
|
|
38
|
+
|
|
39
|
+
attr_reader :environ
|
|
40
|
+
|
|
41
|
+
# @param api_map [ApiMap]
|
|
42
|
+
# @param rooted_tag [String] the tag of the class or module being processed
|
|
43
|
+
# @param scope [Symbol] :class or :instance
|
|
44
|
+
# @param visibility [Array<Symbol>] :public, :protected, and/or :private
|
|
45
|
+
# @param deep [Boolean] whether to include methods from included modules
|
|
46
|
+
# @param skip [Set<String>] a set of tags to skip
|
|
47
|
+
def initialize api_map, rooted_tag, scope, visibility, deep, skip
|
|
48
|
+
@api_map = api_map
|
|
49
|
+
@rooted_tag = rooted_tag
|
|
50
|
+
@scope = scope
|
|
51
|
+
@visibility = visibility
|
|
52
|
+
@deep = deep
|
|
53
|
+
@skip = skip
|
|
54
|
+
|
|
55
|
+
@environ = Environ.new
|
|
56
|
+
return unless scope == :class
|
|
57
|
+
|
|
58
|
+
@rooted_type = ComplexType.parse(rooted_tag).force_rooted
|
|
59
|
+
@fqns = rooted_type.namespace
|
|
60
|
+
@namespace_pin = api_map.get_path_pins(fqns).select { |p| p.is_a?(Pin::Namespace) }.first
|
|
61
|
+
|
|
62
|
+
api_map.get_includes(fqns).reverse.each do |include_tag|
|
|
63
|
+
process_include include_tag
|
|
64
|
+
end
|
|
65
|
+
end
|
|
66
|
+
|
|
67
|
+
private
|
|
68
|
+
|
|
69
|
+
attr_reader :api_map, :rooted_tag, :rooted_type, :scope,
|
|
70
|
+
:visibility, :deep, :skip, :namespace_pin,
|
|
71
|
+
:fqns
|
|
72
|
+
|
|
73
|
+
# @param include_tag [Pin::Reference::Include] the include reference pin
|
|
74
|
+
#
|
|
75
|
+
# @return [void]
|
|
76
|
+
def process_include include_tag
|
|
77
|
+
rooted_include_tag = api_map.dereference(include_tag)
|
|
78
|
+
return if rooted_include_tag.nil?
|
|
79
|
+
logger.debug do
|
|
80
|
+
"ActiveSupportConcern#object(#{fqns}, #{scope}, #{visibility}, #{deep}) - " \
|
|
81
|
+
"Handling class include include_tag=#{include_tag}"
|
|
82
|
+
end
|
|
83
|
+
module_extends = api_map.get_extends(rooted_include_tag).map(&:type).map(&:to_s)
|
|
84
|
+
logger.debug do
|
|
85
|
+
"ActiveSupportConcern#object(#{fqns}, #{scope}, #{visibility}, #{deep}) - " \
|
|
86
|
+
"found module extends of #{rooted_include_tag}: #{module_extends}"
|
|
87
|
+
end
|
|
88
|
+
return unless module_extends.include? 'ActiveSupport::Concern'
|
|
89
|
+
included_class_pins = api_map.inner_get_methods_from_reference(rooted_include_tag, namespace_pin, rooted_type,
|
|
90
|
+
:class, visibility, deep, skip, true)
|
|
91
|
+
logger.debug do
|
|
92
|
+
"ActiveSupportConcern#object(#{fqns}, #{scope}, #{visibility}, #{deep}) - " \
|
|
93
|
+
"Found #{included_class_pins.length} inluded class methods for #{rooted_include_tag}"
|
|
94
|
+
end
|
|
95
|
+
environ.pins.concat included_class_pins
|
|
96
|
+
# another pattern is to put class methods inside a submodule
|
|
97
|
+
classmethods_include_tag = "#{rooted_include_tag}::ClassMethods"
|
|
98
|
+
included_classmethods_pins =
|
|
99
|
+
api_map.inner_get_methods_from_reference(classmethods_include_tag, namespace_pin, rooted_type,
|
|
100
|
+
:instance, visibility, deep, skip, true)
|
|
101
|
+
logger.debug do
|
|
102
|
+
"ActiveSupportConcern#object(#{fqns}, #{scope}, #{visibility}, #{deep}) - " \
|
|
103
|
+
"Found #{included_classmethods_pins.length} included classmethod " \
|
|
104
|
+
"class methods for #{classmethods_include_tag}"
|
|
105
|
+
end
|
|
106
|
+
environ.pins.concat included_classmethods_pins
|
|
107
|
+
end
|
|
108
|
+
end
|
|
109
|
+
end
|
|
110
|
+
end
|
|
111
|
+
end
|
|
@@ -28,6 +28,23 @@ module Solargraph
|
|
|
28
28
|
def global doc_map
|
|
29
29
|
EMPTY_ENVIRON
|
|
30
30
|
end
|
|
31
|
+
|
|
32
|
+
# Provides any additional method pins based on e the described object.
|
|
33
|
+
#
|
|
34
|
+
# @param api_map [ApiMap]
|
|
35
|
+
# @param rooted_tag [String] A fully qualified namespace, with
|
|
36
|
+
# generic parameter values if applicable
|
|
37
|
+
# @param scope [Symbol] :class or :instance
|
|
38
|
+
# @param visibility [Array<Symbol>] :public, :protected, and/or :private
|
|
39
|
+
# @param deep [Boolean]
|
|
40
|
+
# @param skip [Set<String>]
|
|
41
|
+
# @param no_core [Boolean] Skip core classes if true
|
|
42
|
+
#
|
|
43
|
+
# @return [Environ]
|
|
44
|
+
def object api_map, rooted_tag, scope, visibility,
|
|
45
|
+
deep, skip, no_core
|
|
46
|
+
EMPTY_ENVIRON
|
|
47
|
+
end
|
|
31
48
|
end
|
|
32
49
|
end
|
|
33
50
|
end
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Solargraph
|
|
4
|
+
module Convention
|
|
5
|
+
module DataDefinition
|
|
6
|
+
# A node wrapper for a Data definition via const assignment.
|
|
7
|
+
# @example
|
|
8
|
+
# MyData = Data.new(:bar, :baz) do
|
|
9
|
+
# def foo
|
|
10
|
+
# end
|
|
11
|
+
# end
|
|
12
|
+
class DataAssignmentNode < DataDefintionNode
|
|
13
|
+
class << self
|
|
14
|
+
# @example
|
|
15
|
+
# s(:casgn, nil, :Foo,
|
|
16
|
+
# s(:block,
|
|
17
|
+
# s(:send,
|
|
18
|
+
# s(:const, nil, :Data), :define,
|
|
19
|
+
# s(:sym, :bar),
|
|
20
|
+
# s(:sym, :baz)),
|
|
21
|
+
# s(:args),
|
|
22
|
+
# s(:def, :foo,
|
|
23
|
+
# s(:args),
|
|
24
|
+
# s(:send, nil, :bar))))
|
|
25
|
+
# @param node [::Parser::AST::Node]
|
|
26
|
+
def match?(node)
|
|
27
|
+
return false unless node&.type == :casgn
|
|
28
|
+
return false if node.children[2].nil?
|
|
29
|
+
|
|
30
|
+
data_node = if node.children[2].type == :block
|
|
31
|
+
node.children[2].children[0]
|
|
32
|
+
else
|
|
33
|
+
node.children[2]
|
|
34
|
+
end
|
|
35
|
+
|
|
36
|
+
data_definition_node?(data_node)
|
|
37
|
+
end
|
|
38
|
+
end
|
|
39
|
+
|
|
40
|
+
def class_name
|
|
41
|
+
if node.children[0]
|
|
42
|
+
Parser::NodeMethods.unpack_name(node.children[0]) + "::#{node.children[1]}"
|
|
43
|
+
else
|
|
44
|
+
node.children[1].to_s
|
|
45
|
+
end
|
|
46
|
+
end
|
|
47
|
+
|
|
48
|
+
private
|
|
49
|
+
|
|
50
|
+
# @return [Parser::AST::Node]
|
|
51
|
+
def data_node
|
|
52
|
+
if node.children[2].type == :block
|
|
53
|
+
node.children[2].children[0]
|
|
54
|
+
else
|
|
55
|
+
node.children[2]
|
|
56
|
+
end
|
|
57
|
+
end
|
|
58
|
+
end
|
|
59
|
+
end
|
|
60
|
+
end
|
|
61
|
+
end
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Solargraph
|
|
4
|
+
module Convention
|
|
5
|
+
module DataDefinition
|
|
6
|
+
# A node wrapper for a Data definition via inheritance.
|
|
7
|
+
# @example
|
|
8
|
+
# class MyData < Data.new(:bar, :baz)
|
|
9
|
+
# def foo
|
|
10
|
+
# end
|
|
11
|
+
# end
|
|
12
|
+
class DataDefintionNode
|
|
13
|
+
class << self
|
|
14
|
+
# @example
|
|
15
|
+
# s(:class,
|
|
16
|
+
# s(:const, nil, :Foo),
|
|
17
|
+
# s(:send,
|
|
18
|
+
# s(:const, nil, :Data), :define,
|
|
19
|
+
# s(:sym, :bar),
|
|
20
|
+
# s(:sym, :baz)),
|
|
21
|
+
# s(:hash,
|
|
22
|
+
# s(:pair,
|
|
23
|
+
# s(:sym, :keyword_init),
|
|
24
|
+
# s(:true)))),
|
|
25
|
+
# s(:def, :foo,
|
|
26
|
+
# s(:args),
|
|
27
|
+
# s(:send, nil, :bar)))
|
|
28
|
+
#
|
|
29
|
+
# @param node [Parser::AST::Node]
|
|
30
|
+
def match?(node)
|
|
31
|
+
return false unless node&.type == :class
|
|
32
|
+
|
|
33
|
+
data_definition_node?(node.children[1])
|
|
34
|
+
end
|
|
35
|
+
|
|
36
|
+
private
|
|
37
|
+
|
|
38
|
+
# @param data_node [Parser::AST::Node]
|
|
39
|
+
# @return [Boolean]
|
|
40
|
+
def data_definition_node?(data_node)
|
|
41
|
+
return false unless data_node.is_a?(::Parser::AST::Node)
|
|
42
|
+
return false unless data_node&.type == :send
|
|
43
|
+
return false unless data_node.children[0]&.type == :const
|
|
44
|
+
return false unless data_node.children[0].children[1] == :Data
|
|
45
|
+
return false unless data_node.children[1] == :define
|
|
46
|
+
|
|
47
|
+
true
|
|
48
|
+
end
|
|
49
|
+
end
|
|
50
|
+
|
|
51
|
+
# @param node [Parser::AST::Node]
|
|
52
|
+
def initialize(node)
|
|
53
|
+
@node = node
|
|
54
|
+
end
|
|
55
|
+
|
|
56
|
+
# @return [String]
|
|
57
|
+
def class_name
|
|
58
|
+
Parser::NodeMethods.unpack_name(node)
|
|
59
|
+
end
|
|
60
|
+
|
|
61
|
+
# @return [Array<Array(Parser::AST::Node, String)>]
|
|
62
|
+
def attributes
|
|
63
|
+
data_attribute_nodes.map do |data_def_param|
|
|
64
|
+
next unless data_def_param.type == :sym
|
|
65
|
+
[data_def_param, data_def_param.children[0].to_s]
|
|
66
|
+
end.compact
|
|
67
|
+
end
|
|
68
|
+
|
|
69
|
+
# @return [Parser::AST::Node]
|
|
70
|
+
def body_node
|
|
71
|
+
node.children[2]
|
|
72
|
+
end
|
|
73
|
+
|
|
74
|
+
private
|
|
75
|
+
|
|
76
|
+
# @return [Parser::AST::Node]
|
|
77
|
+
attr_reader :node
|
|
78
|
+
|
|
79
|
+
# @return [Parser::AST::Node, nil]
|
|
80
|
+
def data_node
|
|
81
|
+
node.children[1]
|
|
82
|
+
end
|
|
83
|
+
|
|
84
|
+
# @return [Array<Parser::AST::Node>]
|
|
85
|
+
def data_attribute_nodes
|
|
86
|
+
data_node.children[2..-1]
|
|
87
|
+
end
|
|
88
|
+
end
|
|
89
|
+
end
|
|
90
|
+
end
|
|
91
|
+
end
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Solargraph
|
|
4
|
+
module Convention
|
|
5
|
+
module DataDefinition
|
|
6
|
+
autoload :DataDefintionNode, 'solargraph/convention/data_definition/data_definition_node'
|
|
7
|
+
autoload :DataAssignmentNode, 'solargraph/convention/data_definition/data_assignment_node'
|
|
8
|
+
|
|
9
|
+
module NodeProcessors
|
|
10
|
+
class DataNode < Parser::NodeProcessor::Base
|
|
11
|
+
# @return [Boolean] continue processing the next processor of the same node.
|
|
12
|
+
def process
|
|
13
|
+
return true if data_definition_node.nil?
|
|
14
|
+
|
|
15
|
+
loc = get_node_location(node)
|
|
16
|
+
nspin = Solargraph::Pin::Namespace.new(
|
|
17
|
+
type: :class,
|
|
18
|
+
location: loc,
|
|
19
|
+
closure: region.closure,
|
|
20
|
+
name: data_definition_node.class_name,
|
|
21
|
+
comments: comments_for(node),
|
|
22
|
+
visibility: :public,
|
|
23
|
+
gates: region.closure.gates.freeze
|
|
24
|
+
)
|
|
25
|
+
pins.push nspin
|
|
26
|
+
|
|
27
|
+
# define initialize method
|
|
28
|
+
initialize_method_pin = Pin::Method.new(
|
|
29
|
+
name: 'initialize',
|
|
30
|
+
parameters: [],
|
|
31
|
+
scope: :instance,
|
|
32
|
+
location: get_node_location(node),
|
|
33
|
+
closure: nspin,
|
|
34
|
+
visibility: :private,
|
|
35
|
+
comments: comments_for(node)
|
|
36
|
+
)
|
|
37
|
+
|
|
38
|
+
# @todo Support both arg and kwarg initializers for Data.define
|
|
39
|
+
# Solargraph::SourceMap::Clip#complete_keyword_parameters does not seem to currently take into account [Pin::Method#signatures] hence we only one for :kwarg
|
|
40
|
+
pins.push initialize_method_pin
|
|
41
|
+
|
|
42
|
+
data_definition_node.attributes.map do |attribute_node, attribute_name|
|
|
43
|
+
initialize_method_pin.parameters.push(
|
|
44
|
+
Pin::Parameter.new(
|
|
45
|
+
name: attribute_name,
|
|
46
|
+
decl: :kwarg,
|
|
47
|
+
location: get_node_location(attribute_node),
|
|
48
|
+
closure: initialize_method_pin
|
|
49
|
+
)
|
|
50
|
+
)
|
|
51
|
+
end
|
|
52
|
+
|
|
53
|
+
# define attribute readers and instance variables
|
|
54
|
+
data_definition_node.attributes.each do |attribute_node, attribute_name|
|
|
55
|
+
name = attribute_name.to_s
|
|
56
|
+
method_pin = Pin::Method.new(
|
|
57
|
+
name: name,
|
|
58
|
+
parameters: [],
|
|
59
|
+
scope: :instance,
|
|
60
|
+
location: get_node_location(attribute_node),
|
|
61
|
+
closure: nspin,
|
|
62
|
+
comments: attribute_comments(attribute_node, attribute_name),
|
|
63
|
+
visibility: :public
|
|
64
|
+
)
|
|
65
|
+
|
|
66
|
+
pins.push method_pin
|
|
67
|
+
|
|
68
|
+
pins.push Pin::InstanceVariable.new(name: "@#{attribute_name}",
|
|
69
|
+
closure: method_pin,
|
|
70
|
+
location: get_node_location(attribute_node),
|
|
71
|
+
comments: attribute_comments(attribute_node, attribute_name))
|
|
72
|
+
end
|
|
73
|
+
|
|
74
|
+
process_children region.update(closure: nspin, visibility: :public)
|
|
75
|
+
|
|
76
|
+
false
|
|
77
|
+
end
|
|
78
|
+
|
|
79
|
+
private
|
|
80
|
+
|
|
81
|
+
# @return [DataDefintionNode, nil]
|
|
82
|
+
def data_definition_node
|
|
83
|
+
@data_definition_node ||= if DataDefintionNode.match?(node)
|
|
84
|
+
DataDefintionNode.new(node)
|
|
85
|
+
elsif DataAssignmentNode.match?(node)
|
|
86
|
+
DataAssignmentNode.new(node)
|
|
87
|
+
end
|
|
88
|
+
end
|
|
89
|
+
|
|
90
|
+
# @param attribute_node [Parser::AST::Node]
|
|
91
|
+
# @param attribute_name [String]
|
|
92
|
+
# @return [String, nil]
|
|
93
|
+
def attribute_comments(attribute_node, attribute_name)
|
|
94
|
+
data_comments = comments_for(attribute_node)
|
|
95
|
+
return if data_comments.nil? || data_comments.empty?
|
|
96
|
+
|
|
97
|
+
data_comments.split("\n").find do |row|
|
|
98
|
+
row.include?(attribute_name)
|
|
99
|
+
end&.gsub('@param', '@return')&.gsub(attribute_name, '')
|
|
100
|
+
end
|
|
101
|
+
end
|
|
102
|
+
end
|
|
103
|
+
end
|
|
104
|
+
end
|
|
105
|
+
end
|
|
@@ -4,7 +4,7 @@ module Solargraph
|
|
|
4
4
|
module Convention
|
|
5
5
|
class Gemspec < Base
|
|
6
6
|
def local source_map
|
|
7
|
-
return EMPTY_ENVIRON unless File.basename(source_map.filename).end_with?('.gemspec')
|
|
7
|
+
return Convention::Base::EMPTY_ENVIRON unless File.basename(source_map.filename).end_with?('.gemspec')
|
|
8
8
|
@environ ||= Environ.new(
|
|
9
9
|
requires: ['rubygems'],
|
|
10
10
|
pins: [
|
|
@@ -12,7 +12,8 @@ module Solargraph
|
|
|
12
12
|
'Gem::Specification.new',
|
|
13
13
|
%(
|
|
14
14
|
@yieldparam [self]
|
|
15
|
-
)
|
|
15
|
+
),
|
|
16
|
+
source: :gemspec
|
|
16
17
|
)
|
|
17
18
|
]
|
|
18
19
|
)
|
|
@@ -1,60 +1,61 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
module Solargraph
|
|
4
|
-
module Convention
|
|
5
|
-
module StructDefinition
|
|
6
|
-
# A node wrapper for a Struct definition via const assignment.
|
|
7
|
-
# @example
|
|
8
|
-
# MyStruct = Struct.new(:bar, :baz) do
|
|
9
|
-
# def foo
|
|
10
|
-
# end
|
|
11
|
-
# end
|
|
12
|
-
class StructAssignmentNode < StructDefintionNode
|
|
13
|
-
class << self
|
|
14
|
-
# @example
|
|
15
|
-
# s(:casgn, nil, :Foo,
|
|
16
|
-
# s(:block,
|
|
17
|
-
# s(:send,
|
|
18
|
-
# s(:const, nil, :Struct), :new,
|
|
19
|
-
# s(:sym, :bar),
|
|
20
|
-
# s(:sym, :baz)),
|
|
21
|
-
# s(:args),
|
|
22
|
-
# s(:def, :foo,
|
|
23
|
-
# s(:args),
|
|
24
|
-
# s(:send, nil, :bar))))
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
return false
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
end
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Solargraph
|
|
4
|
+
module Convention
|
|
5
|
+
module StructDefinition
|
|
6
|
+
# A node wrapper for a Struct definition via const assignment.
|
|
7
|
+
# @example
|
|
8
|
+
# MyStruct = Struct.new(:bar, :baz) do
|
|
9
|
+
# def foo
|
|
10
|
+
# end
|
|
11
|
+
# end
|
|
12
|
+
class StructAssignmentNode < StructDefintionNode
|
|
13
|
+
class << self
|
|
14
|
+
# @example
|
|
15
|
+
# s(:casgn, nil, :Foo,
|
|
16
|
+
# s(:block,
|
|
17
|
+
# s(:send,
|
|
18
|
+
# s(:const, nil, :Struct), :new,
|
|
19
|
+
# s(:sym, :bar),
|
|
20
|
+
# s(:sym, :baz)),
|
|
21
|
+
# s(:args),
|
|
22
|
+
# s(:def, :foo,
|
|
23
|
+
# s(:args),
|
|
24
|
+
# s(:send, nil, :bar))))
|
|
25
|
+
# @param node [Parser::AST::Node]
|
|
26
|
+
def match?(node)
|
|
27
|
+
return false unless node&.type == :casgn
|
|
28
|
+
return false if node.children[2].nil?
|
|
29
|
+
|
|
30
|
+
struct_node = if node.children[2].type == :block
|
|
31
|
+
node.children[2].children[0]
|
|
32
|
+
else
|
|
33
|
+
node.children[2]
|
|
34
|
+
end
|
|
35
|
+
|
|
36
|
+
struct_definition_node?(struct_node)
|
|
37
|
+
end
|
|
38
|
+
end
|
|
39
|
+
|
|
40
|
+
def class_name
|
|
41
|
+
if node.children[0]
|
|
42
|
+
Parser::NodeMethods.unpack_name(node.children[0]) + "::#{node.children[1]}"
|
|
43
|
+
else
|
|
44
|
+
node.children[1].to_s
|
|
45
|
+
end
|
|
46
|
+
end
|
|
47
|
+
|
|
48
|
+
private
|
|
49
|
+
|
|
50
|
+
# @return [Parser::AST::Node]
|
|
51
|
+
def struct_node
|
|
52
|
+
if node.children[2].type == :block
|
|
53
|
+
node.children[2].children[0]
|
|
54
|
+
else
|
|
55
|
+
node.children[2]
|
|
56
|
+
end
|
|
57
|
+
end
|
|
58
|
+
end
|
|
59
|
+
end
|
|
60
|
+
end
|
|
61
|
+
end
|