From 0aab60641f7b5ee869cf1c74f228e769d667ebd3 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Tue, 19 Jan 2010 18:31:42 +0300
Subject: [PATCH] http://ea.jetbrains.com/browser/ea_problems/18367

---
 .../intellij/find/findUsages/DefaultFindUsagesHandlerFactory.java | 2 +-
 .../lang-impl/src/com/intellij/find/impl/FindManagerImpl.java     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/find/findUsages/DefaultFindUsagesHandlerFactory.java b/platform/lang-impl/src/com/intellij/find/findUsages/DefaultFindUsagesHandlerFactory.java
index 1cc62ee9fa..74743d871b 100644
--- a/platform/lang-impl/src/com/intellij/find/findUsages/DefaultFindUsagesHandlerFactory.java
+++ b/platform/lang-impl/src/com/intellij/find/findUsages/DefaultFindUsagesHandlerFactory.java
@@ -30,7 +30,7 @@ public final class DefaultFindUsagesHandlerFactory extends FindUsagesHandlerFact
     else if (!LanguageFindUsages.INSTANCE.forLanguage(element.getLanguage()).canFindUsagesFor(element)) {
       return false;
     }
-    return true;
+    return element.isValid();
   }
 
   public FindUsagesHandler createFindUsagesHandler(final PsiElement element, final boolean forHighlightUsages) {
diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
index 0f9e1befc6..1bd29f18ad 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
@@ -170,7 +170,7 @@ public class FindManagerImpl extends FindManager implements PersistentStateCompo
       myFindDialog = new FindDialog(myProject, model, new Runnable(){
         public void run() {
           String stringToFind = model.getStringToFind();
-          if (stringToFind == null || stringToFind.length() == 0){
+          if (stringToFind.length() == 0){
             return;
           }
           FindSettings.getInstance().addStringToFind(stringToFind);
@@ -289,7 +289,7 @@ public class FindManagerImpl extends FindManager implements PersistentStateCompo
 
   private static FindResult doFindString(CharSequence text, int offset, final FindModel model, @Nullable VirtualFile file) {
     String toFind = model.getStringToFind();
-    if (toFind == null || toFind.length() == 0){
+    if (toFind.length() == 0){
       return NOT_FOUND_RESULT;
     }
 
@@ -373,7 +373,7 @@ public class FindManagerImpl extends FindManager implements PersistentStateCompo
             }
           }
 
-          if (result.size() == 0) {
+          if (result.isEmpty()) {
             result.add(finalLang);
           }
           return result;
@@ -603,7 +603,7 @@ public class FindManagerImpl extends FindManager implements PersistentStateCompo
   }
 
   public boolean canFindUsages(@NotNull PsiElement element) {
-    return myFindUsagesManager.canFindUsages(element);
+    return element.isValid() && myFindUsagesManager.canFindUsages(element);
   }
 
   public void findUsages(@NotNull PsiElement element) {
-- 
2.11.4.GIT