Consistent coloring of defs #736
Merged
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
* Merge Callable and Kernel annotators * Use PsiElementVisitor instead of PsiRecursiveElementVisitor, so that macros in defmodule block don't get double annotated * Instead of erasing and then applying multiple TextAttributeKey, erase as before, but then merge the TextAttributeKey's TextAttributes and apply as single setEnforcedTextAttributes. For some reason, this fixes the inconsistency of whether PREDEFINED_CALL or MACRO_CALL is applied first. * In case of multiple resolveds, make those that need PREDEFINED_CALL to win.
Repository owner
deleted a comment
Jul 18, 2017
KronicDeth
added a commit
that referenced
this pull request
Jul 18, 2017
This was referenced Jul 18, 2017
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.
Fixes #536
Changelog
Bug Fixes
CallableandKernelannotatorsPsiElementVisitorinstead ofPsiRecursiveElementVisitor, so that macros indefmoduleblock don't get double annotated.TextAttributeKey, erase as before, but then merge theTextAttributeKey'sTextAttributesand apply as singlesetEnforcedTextAttributes. For some reason, this fixes the inconsistency of whetherPREDEFINED_CALLorMACRO_CALLis applied first.resolveds, make those that needPREDEFINED_CALLto win.