Snapshot d8891a7de15cebb78b6ce5711e50e531b42c0baf from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: Ida9d1b0a2341112b9ebcf67bf560c8f62f0afdc6

2 files changed, 13 insertions, 12 deletions

diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectorUtils.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectorUtils.java
index be97f2c9a7af..364f241d253d 100644
--- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectorUtils.java
+++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectorUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2009 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -233,9 +233,9 @@ public class InjectorUtils {
   @Nullable
   public static <T> T findNearestComment(PsiElement element, NullableFunction<PsiComment, T> processor) {
     if (element instanceof PsiComment) return null;
-    PsiComment comment;
+    PsiComment comment = null;
     PsiElement start = element;
-    for (int i = 0; i < 3 && start != null; i++) {
+    for (int i=0; i<2 && start != null; i++) {
       if (start instanceof PsiFile) return null;
       for (PsiElement e = start.getPrevSibling(); e != null; e = e.getPrevSibling()) {
         if (e instanceof PsiComment) {
@@ -244,14 +244,14 @@ public class InjectorUtils {
           if (value != null) return value;
           else continue;
         }
-        else if (e instanceof PsiWhiteSpace || e.getText().trim().isEmpty()) continue;
+        else if (e instanceof PsiWhiteSpace) continue;
         else if (e instanceof PsiLanguageInjectionHost) {
           if (StringUtil.isEmptyOrSpaces(e.getText())) continue;
           else return null;
         }
         break;
       }
-      start = start.getParent();
+      start = element.getParent();
     }
     return null;
   }
diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.java
index ec92040f4a77..c029af24256d 100644
--- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.java
+++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.ComboBox;
-import com.intellij.ui.AncestorListenerAdapter;
 import com.intellij.ui.ColoredListCellRendererWrapper;
 import com.intellij.ui.EditorTextField;
 import com.intellij.ui.SimpleTextAttributes;
@@ -34,6 +33,7 @@ import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import javax.swing.event.AncestorEvent;
+import javax.swing.event.AncestorListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.Arrays;
@@ -75,7 +75,6 @@ public class LanguagePanel extends AbstractInjectionPanel<BaseInjection> {
       }
     });
     myLanguage.addItemListener(new ItemListener() {
-      @Override
       public void itemStateChanged(ItemEvent e) {
         if (e.getStateChange() == ItemEvent.SELECTED) {
           updateHighlighters();
@@ -83,11 +82,16 @@ public class LanguagePanel extends AbstractInjectionPanel<BaseInjection> {
       }
     });
 
-    myRoot.addAncestorListener(new AncestorListenerAdapter() {
-      @Override
+    myRoot.addAncestorListener(new AncestorListener() {
       public void ancestorAdded(AncestorEvent event) {
         updateHighlighters();
       }
+
+      public void ancestorRemoved(AncestorEvent event) {
+      }
+
+      public void ancestorMoved(AncestorEvent event) {
+      }
     });
   }
 
@@ -145,21 +149,18 @@ public class LanguagePanel extends AbstractInjectionPanel<BaseInjection> {
     }
   }
 
-  @Override
   protected void resetImpl() {
     setLanguage(myOrigInjection.getInjectedLanguageId());
     setPrefix(myOrigInjection.getPrefix());
     setSuffix(myOrigInjection.getSuffix());
   }
 
-  @Override
   protected void apply(BaseInjection i) {
     i.setInjectedLanguageId(getLanguage());
     i.setPrefix(getPrefix());
     i.setSuffix(getSuffix());
   }
 
-  @Override
   public JPanel getComponent() {
     return myRoot;
   }