From 21efa65e8d8caf68ef8a6865fe89ba3dee78dd77 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Mon, 14 Jul 2014 11:17:26 +0400 Subject: [PATCH] cleanup --- .../completion/FilePathCompletionContributor.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java index f23a7a6f6cca..692a1dc56e1b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java @@ -48,6 +48,7 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.ProjectScope; import com.intellij.util.ArrayUtil; import com.intellij.util.ProcessingContext; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -71,9 +72,7 @@ public class FilePathCompletionContributor extends CompletionContributor { final PsiReference psiReference = parameters.getPosition().getContainingFile().findReferenceAt(parameters.getOffset()); if (getReference(psiReference) != null && parameters.getInvocationCount() == 1) { final String shortcut = getActionShortcut(IdeActions.ACTION_CODE_COMPLETION); - if (shortcut != null) { - result.addLookupAdvertisement(CodeInsightBundle.message("class.completion.file.path", shortcut)); - } + result.addLookupAdvertisement(CodeInsightBundle.message("class.completion.file.path", shortcut)); } } }); @@ -203,7 +202,7 @@ public class FilePathCompletionContributor extends CompletionContributor { final String path = StringUtil.join(contextParts, "/"); int nextIndex = 0; - for (final String s : pathPrefix) { + for (@NonNls final String s : pathPrefix) { if ((nextIndex = path.indexOf(s.toLowerCase(), nextIndex)) == -1) return false; } @@ -252,7 +251,7 @@ public class FilePathCompletionContributor extends CompletionContributor { return null; } - public class FilePathLookupItem extends LookupElement { + public static class FilePathLookupItem extends LookupElement { private final String myName; private final String myPath; private final String myInfo;