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

More correct keyword completion after @

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-12 22:29:54 +03:00
parent e27528477f
commit 78f60503e3
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
+2 -5
View File
@@ -35,10 +35,7 @@ import org.jetbrains.kotlin.lexer.JetKeywordToken
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
import org.jetbrains.kotlin.lexer.JetTokens.* import org.jetbrains.kotlin.lexer.JetTokens.*
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.psiUtil.*
import org.jetbrains.kotlin.psi.psiUtil.nextLeaf
import org.jetbrains.kotlin.psi.psiUtil.prevLeaf
import org.jetbrains.kotlin.psi.psiUtil.siblings
import org.jetbrains.kotlin.resolve.ModifierCheckerCore import org.jetbrains.kotlin.resolve.ModifierCheckerCore
open class KeywordLookupObject open class KeywordLookupObject
@@ -194,7 +191,7 @@ object KeywordCompletion {
elementAt.getNonStrictParentOfType<PsiErrorElement>() != null -> return false elementAt.getNonStrictParentOfType<PsiErrorElement>() != null -> return false
elementAt.prevLeaf { it !is PsiWhiteSpace && it !is PsiComment } is PsiErrorElement -> return false elementAt.prevLeaf { it !is PsiWhiteSpace && it !is PsiComment }?.parentsWithSelf?.any { it is PsiErrorElement } ?: false -> return false
keywordTokenType !is JetModifierKeywordToken -> return true keywordTokenType !is JetModifierKeywordToken -> return true
idea/idea-completion/testData/keywords/FileKeyword.kt
Vendored
-1
View File
@@ -4,7 +4,6 @@
// EXIST: {"lookupString":"fun","itemText":"fun","attributes":"bold"} // EXIST: {"lookupString":"fun","itemText":"fun","attributes":"bold"}
// EXIST: {"lookupString":"interface","itemText":"interface","attributes":"bold"} // EXIST: {"lookupString":"interface","itemText":"interface","attributes":"bold"}
// EXIST: {"lookupString":"object","itemText":"object","attributes":"bold"} // EXIST: {"lookupString":"object","itemText":"object","attributes":"bold"}
// EXIST: {"lookupString":"package","itemText":"package","attributes":"bold"}
// EXIST: {"lookupString":"val","itemText":"val","attributes":"bold"} // EXIST: {"lookupString":"val","itemText":"val","attributes":"bold"}
// EXIST: {"lookupString":"var","itemText":"var","attributes":"bold"} // EXIST: {"lookupString":"var","itemText":"var","attributes":"bold"}
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/UseSiteTargetForPrimaryConstructorParameter.kt
Vendored
+1 -3
View File
@@ -9,8 +9,6 @@ class Completion(@get:Ann val p1: String, @<caret>)
// EXIST: setparam // EXIST: setparam
// EXIST: property // EXIST: property
/*TODO: keywords below should not be here*/ /*TODO: in fact is not applicable */
// EXIST: val
// EXIST: var
// EXIST: receiver // EXIST: receiver
// NOTHING_ELSE // NOTHING_ELSE