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

Indexer advance() should check previousTokens size before look inside

Browse Source 
fixes IndexOutOfBounds during indexing
This commit is contained in:
Sergey Mashkov
2015-05-27 15:32:00 +03:00
parent 1188e57597
commit 6e444baedb
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/KotlinIndexers.kt
+4 -3
View File
@@ -45,12 +45,13 @@ class KotlinFilterLexer(table: OccurrenceConsumer): BaseFilterLexer(JetLexer(),
JetTokens.RBRACKET, JetTokens.SEMICOLON, JetTokens.COMMA, JetTokens.DOT JetTokens.RBRACKET, JetTokens.SEMICOLON, JetTokens.COMMA, JetTokens.DOT
) )
private var previousTokens = LinkedList<IElementType>() private val previousTokens = LinkedList<IElementType>()
override fun advance() { override fun advance() {
fun isMultiDeclarationPosition(): Boolean { fun isMultiDeclarationPosition(): Boolean {
return previousTokens[0] == JetTokens.VAL_KEYWORD || previousTokens[0] == JetTokens.VAR_KEYWORD return previousTokens.firstOrNull() == JetTokens.VAL_KEYWORD
|| previousTokens[0] == JetTokens.LPAR && previousTokens[1] == JetTokens.FOR_KEYWORD || previousTokens.firstOrNull() == JetTokens.VAR_KEYWORD
|| previousTokens.size() == 2 && previousTokens[0] == JetTokens.LPAR && previousTokens[1] == JetTokens.FOR_KEYWORD
} }
val tokenType = myDelegate.getTokenType() val tokenType = myDelegate.getTokenType()