Add #736 to changelogs

KronicDeth · Jul 18, 2017 · ac7b5f1 · ac7b5f1
1 parent 84c9f2c
commit ac7b5f1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -214,6 +214,11 @@
   * `Elixir.` prefix is stripped from test case names.
 * [#728](https://github.com/KronicDeth/intellij-elixir/pull/728) - Handle Elixir versions with non-numeric parts - [@pazustep](https://github.com/pazustep)
 * [#734](https://github.com/KronicDeth/intellij-elixir/pull/734) - Use a separate formatter, one GenEvent-based and one GenServer-based, depending on whether the SDK is >= 1.4.0 as that's when GenEvent was deprecated and GenServer was preferred. - [@KronicDeth](https://github.com/KronicDeth)
+* [#736](https://github.com/KronicDeth/intellij-elixir/pull/736) - [@KronicDeth](https://github.com/KronicDeth)
+  * 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 `resolved`s, make those that need `PREDEFINED_CALL` to win.
 
 ### Incompatible Changes
 * [#732](https://github.com/KronicDeth/intellij-elixir/pull/732) - [@KronicDeth](https://github.com/KronicDeth)

diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -158,6 +158,10 @@
             <li><code>Elixir.</code> prefix is stripped from test case names.</li>
             <li>Handle Elixir versions with non-numeric parts</li>
             <li>Use a separate formatter, one GenEvent-based and one GenServer-based, depending on whether the SDK is &gt;= 1.4.0 as that's when GenEvent was deprecated and GenServer was preferred.</li>
+            <li>Merge <code>Callable</code> and <code>Kernel</code> annotators</li>
+            <li>Use <code>PsiElementVisitor</code> instead of <code>PsiRecursiveElementVisitor</code>, so that macros in <code>defmodule</code> block don't get double annotated.</li>
+            <li>Instead of erasing and then applying multiple <code>TextAttributeKey</code>, erase as before, but then merge the <code>TextAttributeKey</code>'s <code>TextAttributes</code> and apply as single <code>setEnforcedTextAttributes</code>.  For some reason, this fixes the inconsistency of whether <code>PREDEFINED_CALL</code> or <code>MACRO_CALL</code> is applied first.</li>
+            <li>In case of multiple <code>resolved</code>s, make those that need <code>PREDEFINED_CALL</code> to win.</li>
           </ul>
         </li>
         <li>