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

support completion at the end of file with no dummy identifier (IDEA-188584)

Browse Source
This commit is contained in:
peter
2018-04-17 15:55:31 +02:00
parent c91edc8e48
commit 55914a27af
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+2 -4
View File
@@ -249,14 +249,12 @@ public class CodeCompletionHandlerBase {
if (indicator.blockingWaitForFinish(ourAutoInsertItemTimeout)) {
try {
indicator.getLookup().refreshUi(true, false);
completionFinished(indicator, hasModifiers);
}
catch (Exception e) {
catch (Throwable e) {
CompletionServiceImpl.setCompletionPhase(CompletionPhase.NoCompletion);
LOG.error(e);
return;
}
completionFinished(indicator, hasModifiers);
return;
}
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionAssertions.java
+1 -5
View File
@@ -120,7 +120,7 @@ class CompletionAssertions {
static void assertHostInfo(PsiFile hostCopy, OffsetMap hostMap) {
PsiUtilCore.ensureValid(hostCopy);
if (hostMap.getOffset(CompletionInitializationContext.START_OFFSET) >= hostCopy.getTextLength()) {
if (hostMap.getOffset(CompletionInitializationContext.START_OFFSET) > hostCopy.getTextLength()) {
throw new AssertionError("startOffset outside the host file: " + hostMap.getOffset(CompletionInitializationContext.START_OFFSET) + "; " + hostCopy);
}
}
@@ -140,10 +140,6 @@ class CompletionAssertions {
createAstAttachment(fileCopy, originalFile));
}
if (fileCopy.findElementAt(offset) != insertedElement) {
throw new AssertionError("wrong offset");
}
final TextRange range = insertedElement.getTextRange();
CharSequence fileCopyText = fileCopy.getViewProvider().getContents();
if ((range.getEndOffset() > fileCopyText.length()) ||
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionInitializationUtil.java
+4
View File
@@ -21,6 +21,7 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.impl.PsiFileEx;
import com.intellij.psi.impl.source.PsiFileImpl;
import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtilBase;
import com.intellij.reference.SoftReference;
import org.jetbrains.annotations.NotNull;
@@ -156,6 +157,9 @@ public class CompletionInitializationUtil {
@NotNull
private static PsiElement findCompletionPositionLeaf(OffsetsInFile offsets, int offset, PsiFile originalFile) {
PsiElement insertedElement = offsets.getFile().findElementAt(offset);
if (insertedElement == null && offsets.getFile().getTextLength() == 0) {
insertedElement = PsiTreeUtil.getDeepestLast(offsets.getFile());
}
CompletionAssertions.assertCompletionPositionPsiConsistent(offsets, offset, originalFile, insertedElement);
return insertedElement;
}