From 78bb1f10763cecd7eb75978d1c1dc06015bfb1e8 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 25 Aug 2020 15:36:46 +0300 Subject: [PATCH] FIR IDE: fix testdata in idea-frontend-fir --- .../testData/memberScopeByFqName/MutableList.txt | 2 +- .../memberScopeByFqName/java.lang.String.txt | 11 +---------- .../testData/symbolPointer/memberProperties.kt | 14 ++++++++++---- .../testData/symbolPointer/topLevelProperties.kt | 14 ++++++++++---- .../testData/symbolsByPsi/classMembes.kt | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt index fc2e3cf1542..170166a60e5 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt @@ -288,7 +288,7 @@ KtFirPropertySymbol: modality: ABSTRACT name: size origin: LIBRARY - receiverType: kotlin/Int + receiverType: null symbolKind: MEMBER type: kotlin/Int diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt index 574cb1334c1..3902e0d4bfc 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt @@ -63,7 +63,7 @@ KtFirPropertySymbol: modality: ABSTRACT name: length origin: LIBRARY - receiverType: kotlin/Int + receiverType: null symbolKind: MEMBER type: kotlin/Int @@ -836,12 +836,3 @@ KtFirFunctionSymbol: type: kotlin/Char typeParameters: [] valueParameters: [KtFirFunctionValueParameterSymbol(index)] - -KtFirClassOrObjectSymbol: - classIdIfNonLocal: java/lang/String.CaseInsensitiveComparator - classKind: CLASS - modality: OPEN - name: CaseInsensitiveComparator - origin: JAVA - symbolKind: MEMBER - typeParameters: [] diff --git a/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt b/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt index a9f9399690c..0df24252517 100644 --- a/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt +++ b/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt @@ -1,6 +1,6 @@ class A { val x: Int = 10 - val Int.y = this + val Int.y get() = this } // SYMBOLS: @@ -11,10 +11,16 @@ KtFirPropertySymbol: modality: FINAL name: x origin: SOURCE - receiverType: kotlin/Int + receiverType: null symbolKind: MEMBER type: kotlin/Int +KtFirPropertyGetterSymbol: + isDefault: false + modality: FINAL + origin: SOURCE + type: kotlin/Int + KtFirPropertySymbol: callableIdIfNonLocal: A.y isExtension: true @@ -22,9 +28,9 @@ KtFirPropertySymbol: modality: FINAL name: y origin: SOURCE - receiverType: A + receiverType: kotlin/Int symbolKind: MEMBER - type: A + type: kotlin/Int KtFirClassOrObjectSymbol: classIdIfNonLocal: A diff --git a/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt b/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt index 53388b888d6..49b10a5735a 100644 --- a/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt +++ b/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt @@ -1,5 +1,5 @@ val x: Int = 10 -val Int.y = this +val Int.y get() = this // SYMBOLS: KtFirPropertySymbol: @@ -9,10 +9,16 @@ KtFirPropertySymbol: modality: FINAL name: x origin: SOURCE - receiverType: kotlin/Int + receiverType: null symbolKind: TOP_LEVEL type: kotlin/Int +KtFirPropertyGetterSymbol: + isDefault: false + modality: FINAL + origin: SOURCE + type: kotlin/Int + KtFirPropertySymbol: callableIdIfNonLocal: y isExtension: true @@ -20,6 +26,6 @@ KtFirPropertySymbol: modality: FINAL name: y origin: SOURCE - receiverType: ERROR CLASS: Unresolved this@null + receiverType: kotlin/Int symbolKind: TOP_LEVEL - type: ERROR CLASS: Unresolved this@null + type: kotlin/Int diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt index 9d6d7486d88..dddb8eb6a6f 100644 --- a/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt +++ b/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt @@ -12,7 +12,7 @@ KtFirPropertySymbol: modality: FINAL name: a origin: SOURCE - receiverType: kotlin/Int + receiverType: null symbolKind: MEMBER type: kotlin/Int