From befe025d216ee64478e92547b57b27d0b9850f6d Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 18 Jun 2015 13:44:13 +0300 Subject: [PATCH] Fix intentions testData: types rendering changed Some more FQ names appeared. The reason is that earlier such types were Lazy and their `toString` method return short version. But after type enhancement they are represented with JetTypeImpl --- .../extractFunction/basic/callWithPlatformTypeReceiver.kt | 4 ++-- .../basic/callWithPlatformTypeReceiver.kt.after | 4 ++-- .../parameters/candidateTypes/flexibleTypesWithNull.kt | 4 ++-- .../candidateTypes/flexibleTypesWithNull.kt.after | 6 +++--- .../parameters/candidateTypes/flexibleTypesWithoutNull.kt | 4 ++-- .../candidateTypes/flexibleTypesWithoutNull.kt.after | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt index 514c149d396..d57a7d91694 100644 --- a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt +++ b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt @@ -1,7 +1,7 @@ // WITH_RUNTIME // SUGGESTED_RETURN_TYPES: kotlin.Boolean?, kotlin.Boolean -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> defined in test. -// PARAM_TYPES: kotlin.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> +// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)> defined in test. +// PARAM_TYPES: kotlin.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)> fun test() { J.getMap().filter { it.getKey() } } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after index 4146cbab390..695749d0e0f 100644 --- a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after +++ b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after @@ -1,7 +1,7 @@ // WITH_RUNTIME // SUGGESTED_RETURN_TYPES: kotlin.Boolean?, kotlin.Boolean -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> defined in test. -// PARAM_TYPES: kotlin.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> +// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)> defined in test. +// PARAM_TYPES: kotlin.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)> fun test() { J.getMap().filter { b(it) } } diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt index ae641c2ad01..99546e95cfc 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt @@ -1,7 +1,7 @@ // WITH_RUNTIME // SUGGESTED_NAMES: i, getN -// PARAM_TYPES: String?, String, kotlin.CharSequence?, CharSequence -// PARAM_DESCRIPTOR: val property: (String..String?) defined in test +// PARAM_TYPES: kotlin.String?, kotlin.String, kotlin.CharSequence?, CharSequence +// PARAM_DESCRIPTOR: val property: (kotlin.String..kotlin.String?) defined in test fun test() { val property = System.getProperty("some") val n = property?.length() diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt.after index a687e4b9262..50f48bb630b 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt.after @@ -1,10 +1,10 @@ // WITH_RUNTIME // SUGGESTED_NAMES: i, getN -// PARAM_TYPES: String?, String, kotlin.CharSequence?, CharSequence -// PARAM_DESCRIPTOR: val property: (String..String?) defined in test +// PARAM_TYPES: kotlin.String?, kotlin.String, kotlin.CharSequence?, CharSequence +// PARAM_DESCRIPTOR: val property: (kotlin.String..kotlin.String?) defined in test fun test() { val property = System.getProperty("some") val n = i(property) } -private fun i(property: String?) = property?.length() +private fun i(property: String?) = property?.length() \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt index 6130d9bf142..e3da5db7cd2 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt @@ -1,7 +1,7 @@ // WITH_RUNTIME // SUGGESTED_NAMES: i, getN -// PARAM_TYPES: String, CharSequence -// PARAM_DESCRIPTOR: val property: (String..String?) defined in test +// PARAM_TYPES: kotlin.String, CharSequence +// PARAM_DESCRIPTOR: val property: (kotlin.String..kotlin.String?) defined in test fun test() { val property = System.getProperty("some") val n = property.length() diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt.after index 559b5d08cf7..21d2fede2f3 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt.after @@ -1,7 +1,7 @@ // WITH_RUNTIME // SUGGESTED_NAMES: i, getN -// PARAM_TYPES: String, CharSequence -// PARAM_DESCRIPTOR: val property: (String..String?) defined in test +// PARAM_TYPES: kotlin.String, CharSequence +// PARAM_DESCRIPTOR: val property: (kotlin.String..kotlin.String?) defined in test fun test() { val property = System.getProperty("some") val n = i(property)