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

Minor changes on code review

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-11-03 11:45:31 +03:00
parent c11bf32594
commit bbea70a005
2 changed files with 3 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/BasicCompletionSession.kt
+1 -3
View File
@@ -171,14 +171,12 @@ class BasicCompletionSession(
val contextVariableTypesForSmartCompletion = withCollectRequiredContextVariableTypes(::completeWithSmartCompletion) val contextVariableTypesForSmartCompletion = withCollectRequiredContextVariableTypes(::completeWithSmartCompletion)
fun completeReferenceVariants(lookupElementFactory: LookupElementFactory) { val contextVariableTypesForReferenceVariants = withCollectRequiredContextVariableTypes { lookupElementFactory ->
val (imported, notImported) = referenceVariantsWithNonInitializedVarExcluded!! val (imported, notImported) = referenceVariantsWithNonInitializedVarExcluded!!
collector.addDescriptorElements(imported, lookupElementFactory) collector.addDescriptorElements(imported, lookupElementFactory)
collector.addDescriptorElements(notImported, lookupElementFactory, notImported = true) collector.addDescriptorElements(notImported, lookupElementFactory, notImported = true)
} }
val contextVariableTypesForReferenceVariants = withCollectRequiredContextVariableTypes(::completeReferenceVariants)
KEYWORDS_ONLY.doComplete() KEYWORDS_ONLY.doComplete()
// getting root packages from scope is very slow so we do this in alternative way // getting root packages from scope is very slow so we do this in alternative way
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/handlerUtils.kt
+2 -1
View File
@@ -29,9 +29,10 @@ fun surroundWithBracesIfInStringTemplate(context: InsertionContext) {
if (startOffset > 0 && document.charsSequence[startOffset - 1] == '$') { if (startOffset > 0 && document.charsSequence[startOffset - 1] == '$') {
val psiDocumentManager = PsiDocumentManager.getInstance(context.project) val psiDocumentManager = PsiDocumentManager.getInstance(context.project)
psiDocumentManager.commitAllDocuments() psiDocumentManager.commitAllDocuments()
psiDocumentManager.doPostponedOperationsAndUnblockDocument(document)
if (context.file.findElementAt(startOffset - 1)?.node?.elementType == KtTokens.SHORT_TEMPLATE_ENTRY_START) { if (context.file.findElementAt(startOffset - 1)?.node?.elementType == KtTokens.SHORT_TEMPLATE_ENTRY_START) {
psiDocumentManager.doPostponedOperationsAndUnblockDocument(document)
document.insertString(startOffset, "{") document.insertString(startOffset, "{")
context.offsetMap.addOffset(CompletionInitializationContext.START_OFFSET, startOffset + 1) context.offsetMap.addOffset(CompletionInitializationContext.START_OFFSET, startOffset + 1)