[FIR] Set status.isOverride for fake overrides

Even though SO may not be correct overrides sometimes, it feels more natural to treat fake overrides as... well, "overrides". And without it we'd need to make the code in `FirOverrideChecker` less intuitive.
JetBrains · Feb 15, 2024 · 7056ad5 · 7056ad5
1 parent afd8895
commit 7056ad5
Show file tree

Hide file tree

Showing 252 changed files with 1,025 additions and 1,015 deletions.
diff --git a/...testData/components/scopeProvider/declaredMemberScope/delegateInterfaceLibrary.pretty.txt b/...testData/components/scopeProvider/declaredMemberScope/delegateInterfaceLibrary.pretty.txt
@@ -1,15 +1,15 @@
 private val p: A
 
-open var bar: kotlin.Long
+override var bar: kotlin.Long
 
-open val kotlin.Int.doo: kotlin.String
+override val kotlin.Int.doo: kotlin.String
 
-open fun foo()
+override fun foo()
 
-open val foo: kotlin.Int
+override val foo: kotlin.Int
 
-open var kotlin.Int.zoo: kotlin.Unit
+override var kotlin.Int.zoo: kotlin.Unit
 
-open fun kotlin.Int.smth(): kotlin.Short
+override fun kotlin.Int.smth(): kotlin.Short
 
 constructor(p: A)
diff --git a/...is-api/testData/components/scopeProvider/declaredMemberScope/delegateInterfaceLibrary.txt b/...is-api/testData/components/scopeProvider/declaredMemberScope/delegateInterfaceLibrary.txt
@@ -121,7 +121,7 @@ KtKotlinPropertySymbol:
     isDefault: true
     isExtension: false
     isInline: false
-    isOverride: false
+    isOverride: true
     modality: OPEN
     origin: SOURCE
     receiverParameter: null
@@ -152,7 +152,7 @@ KtKotlinPropertySymbol:
   isExtension: false
   isFromPrimaryConstructor: false
   isLateInit: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isVal: false
   modality: OPEN
@@ -172,7 +172,7 @@ KtKotlinPropertySymbol:
     isDefault: true
     isExtension: false
     isInline: false
-    isOverride: false
+    isOverride: true
     modality: OPEN
     origin: SOURCE
     parameter: KtValueParameterSymbol:
@@ -289,7 +289,7 @@ KtKotlinPropertySymbol:
     isDefault: true
     isExtension: false
     isInline: false
-    isOverride: false
+    isOverride: true
     modality: OPEN
     origin: SOURCE
     receiverParameter: KtReceiverParameterSymbol:
@@ -330,7 +330,7 @@ KtKotlinPropertySymbol:
   isExtension: true
   isFromPrimaryConstructor: false
   isLateInit: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isVal: true
   modality: OPEN
@@ -382,7 +382,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: OPEN
@@ -438,7 +438,7 @@ KtKotlinPropertySymbol:
     isDefault: true
     isExtension: false
     isInline: false
-    isOverride: false
+    isOverride: true
     modality: OPEN
     origin: SOURCE
     receiverParameter: null
@@ -469,7 +469,7 @@ KtKotlinPropertySymbol:
   isExtension: false
   isFromPrimaryConstructor: false
   isLateInit: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isVal: true
   modality: OPEN
@@ -529,7 +529,7 @@ KtKotlinPropertySymbol:
     isDefault: true
     isExtension: false
     isInline: false
-    isOverride: false
+    isOverride: true
     modality: OPEN
     origin: SOURCE
     receiverParameter: KtReceiverParameterSymbol:
@@ -570,7 +570,7 @@ KtKotlinPropertySymbol:
   isExtension: true
   isFromPrimaryConstructor: false
   isLateInit: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isVal: false
   modality: OPEN
@@ -600,7 +600,7 @@ KtKotlinPropertySymbol:
     isDefault: true
     isExtension: false
     isInline: false
-    isOverride: false
+    isOverride: true
     modality: OPEN
     origin: SOURCE
     parameter: KtValueParameterSymbol:
@@ -709,7 +709,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: OPEN

diff --git a/...-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.pretty.txt b/...-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.pretty.txt
@@ -1 +1 @@
-open val foo: kotlin.Int
+override val foo: kotlin.Int
diff --git a/...nalysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.txt b/...nalysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.txt
@@ -15,7 +15,7 @@ KtKotlinPropertySymbol:
   isExtension: false
   isFromPrimaryConstructor: false
   isLateInit: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isVal: true
   modality: OPEN

