ListTemplate action: do not overwrite prefix-matched template with template

that was found by description

java/java-tests/testData/codeInsight/template/list/TemplateShouldNotBeReplacedByOtherTemplateMatchedByDescription.java

@@ -0,0 +1,5 @@
+class A {
+  public static void main() {
+    template.with.desc<caret>
+  }
+}

java/java-tests/testData/codeInsight/template/list/TemplateShouldNotBeReplacedByOtherTemplateMatchedByDescription_after.java

@@ -0,0 +1,5 @@
+class A {
+  public static void main() {
+    template with description<caret>
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/template/ListTemplateActionTest.java

@@ -33,6 +33,7 @@ public class ListTemplateActionTest extends LightCodeInsightFixtureTestCase {
     TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
     addTemplate("simple", "simple template text", "description");
     addTemplate("complex key", "complex template text", "");
+    addTemplate("template.with.desc", "template with description", "desc");
   }
 
   private void addTemplate(String key, String text, String description) {
@@ -92,6 +93,10 @@ public class ListTemplateActionTest extends LightCodeInsightFixtureTestCase {
   public void testComplexKeyWithNotMatchedPrefixAfterNonJavaCharacter() {
     doTest("complex key");
   }
+  
+  public void testTemplateShouldNotBeReplacedByOtherTemplateMatchedByDescription() {
+    doTest("template.with.desc");
+  }
 
   private void doTest(@NotNull String lookupText) {
     myFixture.configureByFile(getTestName(false) + ".java");

platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java

@@ -120,7 +120,7 @@ public class ListTemplatesHandler implements CodeInsightActionHandler {
         }
       }
 
-      if (searchInDescription) {
+      if (searchInDescription && !matchingTemplates.containsKey(template)) {
         String templateDescription = template.getDescription();
         if (!prefixWithoutDots.isEmpty() && templateDescription != null && prefixSearchPattern.matcher(templateDescription).matches()) {
           matchingTemplates.put(template, prefixWithoutDots);