-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Add __escape__/1 and use it to fix Regex escaping in OTP28.1 #14720
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
Merged
+149
−18
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
f47e748
Use new OTP28.1 :re.import in escaped regex AST
sabiwara bf77434
Without cheating: defining __escape__/1
sabiwara 602096f
Remove special escape clause for module attribute
sabiwara 6ef94c5
Move exclude tag to test helper
sabiwara c3be329
Document __escape__/1 in Macro.escape/2 docs
sabiwara f490780
Rephrase documentation
sabiwara 5814e03
Minor doc tweaks
sabiwara 8b0e498
Minor doc tweak
sabiwara File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,9 @@ | |
%% SPDX-FileCopyrightText: 2012 Plataformatec | ||
|
||
-module(elixir_quote). | ||
|
||
-feature(maybe_expr, enable). | ||
|
||
-export([escape/3, linify/3, linify_with_context_counter/3, build/7, quote/2, has_unquotes/1, fun_to_quoted/1]). | ||
-export([dot/5, tail_list/3, list/2, validate_runtime/2, shallow_validate_ast/1]). %% Quote callbacks | ||
|
||
|
@@ -169,8 +172,17 @@ do_escape(BitString, _) when is_bitstring(BitString) -> | |
end; | ||
|
||
do_escape(Map, Q) when is_map(Map) -> | ||
TT = [escape_map_key_value(K, V, Map, Q) || {K, V} <- lists:sort(maps:to_list(Map))], | ||
{'%{}', [], TT}; | ||
maybe | ||
#{'__struct__' := Module} ?= Map, | ||
true ?= is_atom(Module), | ||
{module, Module} ?= code:ensure_loaded(Module), | ||
true ?= erlang:function_exported(Module, '__escape__', 1), | ||
Module:'__escape__'(Map) | ||
else | ||
_ -> | ||
TT = [escape_map_key_value(K, V, Map, Q) || {K, V} <- lists:sort(maps:to_list(Map))], | ||
{'%{}', [], TT} | ||
end; | ||
Comment on lines
+175
to
+185
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note: We can finally use Since we're requiring OTP26, there is no runtime flag anymore, just the module one. |
||
|
||
do_escape([], _) -> | ||
[]; | ||
|
@@ -216,7 +228,7 @@ escape_map_key_value(K, V, Map, Q) -> | |
"(it must be defined within a function instead). ", (bad_escape_hint())/binary>>); | ||
true -> | ||
{do_quote(K, Q), do_quote(V, Q)} | ||
end. | ||
end. | ||
|
||
find_tuple_ref(Tuple, Index) when Index > tuple_size(Tuple) -> nil; | ||
find_tuple_ref(Tuple, Index) -> | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was wondering. Perhaps we could/should warn here, so that people notice and pro-actively bump to OTP28.1?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, warning sounds good to me!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hum I tried e1907ea but it seems to cause some bootstrapping issues.
Not too familiar with
IO.warn_once
, maybe will give up for now 😅There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So let's warn on boot in elixir.erl. Check if version is >= 28 and the import function is not available.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems to work, but would break too many integration tests in the CI?
d1536b4
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sabiwara I think for CI we will run on 28.1. So perhaps we add the warning in a separate PR, which we will merge once we move CI to 28.1. WDYT?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding the warning separately sounds good! 💜