From f4fb982b4adee23e27e87c066b974c5bac3cdab9 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 25 Jul 2012 16:09:57 +0200 Subject: [PATCH] sometimes the best assertion fix is to remove the assertion (EA-36471) --- .../completion/FilePathCompletionContributor.java | 13 ------------- .../completion/impl/CompletionServiceImpl.java | 11 ----------- 2 files changed, 24 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 fe911cdde33a..3609df95d739 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java @@ -100,19 +100,6 @@ public class FilePathCompletionContributor extends CompletionContributor { final FileReferenceSet set = first.getFileReferenceSet(); String prefix = set.getPathString() .substring(0, parameters.getOffset() - set.getElement().getTextRange().getStartOffset() - set.getStartInElement()); - final String textBeforePosition = e.getContainingFile().getText().substring(0, parameters.getOffset()); - if (!textBeforePosition.endsWith(prefix)) { - final int len = textBeforePosition.length(); - final String fragment = len > 100 ? textBeforePosition.substring(len - 100) : textBeforePosition; - throw new AssertionError("prefix should be some actual file string just before caret: " + - prefix + - "\n text=" + - fragment + - ";\npathString=" + - set.getPathString() + - ";\nelementText=" + - e.getParent().getText()); - } List pathPrefixParts = null; int lastSlashIndex; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java index b6703ca83b3f..f35ba5c9cc1c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java @@ -27,11 +27,9 @@ import com.intellij.openapi.project.ProjectManagerAdapter; import com.intellij.openapi.util.Disposer; import com.intellij.patterns.ElementPattern; import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; import com.intellij.psi.Weigher; import com.intellij.psi.WeighingService; import com.intellij.psi.impl.DebugUtil; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; import com.intellij.util.Consumer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -135,15 +133,6 @@ public class CompletionServiceImpl extends CompletionService{ @NotNull public CompletionResultSet withPrefixMatcher(@NotNull final PrefixMatcher matcher) { - if (!myTextBeforePosition.endsWith(matcher.getPrefix())) { - final int len = myTextBeforePosition.length(); - final String fragment = len > 100 ? myTextBeforePosition.substring(len - 100) : myTextBeforePosition; - PsiFile positionFile = myParameters.getPosition().getContainingFile(); - LOG.error("prefix should be some actual file string just before caret: " + matcher.getPrefix() + - "\n text=" + fragment + - "\ninjected=" + (InjectedLanguageUtil.getTopLevelFile(positionFile) != positionFile) + - "\nlang=" + positionFile.getLanguage()); - } return new CompletionResultSetImpl(getConsumer(), myTextBeforePosition, matcher, myContributor, myParameters, mySorter, myProcess, this); }