From 17a5ec5950780250928d427c223b5c9b53bdc6d3 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 24 Jul 2012 22:28:11 +0400
Subject: [PATCH] Completion API changed in Leda

---
 .../jet/plugin/caches/JetShortNamesCache.java      | 14 +++++++++++---
 .../jet/completion/JetCompletionTestBase.java      |  2 +-
 .../completion/confidence/JetConfidenceTest.java   |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java b/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
index e713769fb5b..ccf3905c1d8 100644
--- a/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
+++ b/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
@@ -61,6 +61,8 @@ import java.util.*;
  */
 public class JetShortNamesCache extends PsiShortNamesCache {
 
+    private static final PsiMethod[] NO_METHODS = new PsiMethod[0];
+    private static final PsiField[] NO_FIELDS = new PsiField[0];
     private final Project project;
     private final JavaElementFinder javaElementFinder;
 
@@ -290,13 +292,19 @@ public class JetShortNamesCache extends PsiShortNamesCache {
     @NotNull
     @Override
     public PsiMethod[] getMethodsByName(@NonNls @NotNull String name, @NotNull GlobalSearchScope scope) {
-        return new PsiMethod[0];
+        return NO_METHODS;
     }
 
     @NotNull
     @Override
     public PsiMethod[] getMethodsByNameIfNotMoreThan(@NonNls @NotNull String name, @NotNull GlobalSearchScope scope, int maxCount) {
-        return new PsiMethod[0];
+        return NO_METHODS;
+    }
+
+    @NotNull
+    @Override
+    public PsiField[] getFieldsByNameIfNotMoreThan(@NonNls @NotNull String s, @NotNull GlobalSearchScope scope, int i) {
+        return NO_FIELDS;
     }
 
     @Override
@@ -318,7 +326,7 @@ public class JetShortNamesCache extends PsiShortNamesCache {
     @NotNull
     @Override
     public PsiField[] getFieldsByName(@NotNull @NonNls String name, @NotNull GlobalSearchScope scope) {
-        return new PsiField[0];
+        return NO_FIELDS;
     }
 
     @NotNull
diff --git a/idea/tests/org/jetbrains/jet/completion/JetCompletionTestBase.java b/idea/tests/org/jetbrains/jet/completion/JetCompletionTestBase.java
index c74d15e0361..e0f81c6ca34 100644
--- a/idea/tests/org/jetbrains/jet/completion/JetCompletionTestBase.java
+++ b/idea/tests/org/jetbrains/jet/completion/JetCompletionTestBase.java
@@ -109,7 +109,7 @@ public abstract class JetCompletionTestBase extends LightCompletionTestCase {
 
     @Override
     protected void complete(final int time) {
-        new CodeCompletionHandlerBase(type, false, false, true).invokeCompletion(getProject(), getEditor(), time, false);
+        new CodeCompletionHandlerBase(type, false, false, true).invokeCompletion(getProject(), getEditor(), time, false, false);
 
         Lookup lookup = LookupManager.getActiveLookup(myEditor);
         myItems = lookup == null ? null : lookup.getItems().toArray(LookupElement.EMPTY_ARRAY);
diff --git a/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java b/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java
index 9c6cd87ab9a..22c27121eea 100644
--- a/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java
@@ -77,6 +77,6 @@ public class JetConfidenceTest extends LightCompletionTestCase {
 
     @Override
     protected void complete() {
-        new CodeCompletionHandlerBase(CompletionType.BASIC, false, true, true).invokeCompletion(getProject(), getEditor(), 0, false);
+        new CodeCompletionHandlerBase(CompletionType.BASIC, false, true, true).invokeCompletion(getProject(), getEditor(), 0, false, false);
     }
 }
\ No newline at end of file