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

use setOf() instead of Guava sets

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-09-24 20:09:25 +02:00
parent 41d1cf6083
commit 1e2d4c0471
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/conventions.kt
+11 -15
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.idea.search.usagesSearch package org.jetbrains.kotlin.idea.search.usagesSearch
import com.google.common.collect.ImmutableSet import com.google.common.collect.ImmutableSet
import org.jetbrains.kotlin.lexer.JetSingleValueToken
import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.kotlin.lexer.JetToken
import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
@@ -38,14 +37,11 @@ public val ALL_SEARCHABLE_OPERATIONS: ImmutableSet<JetToken> = ImmutableSet
.add(JetTokens.BY_KEYWORD) .add(JetTokens.BY_KEYWORD)
.build() .build()
public val ALL_SEARCHABLE_OPERATION_PATTERNS: Set<String> = public val INDEXING_OPERATION_NAMES = setOf(GET, SET)
ALL_SEARCHABLE_OPERATIONS.map { (it as JetSingleValueToken).getValue() }.toSet()
public val INDEXING_OPERATION_NAMES: ImmutableSet<Name> = ImmutableSet.of(GET, SET) public val IN_OPERATIONS_TO_SEARCH = setOf(JetTokens.IN_KEYWORD)
public val IN_OPERATIONS_TO_SEARCH: ImmutableSet<JetToken> = ImmutableSet.of(JetTokens.IN_KEYWORD) public val COMPARISON_OPERATIONS_TO_SEARCH = setOf(JetTokens.LT, JetTokens.GT)
public val COMPARISON_OPERATIONS_TO_SEARCH: ImmutableSet<JetToken> = ImmutableSet.of<JetToken>(JetTokens.LT, JetTokens.GT)
public fun Name.getOperationSymbolsToSearch(): Set<JetToken> { public fun Name.getOperationSymbolsToSearch(): Set<JetToken> {
when (this) { when (this) {
@@ -53,24 +49,24 @@ public fun Name.getOperationSymbolsToSearch(): Set<JetToken> {
EQUALS -> return EQUALS_OPERATIONS EQUALS -> return EQUALS_OPERATIONS
IDENTITY_EQUALS -> return IDENTITY_EQUALS_OPERATIONS IDENTITY_EQUALS -> return IDENTITY_EQUALS_OPERATIONS
CONTAINS -> return IN_OPERATIONS_TO_SEARCH CONTAINS -> return IN_OPERATIONS_TO_SEARCH
ITERATOR -> return ImmutableSet.of<JetToken>(JetTokens.IN_KEYWORD) ITERATOR -> return IN_OPERATIONS_TO_SEARCH
in INDEXING_OPERATION_NAMES -> return ImmutableSet.of<JetToken>(JetTokens.LBRACKET, JetTokens.BY_KEYWORD) in INDEXING_OPERATION_NAMES -> return setOf(JetTokens.LBRACKET, JetTokens.BY_KEYWORD)
DelegatedPropertyResolver.PROPERTY_DELEGATED_FUNCTION_NAME -> return ImmutableSet.of<JetToken>(JetTokens.BY_KEYWORD) DelegatedPropertyResolver.PROPERTY_DELEGATED_FUNCTION_NAME -> return setOf(JetTokens.BY_KEYWORD)
} }
if (isComponentLike(this)) return ImmutableSet.of<JetToken>(JetTokens.LPAR) if (isComponentLike(this)) return setOf(JetTokens.LPAR)
val unaryOp = UNARY_OPERATION_NAMES.inverse()[this] val unaryOp = UNARY_OPERATION_NAMES.inverse()[this]
if (unaryOp != null) return ImmutableSet.of(unaryOp) if (unaryOp != null) return setOf(unaryOp)
val binaryOp = BINARY_OPERATION_NAMES.inverse()[this] val binaryOp = BINARY_OPERATION_NAMES.inverse()[this]
if (binaryOp != null) { if (binaryOp != null) {
val assignmentOp = ASSIGNMENT_OPERATION_COUNTERPARTS.inverse()[binaryOp] val assignmentOp = ASSIGNMENT_OPERATION_COUNTERPARTS.inverse()[binaryOp]
return if (assignmentOp != null) ImmutableSet.of<JetToken>(binaryOp, assignmentOp) else ImmutableSet.of<JetToken>(binaryOp) return if (assignmentOp != null) setOf(binaryOp, assignmentOp) else setOf(binaryOp)
} }
val assignmentOp = ASSIGNMENT_OPERATIONS.inverse()[this] val assignmentOp = ASSIGNMENT_OPERATIONS.inverse()[this]
if (assignmentOp != null) return ImmutableSet.of<JetToken>(assignmentOp) if (assignmentOp != null) return setOf(assignmentOp)
return ImmutableSet.of<JetToken>() return emptySet()
} }