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

Move queue back to class instance after bad refactoring in search package

Browse Source 
Relevant commit: 7f1e7cc461
This commit is contained in:
Nikolay Krasko
2019-02-14 17:59:05 +03:00
parent 33954c7632
commit 7c83d5df93
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/KotlinIndexers.kt
+7 -7
View File
@@ -50,17 +50,17 @@ private val ALL_SEARCHABLE_OPERATIONS: ImmutableSet<KtToken> = ImmutableSet
class KotlinFilterLexer(private val occurrenceConsumer: OccurrenceConsumer) : BaseFilterLexer(KotlinLexer(), occurrenceConsumer) { class KotlinFilterLexer(private val occurrenceConsumer: OccurrenceConsumer) : BaseFilterLexer(KotlinLexer(), occurrenceConsumer) {
private companion object { private companion object {
private val codeTokens = TokenSet.orSet( private val CODE_TOKENS = TokenSet.orSet(
TokenSet.create(*ALL_SEARCHABLE_OPERATIONS.toTypedArray()), TokenSet.create(*ALL_SEARCHABLE_OPERATIONS.toTypedArray()),
TokenSet.create(KtTokens.IDENTIFIER) TokenSet.create(KtTokens.IDENTIFIER)
) )
private val commentTokens = TokenSet.orSet(KtTokens.COMMENTS, TokenSet.create(KDocTokens.KDOC)) private val COMMENT_TOKENS = TokenSet.orSet(KtTokens.COMMENTS, TokenSet.create(KDocTokens.KDOC))
private const val MAX_PREV_TOKENS = 2 private const val MAX_PREV_TOKENS = 2
private val prevTokens = ArrayDeque<IElementType>(MAX_PREV_TOKENS)
} }
private val prevTokens = ArrayDeque<IElementType>(MAX_PREV_TOKENS)
private var prevTokenStart = -1 private var prevTokenStart = -1
private var prevTokenEnd = -1 private var prevTokenEnd = -1
@@ -107,17 +107,17 @@ class KotlinFilterLexer(private val occurrenceConsumer: OccurrenceConsumer) : Ba
} }
} }
in codeTokens -> addOccurrenceInToken(UsageSearchContext.IN_CODE.toInt()) in CODE_TOKENS -> addOccurrenceInToken(UsageSearchContext.IN_CODE.toInt())
in KtTokens.STRINGS -> scanWordsInToken(UsageSearchContext.IN_STRINGS + UsageSearchContext.IN_FOREIGN_LANGUAGES, false, true) in KtTokens.STRINGS -> scanWordsInToken(UsageSearchContext.IN_STRINGS + UsageSearchContext.IN_FOREIGN_LANGUAGES, false, true)
in commentTokens -> { in COMMENT_TOKENS -> {
scanWordsInToken(UsageSearchContext.IN_COMMENTS.toInt(), false, false) scanWordsInToken(UsageSearchContext.IN_COMMENTS.toInt(), false, false)
advanceTodoItemCountsInToken() advanceTodoItemCountsInToken()
} }
} }
if (tokenType != TokenType.WHITE_SPACE && tokenType !in commentTokens) { if (tokenType != TokenType.WHITE_SPACE && tokenType !in COMMENT_TOKENS) {
if (prevTokens.size == MAX_PREV_TOKENS) { if (prevTokens.size == MAX_PREV_TOKENS) {
prevTokens.removeLast() prevTokens.removeLast()
} }