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

dumb-aware completion offsets calculation (IDEADEV-40285)

Browse Source
This commit is contained in:
Peter Gromov
2009-09-11 16:10:02 +04:00
parent 04a89eddd4
commit d71d1b0419
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/codeInsight/completion/CompletionInitializationContext.java
+17 -10
View File
@@ -7,6 +7,7 @@ package com.intellij.codeInsight.completion;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.SelectionModel;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiReference;
import org.jetbrains.annotations.NonNls;
@@ -43,19 +44,25 @@ public class CompletionInitializationContext {
final int selectionEndOffset = selectionModel.hasSelection() ? selectionModel.getSelectionEnd() : caretOffset;
myOffsetMap.addOffset(SELECTION_END_OFFSET, selectionEndOffset);
myOffsetMap.addOffset(IDENTIFIER_END_OFFSET, findIdentifierEnd(file, selectionEndOffset));
}
final PsiReference reference = file.findReferenceAt(selectionEndOffset);
if(reference != null){
myOffsetMap.addOffset(IDENTIFIER_END_OFFSET,
reference.getElement().getTextRange().getStartOffset() + reference.getRangeInElement().getEndOffset());
} else {
final String text = file.getText();
int idEnd = selectionEndOffset;
while (idEnd < text.length() && Character.isJavaIdentifierPart(text.charAt(idEnd))) {
idEnd++;
private static int findIdentifierEnd(PsiFile file, int selectionEndOffset) {
try {
final PsiReference reference = file.findReferenceAt(selectionEndOffset);
if(reference != null){
return reference.getElement().getTextRange().getStartOffset() + reference.getRangeInElement().getEndOffset();
}
myOffsetMap.addOffset(IDENTIFIER_END_OFFSET, idEnd);
}
catch (IndexNotReadyException ignored) {
}
final String text = file.getText();
int idEnd = selectionEndOffset;
while (idEnd < text.length() && Character.isJavaIdentifierPart(text.charAt(idEnd))) {
idEnd++;
}
return idEnd;
}
public void setFileCopyPatcher(@NotNull final FileCopyPatcher fileCopyPatcher) {