diff --git a/...sis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.pretty.txt b/...sis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.pretty.txt
@@ -1,11 +1,11 @@
-open var kotlin.Int.zoo: kotlin.Unit
+override var kotlin.Int.zoo: kotlin.Unit
 
-open fun foo()
+override fun foo()
 
-open val foo: kotlin.Int
+override val foo: kotlin.Int
 
-open fun kotlin.Int.smth(): kotlin.Short
+override fun kotlin.Int.smth(): kotlin.Short
 
-open var bar: kotlin.Long
+override var bar: kotlin.Long
 
-open val kotlin.Int.doo: kotlin.String
+override val kotlin.Int.doo: kotlin.String
diff --git a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.txt
@@ -15,7 +15,7 @@ KtKotlinPropertySymbol:
   isExtension: true
   isFromPrimaryConstructor: false
   isLateInit: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isVal: false
   modality: OPEN
@@ -67,7 +67,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: OPEN
@@ -108,7 +108,7 @@ KtKotlinPropertySymbol:
   isExtension: false
   isFromPrimaryConstructor: false
   isLateInit: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isVal: true
   modality: OPEN
@@ -150,7 +150,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: OPEN
@@ -201,7 +201,7 @@ KtKotlinPropertySymbol:
   isExtension: false
   isFromPrimaryConstructor: false
   isLateInit: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isVal: false
   modality: OPEN
@@ -246,7 +246,7 @@ KtKotlinPropertySymbol:
   isExtension: true
   isFromPrimaryConstructor: false
   isLateInit: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isVal: true
   modality: OPEN

diff --git a/...is-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.pretty.txt b/...is-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.pretty.txt
@@ -1,3 +1,3 @@
-open fun foo(): kotlin.Int
+override fun foo(): kotlin.Int
 
-open fun bar(): kotlin.Int
+override fun bar(): kotlin.Int
diff --git a/.../analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.txt b/.../analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.txt
@@ -12,7 +12,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: OPEN
@@ -50,7 +50,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: OPEN

diff --git a/...ysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.pretty.txt b/...ysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.pretty.txt
@@ -1 +1 @@
-open fun bar()
+override fun bar()
diff --git a/...is/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.txt b/...is/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.txt
@@ -12,7 +12,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: OPEN

diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.pretty.txt
@@ -24,28 +24,28 @@ operator fun set(index: kotlin.Int, element: E): E
 
 fun subList(fromIndex: kotlin.Int, toIndex: kotlin.Int): kotlin.collections.MutableList<E>
 
-val size: kotlin.Int
+override val size: kotlin.Int
 
-fun isEmpty(): kotlin.Boolean
+override fun isEmpty(): kotlin.Boolean
 
-operator fun contains(element: E): kotlin.Boolean
+override operator fun contains(element: E): kotlin.Boolean
 
-operator fun iterator(): kotlin.collections.MutableIterator<E>
+override operator fun iterator(): kotlin.collections.MutableIterator<E>
 
-fun containsAll(elements: kotlin.collections.Collection<E>): kotlin.Boolean
+override fun containsAll(elements: kotlin.collections.Collection<E>): kotlin.Boolean
 
-operator fun get(index: kotlin.Int): E
+override operator fun get(index: kotlin.Int): E
 
-fun indexOf(element: E): kotlin.Int
+override fun indexOf(element: E): kotlin.Int
 
-fun lastIndexOf(element: E): kotlin.Int
+override fun lastIndexOf(element: E): kotlin.Int
 
 open operator fun equals(other: kotlin.Any?): kotlin.Boolean
 
 open fun hashCode(): kotlin.Int
 
 open fun toString(): kotlin.String
 
-fun getFirst(): E
+override fun getFirst(): E
 
-fun getLast(): E
+override fun getLast(): E
diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.txt
@@ -954,7 +954,7 @@ KtKotlinPropertySymbol:
   isExtension: false
   isFromPrimaryConstructor: false
   isLateInit: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isVal: true
   modality: ABSTRACT
@@ -1000,7 +1000,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: ABSTRACT
@@ -1042,7 +1042,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: true
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: ABSTRACT
@@ -1108,7 +1108,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: true
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: ABSTRACT
@@ -1154,7 +1154,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: ABSTRACT
@@ -1225,7 +1225,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: true
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: ABSTRACT
@@ -1291,7 +1291,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: ABSTRACT
@@ -1357,7 +1357,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: ABSTRACT
@@ -1562,7 +1562,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: OPEN
@@ -1603,7 +1603,7 @@ KtFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: false
+  isOverride: true
   isStatic: false
   isSuspend: false
   modality: OPEN