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

172: Try to remove unneeded commits in 172 branch

Browse Source 
Revert "[Unneeded?] Revert "ExpressionOfTypeProcessor: get member name in read action""
This reverts commit 7ec59fc

Revert "[Unneeded] Revert "AbstractNavigateToLibraryTest: fix for invalid files""
This reverts commit 9e80c60

Revert "[Unneeded?] Revert "AbstractExtractionTest: fix for invalid files""
This reverts commit 0b2113b

Revert "[Unneeded] Revert "AbstractIntentionTest: `isApplicableOnPooled` made run under ProgressIndicator""
This reverts commit a41c247
This commit is contained in:
Nikolay Krasko
2018-01-15 16:53:55 +03:00
parent 9c38454c2e
commit 577e6e5206
4 changed files with 31 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/usagesSearch/ExpressionsOfTypeProcessor.kt.172
+3 -2
View File
@@ -335,10 +335,11 @@ class ExpressionsOfTypeProcessor(
val searchRequestCollector = SearchRequestCollector(SearchSession())
val resultProcessor = StaticMemberRequestResultProcessor(member, classes)
val memberName = runReadAction { member.name }
for (klass in classes) {
val request = klass.name + "." + declarationName
testLog { "Searched references to static ${member.name} in non-Java files by request $request" }
testLog { "Searched references to static $memberName in non-Java files by request $request" }
searchRequestCollector.searchWord(
request,
classUseScope(klass).intersectWith(memberScope), UsageSearchContext.IN_CODE, true, member, resultProcessor)
@@ -347,7 +348,7 @@ class ExpressionsOfTypeProcessor(
if (qualifiedName != null) {
val importAllUnderRequest = qualifiedName + ".*"
testLog { "Searched references to static ${member.name} in non-Java files by request $importAllUnderRequest" }
testLog { "Searched references to static $memberName in non-Java files by request $importAllUnderRequest" }
searchRequestCollector.searchWord(
importAllUnderRequest,
classUseScope(klass).intersectWith(memberScope), UsageSearchContext.IN_CODE, true, member, resultProcessor)