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

Fixed completion handler for annotations (because the parser does not parse "@ xxx" as annotation anymore)

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-15 18:56:52 +03:00
parent dc83d5cf04
commit a83539705e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinClassifierInsertHandler.kt
+10 -4
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
import org.jetbrains.kotlin.idea.completion.isAfterDot import org.jetbrains.kotlin.idea.completion.isAfterDot
import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject
import org.jetbrains.kotlin.idea.util.CallTypeAndReceiver
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.idea.util.ShortenReferences
import org.jetbrains.kotlin.name.FqNameUnsafe import org.jetbrains.kotlin.name.FqNameUnsafe
@@ -59,10 +60,15 @@ object KotlinClassifierInsertHandler : BaseDeclarationInsertHandler() {
if (target != null && IdeDescriptorRenderers.SOURCE_CODE.renderClassifierName(target) == qualifiedName) return if (target != null && IdeDescriptorRenderers.SOURCE_CODE.renderClassifierName(target) == qualifiedName) return
} }
val tempPrefix = if (nameRef != null) val tempPrefix = if (nameRef != null) {
" " // insert space so that any preceding spaces inserted by formatter on reference shortening are deleted val isAnnotation = CallTypeAndReceiver.detect(nameRef) is CallTypeAndReceiver.ANNOTATION
else // we insert space so that any preceding spaces inserted by formatter on reference shortening are deleted
"$;val v:" // if we have no reference in the current context we have a more complicated prefix to get one // (but not for annotations where spaces are not allowed after @)
if (isAnnotation) "" else " "
}
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)