Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NodePattern: Allow comments #82

Merged
merged 1 commit into from
Aug 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

* [#70](https://github.com/rubocop-hq/rubocop-ast/pull/70): Add `NextNode` ([@marcandre][])
* [#85](https://github.com/rubocop-hq/rubocop-ast/pull/85): Add `IntNode#value` and `FloatNode#value`. ([@fatkodima][])
* [#82](https://github.com/rubocop-hq/rubocop-ast/pull/82): `NodePattern`: Allow comments ([@marcandre][])

### Bug fixes

Expand Down
16 changes: 16 additions & 0 deletions docs/modules/ROOT/pages/node_pattern.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,22 @@ def_node_matcher :interesting_call?, '(send _ %SOME_CALLS ...)'

Constants as arguments to custom methods are also supported.

== Comments

You may have comments in node patterns at the end of lines
by preceeding them with `'# '`:

[source,ruby]
----
def_node_matcher :complex_stuff, <<~PATTERN
(send
{#global_const?(:Kernel) nil?} # check for explicit call like Kernel.p too
{:p :pp} # let's consider `pp` also
$... # capture all arguments
)
PATTERN
----

== `nil` or `nil?`

Take a special attention to nil behavior:
Expand Down
5 changes: 4 additions & 1 deletion lib/rubocop/ast/node_pattern.rb
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ module AST
# # These arguments can be patterns themselves, in
# # which case a matcher responding to === will be
# # passed.
# '# comment' # comments are accepted at the end of lines
#
# You can nest arbitrarily deep:
#
Expand All @@ -122,6 +123,8 @@ class NodePattern
class Compiler
SYMBOL = %r{:(?:[\w+@*/?!<>=~|%^-]+|\[\]=?)}.freeze
IDENTIFIER = /[a-zA-Z_][a-zA-Z0-9_-]*/.freeze
COMMENT = /#\s.*$/.freeze

META = Regexp.union(
%w"( ) { } [ ] $< < > $... $ ! ^ ` ... + * ?"
).freeze
Expand Down Expand Up @@ -788,7 +791,7 @@ def substitute_cur_node(code, cur_node, first_cur_node: cur_node)
end

def self.tokens(pattern)
pattern.scan(TOKEN).grep_v(ONLY_SEPARATOR)
pattern.gsub(COMMENT, '').scan(TOKEN).grep_v(ONLY_SEPARATOR)
end

# This method minimizes the closure for our method
Expand Down
8 changes: 8 additions & 0 deletions spec/rubocop/ast/node_pattern_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1889,6 +1889,14 @@ def withargs(foo, bar, qux)
end
end

describe 'comments' do
let(:pattern) { "(int # We want an int\n$_) # Let's capture the value" }
let(:ruby) { '42' }
let(:captured_val) { 42 }

it_behaves_like 'single capture'
end

describe '.descend' do
let(:ruby) { '[[1, 2], 3]' }

Expand Down