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

FIR: introduce flexible types pretty rendering for no arguments case

Browse Source 
#KT-52020 Fixed
This commit is contained in:
Mikhail Glukhikh
2022-06-24 10:52:58 +02:00
committed by Space
parent 31ec10142b
commit 38f4a35be2
265 changed files with 654 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt
Vendored
+2 -2
View File
@@ -9,8 +9,8 @@ KtSuccessCallInfo:
signature = KtVariableLikeSignature:
name = sub
receiverType = null
returnType = ft<JavaSubClass, JavaSubClass?>
symbol = val sub: ft<JavaSubClass, JavaSubClass?>
returnType = JavaSubClass!
symbol = val sub: JavaSubClass!
callableIdIfNonLocal = /JavaClass.sub
simpleAccess = Read:
analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt
Vendored
+4 -4
View File
@@ -6,25 +6,25 @@ KtSuccessCallInfo:
extensionReceiver = null
signature = KtFunctionLikeSignature:
receiverType = null
returnType = java.util.Comparator<ft<kotlin.Int, kotlin.Int?>>
returnType = java.util.Comparator<kotlin.Int!>
symbol = java/util/Comparator(function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>): java.util.Comparator<T>
valueParameters = [
KtVariableLikeSignature:
name = function
receiverType = null
returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
callableIdIfNonLocal = null
]
callableIdIfNonLocal = java/util/Comparator
typeArgumentsMapping = {
T -> (ft<kotlin.Int, kotlin.Int?>)
T -> (kotlin.Int!)
}
argumentMapping = {
{x: Int, y: Int -> 1} -> (KtVariableLikeSignature:
name = function
receiverType = null
returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
callableIdIfNonLocal = null)
}
analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt
Vendored
+4 -4
View File
@@ -6,25 +6,25 @@ KtApplicableCallCandidateInfo:
extensionReceiver = null
signature = KtFunctionLikeSignature:
receiverType = null
returnType = java.util.Comparator<ft<kotlin.Int, kotlin.Int?>>
returnType = java.util.Comparator<kotlin.Int!>
symbol = java/util/Comparator(function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>): java.util.Comparator<T>
valueParameters = [
KtVariableLikeSignature:
name = function
receiverType = null
returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
callableIdIfNonLocal = null
]
callableIdIfNonLocal = java/util/Comparator
typeArgumentsMapping = {
T -> (ft<kotlin.Int, kotlin.Int?>)
T -> (kotlin.Int!)
}
argumentMapping = {
{x: Int, y: Int -> 1} -> (KtVariableLikeSignature:
name = function
receiverType = null
returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
callableIdIfNonLocal = null)
}
analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsConstructorArgument.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
expression: { println("hello1") }
expected type: ft<java/lang/Runnable, java/lang/Runnable?>
expected type: java/lang/Runnable!
analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.txt
Vendored
+1 -1
View File
@@ -251,7 +251,7 @@ KtFunctionSymbol:
name: getDeclaringClass
origin: SUBSTITUTION_OVERRIDE
receiverType: null
returnType: ft<java/lang/Class<ft<test/E, test/E?>>, java/lang/Class<ft<test/E, test/E?>>?>
returnType: ft<java/lang/Class<test/E!>, java/lang/Class<test/E!>?>
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: []
analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt
Vendored
+21 -21
View File
@@ -8,7 +8,7 @@ KtJavaFieldSymbol:
name: value
origin: JAVA
receiverType: null
returnType: ft<kotlin/CharArray, kotlin/CharArray?>
returnType: kotlin/CharArray!
symbolKind: CLASS_MEMBER
typeParameters: []
visibility: Private
@@ -362,7 +362,7 @@ KtFunctionSymbol:
name: getBytes
origin: JAVA
receiverType: null
returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
returnType: kotlin/ByteArray!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -390,7 +390,7 @@ KtFunctionSymbol:
name: getBytes
origin: JAVA
receiverType: null
returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
returnType: kotlin/ByteArray!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -418,7 +418,7 @@ KtFunctionSymbol:
name: getBytes
origin: JAVA
receiverType: null
returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
returnType: kotlin/ByteArray!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: []
@@ -1072,7 +1072,7 @@ KtFunctionSymbol:
name: substring
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1100,7 +1100,7 @@ KtFunctionSymbol:
name: substring
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1158,7 +1158,7 @@ KtFunctionSymbol:
name: concat
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1186,7 +1186,7 @@ KtFunctionSymbol:
name: replace
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1215,7 +1215,7 @@ KtFunctionSymbol:
name: replace
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1300,7 +1300,7 @@ KtFunctionSymbol:
name: replaceFirst
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1329,7 +1329,7 @@ KtFunctionSymbol:
name: replaceAll
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1358,7 +1358,7 @@ KtFunctionSymbol:
name: split
origin: JAVA
receiverType: null
returnType: ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>
returnType: ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1387,7 +1387,7 @@ KtFunctionSymbol:
name: split
origin: JAVA
receiverType: null
returnType: ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>
returnType: ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1415,7 +1415,7 @@ KtFunctionSymbol:
name: toLowerCase
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1443,7 +1443,7 @@ KtFunctionSymbol:
name: toLowerCase
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: []
@@ -1469,7 +1469,7 @@ KtFunctionSymbol:
name: toUpperCase
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1497,7 +1497,7 @@ KtFunctionSymbol:
name: toUpperCase
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: []
@@ -1523,7 +1523,7 @@ KtFunctionSymbol:
name: trim
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: []
@@ -1575,7 +1575,7 @@ KtFunctionSymbol:
name: toCharArray
origin: JAVA
receiverType: null
returnType: ft<kotlin/CharArray, kotlin/CharArray?>
returnType: kotlin/CharArray!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: []
@@ -1601,7 +1601,7 @@ KtFunctionSymbol:
name: intern
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: []
@@ -1653,7 +1653,7 @@ KtNamedClassOrObjectSymbol:
origin: JAVA
superTypes: [
kotlin/Any
java/util/Comparator<ft<kotlin/String, kotlin/String?>>
java/util/Comparator<kotlin/String!>
java/io/Serializable
]
symbolKind: CLASS_MEMBER
analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ KtNamedClassOrObjectSymbol:
superTypes: [
kotlin/Any
java/io/Serializable
kotlin/Comparable<ft<kotlin/String, kotlin/String?>>
kotlin/Comparable<kotlin/String!>
kotlin/CharSequence
]
symbolKind: TOP_LEVEL