Merge branch 'master' of git.labs.intellij.net:idea/community

diff --cc plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java
index e86275063b7890ff2fa58354671e22d8317a6ca9,fbebbcd776d30e91b29dee0adccebe3e8eca21ea..31feef9eda9d06f3dc34c3bea61a7befb85e8670
--- 1/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java
--- 2/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java
+++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java
@@@ -41,8 -40,9 +42,7 @@@ import com.intellij.ui.SimpleTextAttrib
  import com.intellij.util.Consumer;
  import com.intellij.util.Icons;
  import com.intellij.util.NullableFunction;
- import com.intellij.util.Processor;
  import com.intellij.util.containers.ContainerUtil;
 -import com.intellij.ui.SimpleColoredText;
 -import com.intellij.ui.SimpleTextAttributes;
  import org.intellij.plugins.intelliLang.AdvancedSettingsUI;
  import org.intellij.plugins.intelliLang.Configuration;
  import org.intellij.plugins.intelliLang.inject.AbstractLanguageInjectionSupport;