Advanced macro expansion #2331
Merged
Advanced macro expansion #2331
Conversation
This file contains 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
vlad20012
force-pushed
the
macro-expansion
branch
2 times, most recently
from
2c36713
to
4e64740
Compare
|
Ok, now we can expand |
vlad20012
force-pushed
the
macro-expansion
branch
9 times, most recently
from
e979e84
to
f8ab87d
Compare
vlad20012
force-pushed
the
macro-expansion
branch
4 times, most recently
from
3d46a2c
to
0d42bcd
Compare
vlad20012
force-pushed
the
macro-expansion
branch
5 times, most recently
from
1d267d5
to
657dfdb
Compare
Undin
reviewed
Apr 4, 2018
|
|
||
| fun expandMacro(def: RsMacroDefinition, call: RsMacroCall): List<ExpansionResult>? { | ||
| // All std macros contain the only `impl`s which are not supported for now, so ignoring them | ||
| if(def.containingCargoTarget?.pkg?.origin == PackageOrigin.STDLIB) return null |
| field.isAccessible = true | ||
| val set = field.get(null) as MutableSet<String> | ||
| set.add("JMX") | ||
| set.add("RMI") |
|
|
||
| val expandedText = expansion.joinToString("\n") { it.text } | ||
|
|
||
| if(StringUtils.deleteWhitespace(expandedText) != StringUtils.deleteWhitespace(expectedExpansion)) { |
| ) { | ||
| fun match(arg: PsiBuilder): MacroSubstitution? { | ||
| return matchPartial(arg)?.let { result -> | ||
| if (!arg.eof()) { |
There was a problem hiding this comment.
Maybe return result from PsiBuilder.skipWhitespace() and use it instead of eof?
There was a problem hiding this comment.
But we just checking that we didn't reach the end of file (macro call body)
There was a problem hiding this comment.
Umm. eof is more informative in this case, i guess
| private data class MacroSubstitution( | ||
| val variables: Map<String, String>, | ||
| val groups: List<List<MacroSubstitution>> | ||
| ) |
There was a problem hiding this comment.
Let's add some docs about it. Especially about groups property
| def: RsMacroDefinition, | ||
| call: RsMacroCall | ||
| ): Pair<RsMacroDefinitionCase, MacroSubstitution>? { | ||
| val arg = createPsiBuilder(call, call.macroBody ?: return null) |
There was a problem hiding this comment.
I still don't like arg name - it doesn't contain any useful info
|
|
||
| private fun createPsiBuilder(context: PsiElement, text: String): PsiBuilder { | ||
| val psiMgr = PsiManager.getInstance(project) | ||
| val result = DummyHolderFactory.createHolder(psiMgr, context) |
vlad20012
force-pushed
the
macro-expansion
branch
2 times, most recently
from
15ed9c7
to
66c61a2
Compare
vlad20012
force-pushed
the
macro-expansion
branch
from
66c61a2
to
0220e1d
Compare
|
bors r+ |
Build failed |
|
bors r=undin |
|
🎉 |
This was referenced Apr 6, 2018
Closed
|
wow! |
|
Has it been packaged to latest rust plugin release? I am using latest plugin version but error_chain expansion still does not work |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The epic work begins here