diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java index cdfa2c438e6..3db9480baa6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java @@ -199,6 +199,8 @@ public class KotlinFindClassUsagesDialog extends FindClassUsagesDialog { kotlinOptions.setSearchConstructorUsages(constructorUsages.isSelected()); kotlinOptions.isDerivedClasses = derivedClasses.isSelected(); kotlinOptions.isDerivedInterfaces = derivedTraits.isSelected(); - kotlinOptions.setSearchExpected(isSelected(expectedUsages)); + if (expectedUsages != null) { + kotlinOptions.setSearchExpected(expectedUsages.isSelected()); + } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java index 7d521642897..67403da1d01 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java @@ -123,6 +123,8 @@ public class KotlinFindFunctionUsagesDialog extends FindMethodUsagesDialog { super.calcFindUsagesOptions(options); KotlinFunctionFindUsagesOptions kotlinOptions = (KotlinFunctionFindUsagesOptions) options; - kotlinOptions.setSearchExpected(isSelected(expectedUsages)); + if (expectedUsages != null) { + kotlinOptions.setSearchExpected(expectedUsages.isSelected()); + } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java index 0bed1a32547..0bb8e061634 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java @@ -70,7 +70,9 @@ public class KotlinFindPropertyUsagesDialog extends JavaFindUsagesDialog