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

Changes on code review

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-08-25 18:52:09 +03:00
parent 92f5ec2ce5
commit 0883bfa615
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt
+2 -1
View File
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.completion
import com.intellij.codeInsight.completion.* import com.intellij.codeInsight.completion.*
import com.intellij.codeInsight.completion.impl.CamelHumpMatcher import com.intellij.codeInsight.completion.impl.CamelHumpMatcher
import com.intellij.codeInsight.lookup.LookupElementDecorator
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import com.intellij.patterns.ElementPattern import com.intellij.patterns.ElementPattern
@@ -259,6 +258,7 @@ abstract class CompletionSession(protected val configuration: CompletionSessionC
var context = expectedInfos var context = expectedInfos
.map { it.fuzzyType?.type?.constructor?.declarationDescriptor?.importableFqName } .map { it.fuzzyType?.type?.constructor?.declarationDescriptor?.importableFqName }
.filterNotNull() .filterNotNull()
.distinct()
.singleOrNull() .singleOrNull()
?.let { "expectedType=$it" } ?.let { "expectedType=$it" }
@@ -266,6 +266,7 @@ abstract class CompletionSession(protected val configuration: CompletionSessionC
context = expectedInfos context = expectedInfos
.map { it.expectedName } .map { it.expectedName }
.filterNotNull() .filterNotNull()
.distinct()
.singleOrNull() .singleOrNull()
?.let { "expectedName=$it" } ?.let { "expectedName=$it" }
} }
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelWatcher.kt
+1 -2
View File
@@ -22,7 +22,6 @@ import com.intellij.codeInsight.lookup.LookupEvent
import com.intellij.codeInsight.lookup.LookupManager import com.intellij.codeInsight.lookup.LookupManager
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.components.AbstractProjectComponent import com.intellij.openapi.components.AbstractProjectComponent
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.openapi.editor.EditorFactory import com.intellij.openapi.editor.EditorFactory
import com.intellij.openapi.editor.RangeMarker import com.intellij.openapi.editor.RangeMarker
@@ -69,7 +68,7 @@ class LookupCancelWatcher(project: Project) : AbstractProjectComponent(project)
companion object { companion object {
fun getInstance(project: Project): LookupCancelWatcher = project.getComponent(javaClass<LookupCancelWatcher>())!! fun getInstance(project: Project): LookupCancelWatcher = project.getComponent(javaClass<LookupCancelWatcher>())!!
val AUTO_POPUP_AT = Key<Int>("LookupCancelWatcher.DO_NOT_REPEAT_AUTO_POPUP_AT") val AUTO_POPUP_AT = Key<Int>("LookupCancelWatcher.AUTO_POPUP_AT")
} }
fun wasAutoPopupRecentlyCancelled(editor: Editor, offset: Int): Boolean { fun wasAutoPopupRecentlyCancelled(editor: Editor, offset: Int): Boolean {
idea/idea-completion/testData/basic/multifile/EnumEntry/EnumEntry.dependency.kt
Vendored
-2
View File
@@ -6,5 +6,3 @@ enum class EnumTest(val i: Int = 0) {
} }
class EAnotherClass class EAnotherClass
// ALLOW_AST_ACCESS