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

cleanup unneeded explicit tailOffset management

Browse Source
This commit is contained in:
peter
2011-04-19 20:41:52 +02:00
parent 8e975b3a73
commit 58ea95f3ce
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java
-7
View File
@@ -24,7 +24,6 @@ import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.RangeMarker;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
@@ -102,9 +101,6 @@ public class DefaultInsertHandler extends TemplateInsertHandler implements Clone
}
}
addImportForItem(context, item);
if (context.getTailOffset() < 0) { //hack, hack, hack. ideally the tail offset just should survive after the importing stuff
context.setTailOffset(context.getEditor().getCaretModel().getOffset());
}
}
catch(IncorrectOperationException e){
LOG.error(e);
@@ -224,11 +220,8 @@ public class DefaultInsertHandler extends TemplateInsertHandler implements Clone
int length = lookupString.length();
final int i = lookupString.indexOf('<');
if (i >= 0) length = i;
RangeMarker savedTail = context.getDocument().createRangeMarker(context.getTailOffset(), context.getTailOffset());
final int newOffset = addImportForClass(file, startOffset, startOffset + length, aClass);
JavaCompletionUtil.shortenReference(file, newOffset);
assert savedTail.isValid();
context.setTailOffset(savedTail.getStartOffset());
}
else if (o instanceof PsiType){
PsiType type = ((PsiType)o).getDeepComponentType();