azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Safer class name insertion - do not insert artificial prefix too often because it may affect code parsing below in the file

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-12-05 23:04:09 +01:00
parent 8e1af2b720
commit 0508e7e031
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt
+9 -4
View File
@@ -26,6 +26,7 @@ import org.jetbrains.jet.plugin.completion.DeclarationDescriptorLookupObject
import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.ClassDescriptor
import org.jetbrains.jet.plugin.completion.qualifiedNameForSourceCode import org.jetbrains.jet.plugin.completion.qualifiedNameForSourceCode
import com.intellij.psi.PsiClass import com.intellij.psi.PsiClass
import org.jetbrains.jet.lang.psi.JetNameReferenceExpression
public object KotlinClassInsertHandler : BaseDeclarationInsertHandler() { public object KotlinClassInsertHandler : BaseDeclarationInsertHandler() {
override fun handleInsert(context: InsertionContext, item: LookupElement) { override fun handleInsert(context: InsertionContext, item: LookupElement) {
@@ -38,12 +39,17 @@ public object KotlinClassInsertHandler : BaseDeclarationInsertHandler() {
if (!isAfterDot(document, startOffset)) { if (!isAfterDot(document, startOffset)) {
val qualifiedName = qualifiedNameToInsert(item) val qualifiedName = qualifiedNameToInsert(item)
// we need to insert prefix&suffix otherwise parser can sometimes produce no suitable reference here val psiDocumentManager = PsiDocumentManager.getInstance(context.getProject())
val tempPrefix = "$;val v:" psiDocumentManager.commitAllDocuments()
val token = file.findElementAt(startOffset)
val tempPrefix = if (token.getParent() is JetNameReferenceExpression)
" " // insert space so that any preceding spaces inserted by formatter on reference shortening are deleted
else
"$;val v:" // if we have no reference in the current context we have a more complicated prefix to get one
val tempSuffix = ".xxx" // we add "xxx" after dot because of some bugs in resolve (see KT-5145) val tempSuffix = ".xxx" // we add "xxx" after dot because of some bugs in resolve (see KT-5145)
document.replaceString(startOffset, context.getTailOffset(), tempPrefix + qualifiedName + tempSuffix) document.replaceString(startOffset, context.getTailOffset(), tempPrefix + qualifiedName + tempSuffix)
val psiDocumentManager = PsiDocumentManager.getInstance(context.getProject())
psiDocumentManager.commitAllDocuments() psiDocumentManager.commitAllDocuments()
val classNameStart = startOffset + tempPrefix.length() val classNameStart = startOffset + tempPrefix.length()
@@ -52,7 +58,6 @@ public object KotlinClassInsertHandler : BaseDeclarationInsertHandler() {
val wholeRangeMarker = document.createRangeMarker(startOffset, classNameEnd + tempSuffix.length()) val wholeRangeMarker = document.createRangeMarker(startOffset, classNameEnd + tempSuffix.length())
ShortenReferences.process(file, classNameStart, classNameEnd) ShortenReferences.process(file, classNameStart, classNameEnd)
psiDocumentManager.commitAllDocuments()
psiDocumentManager.doPostponedOperationsAndUnblockDocument(document) psiDocumentManager.doPostponedOperationsAndUnblockDocument(document)
if (rangeMarker.isValid() && wholeRangeMarker.isValid()) { if (rangeMarker.isValid() && wholeRangeMarker.isValid()) {