MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

sometimes the best assertion fix is to remove the assertion (EA-36471)

Browse Source
This commit is contained in:
peter
2012-07-25 16:58:01 +02:00
parent a4aa089f32
commit f4fb982b4a
2 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java
-13
View File
@@ -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<String> pathPrefixParts = null;
int lastSlashIndex;
platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java
-11
View File
@@ -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);
}