From e1c1c5fb5973d34a5679c34e41326c9adcd119aa Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Fri, 2 Sep 2016 14:34:52 +0300 Subject: [PATCH] Minor change in log --- .../usagesSearch/ExpressionsOfTypeProcessor.kt | 2 +- .../kotlin/conventions/components/SAM.log | 2 +- .../conventions/components/callableReferences.log | 2 +- .../components/companionObjectAccess.log | 2 +- .../kotlin/conventions/components/dataClass.log | 6 +++--- .../components/dataClassComponentByRef.log | 2 +- .../components/dataClassInsideDataClass.log | 10 +++++----- .../components/extensionComponentFun.log | 4 ++-- .../kotlin/conventions/components/for.log | 6 +++--- .../kotlin/conventions/components/isAndAs.log | 2 +- .../kotlin/conventions/components/lambdas.log | 14 +++++++------- .../components/mayTypeAffectAncestors.log | 12 ++++++------ .../kotlin/conventions/components/operators.log | 8 ++++---- .../conventions/components/recursiveDataClass1.log | 6 +++--- .../conventions/components/recursiveDataClass2.log | 10 +++++----- .../kotlin/conventions/components/when.log | 2 +- .../findUsages/kotlin/conventions/plus.log | 4 ++-- .../kotlinComponentFunctionParameterUsages.log | 4 ++-- 18 files changed, 49 insertions(+), 49 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt index 55b0b04e432..aa9b3db154d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt @@ -78,7 +78,7 @@ class ExpressionsOfTypeProcessor( is PsiMethod, is KtFunction -> fqName + "()" is KtParameter -> { val owner = element.ownerFunction?.let { logPresentation(it) } ?: element.parent.toString() - "parameter ${element.name} in $owner" + "parameter ${element.name} of $owner" } is KtDestructuringDeclaration -> element.entries.joinToString(", ", prefix = "(", postfix = ")") { it.text } else -> fqName diff --git a/idea/testData/findUsages/kotlin/conventions/components/SAM.log b/idea/testData/findUsages/kotlin/conventions/components/SAM.log index bbb3d7264d1..a88f2804797 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/SAM.log +++ b/idea/testData/findUsages/kotlin/conventions/components/SAM.log @@ -2,6 +2,6 @@ Resolved java class to descriptor: JavaSAM Searched references to JavaClass.takeSAM() in Kotlin files Searched references to JavaSAM in java files Searched references to pack.A -Used plain search of parameter a in A() in LocalSearchScope: +Used plain search of parameter a of A() in LocalSearchScope: CLASS:A { val (x, y) = it } diff --git a/idea/testData/findUsages/kotlin/conventions/components/callableReferences.log b/idea/testData/findUsages/kotlin/conventions/components/callableReferences.log index c24f4fa3dcd..54d3422faa3 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/callableReferences.log +++ b/idea/testData/findUsages/kotlin/conventions/components/callableReferences.log @@ -12,5 +12,5 @@ Searched references to constructor in Kotlin files Searched references to f1() in Kotlin files Searched references to fun2 in Kotlin files Searched references to fun3 in Kotlin files -Used plain search of parameter a in A() in LocalSearchScope: +Used plain search of parameter a of A() in LocalSearchScope: CLASS:A diff --git a/idea/testData/findUsages/kotlin/conventions/components/companionObjectAccess.log b/idea/testData/findUsages/kotlin/conventions/components/companionObjectAccess.log index e71318ff2e0..da7691b4aac 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/companionObjectAccess.log +++ b/idea/testData/findUsages/kotlin/conventions/components/companionObjectAccess.log @@ -1,3 +1,3 @@ Searched references to A -Used plain search of parameter x in A() in LocalSearchScope: +Used plain search of parameter x of A() in LocalSearchScope: CLASS:A diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.log b/idea/testData/findUsages/kotlin/conventions/components/dataClass.log index 94e145d5736..8151d7c7a83 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.log +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.log @@ -21,9 +21,9 @@ Searched references to h() in Kotlin files Searched references to listOfA() in Kotlin files Searched references to pack.A Searched references to pack.X -Searched references to parameter p1 in test2() in Kotlin files -Searched references to parameter p2 in test2() in Kotlin files -Used plain search of parameter n in A() in LocalSearchScope: +Searched references to parameter p1 of test2() in Kotlin files +Searched references to parameter p2 of test2() in Kotlin files +Used plain search of parameter n of A() in LocalSearchScope: CLASS:A CLASS:X FUN:ext1 diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.log b/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.log index f7552a01447..30c447a10e9 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.log +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.log @@ -2,5 +2,5 @@ Checked type of a Resolved (x, y, z) Searched references to A Searched references to a in Kotlin files -Used plain search of parameter n in A() in LocalSearchScope: +Used plain search of parameter n of A() in LocalSearchScope: CLASS:A \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.log b/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.log index affe792a667..5144f969766 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.log +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.log @@ -8,12 +8,12 @@ Searched references to C Searched references to C.component1() in Kotlin files Searched references to a in Kotlin files Searched references to a1 in Kotlin files -Searched references to parameter a in B() in Kotlin files -Searched references to parameter b in f() in Kotlin files -Searched references to parameter c in f() in Kotlin files +Searched references to parameter a of B() in Kotlin files +Searched references to parameter b of f() in Kotlin files +Searched references to parameter c of f() in Kotlin files Used plain search of C.component1() in LocalSearchScope: CLASS:C -Used plain search of parameter a in B() in LocalSearchScope: +Used plain search of parameter a of B() in LocalSearchScope: CLASS:B -Used plain search of parameter x in A() in LocalSearchScope: +Used plain search of parameter x of A() in LocalSearchScope: CLASS:A \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/conventions/components/extensionComponentFun.log b/idea/testData/findUsages/kotlin/conventions/components/extensionComponentFun.log index 0e2dfbcace3..d6419a5b256 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/extensionComponentFun.log +++ b/idea/testData/findUsages/kotlin/conventions/components/extensionComponentFun.log @@ -7,8 +7,8 @@ Searched references to Y Searched references to Z1 Searched references to Z2 Searched references to f() in Kotlin files -Searched references to parameter z1 in g() in Kotlin files -Searched references to parameter z2 in g() in Kotlin files +Searched references to parameter z1 of g() in Kotlin files +Searched references to parameter z2 of g() in Kotlin files Used plain search of component2() in LocalSearchScope: CLASS:X CLASS:Y diff --git a/idea/testData/findUsages/kotlin/conventions/components/for.log b/idea/testData/findUsages/kotlin/conventions/components/for.log index 54b3e1414fe..12a487106f5 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/for.log +++ b/idea/testData/findUsages/kotlin/conventions/components/for.log @@ -1,7 +1,7 @@ -Checked type of parameter a in FOR +Checked type of parameter a of FOR Resolved (x, y) Resolved (x, y, z) Searched references to A -Searched references to parameter a in FOR in Kotlin files -Used plain search of parameter n in A() in LocalSearchScope: +Searched references to parameter a of FOR in Kotlin files +Used plain search of parameter n of A() in LocalSearchScope: CLASS:A \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/conventions/components/isAndAs.log b/idea/testData/findUsages/kotlin/conventions/components/isAndAs.log index 2be123b2276..9b1336d6f41 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/isAndAs.log +++ b/idea/testData/findUsages/kotlin/conventions/components/isAndAs.log @@ -3,6 +3,6 @@ Resolved (x, y) Resolved (x1, y1) Searched references to A Searched references to list in Kotlin files -Used plain search of parameter x in A() in LocalSearchScope: +Used plain search of parameter x of A() in LocalSearchScope: CLASS:A FUN:x diff --git a/idea/testData/findUsages/kotlin/conventions/components/lambdas.log b/idea/testData/findUsages/kotlin/conventions/components/lambdas.log index 4350a436775..e37423702ef 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/lambdas.log +++ b/idea/testData/findUsages/kotlin/conventions/components/lambdas.log @@ -1,17 +1,17 @@ Searched references to A -Searched references to parameter p in foo() in Kotlin files -Searched references to parameter p in takeExtFun() in Kotlin files -Searched references to parameter p in takeFun1() in Kotlin files -Searched references to parameter p in takeFun2() in Kotlin files -Searched references to parameter p in takeFun3() in Kotlin files -Searched references to parameter p in takeFuns() in Kotlin files +Searched references to parameter p of foo() in Kotlin files +Searched references to parameter p of takeExtFun() in Kotlin files +Searched references to parameter p of takeFun1() in Kotlin files +Searched references to parameter p of takeFun2() in Kotlin files +Searched references to parameter p of takeFun3() in Kotlin files +Searched references to parameter p of takeFuns() in Kotlin files Searched references to takeExtFun() in Kotlin files Searched references to takeFun1() in Kotlin files Searched references to takeFun2() in Kotlin files Searched references to takeFun3() in Kotlin files Searched references to takeFuns() in Kotlin files Searched references to v in Kotlin files -Used plain search of parameter a in A() in LocalSearchScope: +Used plain search of parameter a of A() in LocalSearchScope: CLASS:A { a, n -> val (x, y) = a!! } { val (x, y ) = it } diff --git a/idea/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.log b/idea/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.log index daed6d55d84..85bc0d56d07 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.log +++ b/idea/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.log @@ -1,11 +1,11 @@ Checked type of y1() Resolved (x1, y1) Searched references to A -Searched references to parameter a in condition() in Kotlin files -Searched references to parameter a in x() in Kotlin files -Searched references to parameter a in y1() in Kotlin files -Searched references to parameter a in y2() in Kotlin files -Searched references to parameter a in y3() in Kotlin files -Used plain search of parameter n in A() in LocalSearchScope: +Searched references to parameter a of condition() in Kotlin files +Searched references to parameter a of x() in Kotlin files +Searched references to parameter a of y1() in Kotlin files +Searched references to parameter a of y2() in Kotlin files +Searched references to parameter a of y3() in Kotlin files +Used plain search of parameter n of A() in LocalSearchScope: CLASS:A { val (x2, y2) = this } \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/conventions/components/operators.log b/idea/testData/findUsages/kotlin/conventions/components/operators.log index 9e4e89456ec..d47eca69646 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/operators.log +++ b/idea/testData/findUsages/kotlin/conventions/components/operators.log @@ -2,11 +2,11 @@ Resolved (x, y) Resolved b1 + b2 Searched references to A Searched references to B -Searched references to parameter b1 in f() in Kotlin files -Searched references to parameter b2 in f() in Kotlin files -Searched references to parameter other in plus() in Kotlin files +Searched references to parameter b1 of f() in Kotlin files +Searched references to parameter b2 of f() in Kotlin files +Searched references to parameter other of plus() in Kotlin files Searched references to plus() in Kotlin files -Used plain search of parameter x in A() in LocalSearchScope: +Used plain search of parameter x of A() in LocalSearchScope: CLASS:A Used plain search of plus() in LocalSearchScope: CLASS:B diff --git a/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.log b/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.log index 769a682554a..e3deeaa3abf 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.log +++ b/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.log @@ -2,7 +2,7 @@ Resolved (a1, n1) Resolved (a2, n2) Resolved (a2, n2) Searched references to A -Searched references to parameter a in A() in Kotlin files -Searched references to parameter a in f() in Kotlin files -Used plain search of parameter a in A() in LocalSearchScope: +Searched references to parameter a of A() in Kotlin files +Searched references to parameter a of f() in Kotlin files +Used plain search of parameter a of A() in LocalSearchScope: CLASS:A diff --git a/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.log b/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.log index b4b73d87cfe..6581209fb1c 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.log +++ b/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.log @@ -4,10 +4,10 @@ Searched references to A Searched references to B Searched references to a1 in Kotlin files Searched references to b in Kotlin files -Searched references to parameter a in B() in Kotlin files -Searched references to parameter a in f() in Kotlin files -Searched references to parameter b in A() in Kotlin files -Used plain search of parameter a in B() in LocalSearchScope: +Searched references to parameter a of B() in Kotlin files +Searched references to parameter a of f() in Kotlin files +Searched references to parameter b of A() in Kotlin files +Used plain search of parameter a of B() in LocalSearchScope: CLASS:B -Used plain search of parameter b in A() in LocalSearchScope: +Used plain search of parameter b of A() in LocalSearchScope: CLASS:A \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/conventions/components/when.log b/idea/testData/findUsages/kotlin/conventions/components/when.log index 34378521198..fc9459bc0e3 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/when.log +++ b/idea/testData/findUsages/kotlin/conventions/components/when.log @@ -1,5 +1,5 @@ Searched references to A -Used plain search of parameter a in A() in LocalSearchScope: +Used plain search of parameter a of A() in LocalSearchScope: CLASS:A KtWhenEntry "else" KtWhenEntry "is A" diff --git a/idea/testData/findUsages/kotlin/conventions/plus.log b/idea/testData/findUsages/kotlin/conventions/plus.log index ae62eb62c83..9623a91a934 100644 --- a/idea/testData/findUsages/kotlin/conventions/plus.log +++ b/idea/testData/findUsages/kotlin/conventions/plus.log @@ -20,8 +20,8 @@ Searched references to A.plus() in Kotlin files Searched references to A.plus() in Kotlin files Searched references to a in Kotlin files Searched references to a in Kotlin files -Searched references to parameter a in A.plus() in Kotlin files -Searched references to parameter a in A.plus() in Kotlin files +Searched references to parameter a of A.plus() in Kotlin files +Searched references to parameter a of A.plus() in Kotlin files Used plain search of A.plus() in LocalSearchScope: CLASS:A Used plain search of A.plus() in LocalSearchScope: diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.log b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.log index 92211435338..bd3cd725862 100644 --- a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.log +++ b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.log @@ -1,3 +1,3 @@ Searched references to test.KotlinDataClass -Used plain search in LocalSearchScope: - CLASS:KotlinDataClass +Used plain search of parameter foo of KotlinDataClass() in LocalSearchScope: + CLASS:KotlinDataClass \ No newline at end of file