[AA] Add synthetic properties scopes to scope context for position

2023-06-24 19:53:22 +03:00
parent 5d8e23e971
commit 116de97f54
25 changed files with 672 additions and 48 deletions
@@ -6,7 +6,7 @@ implicit receivers:
 scopes:
  LocalScope, index = 0, empty

-  SimpleTypeScope, index = 1
+  TypeScope, index = 1
    classifiers: 0
    callables: 4
      fun memberInContext()
@@ -9,7 +9,7 @@ implicit receivers:
 scopes:
  LocalScope, index = 0, empty

-  SimpleTypeScope, index = 1
+  TypeScope, index = 1
    classifiers: 0
    callables: 4
      KtFunctionSymbol:
@@ -11,7 +11,7 @@ scopes:

  LocalScope, index = 1, empty

-  SimpleTypeScope, index = 2
+  TypeScope, index = 2
    classifiers: 1
      companion object
    callables: 11
@@ -40,7 +40,7 @@ scopes:
      companion object
    callables: 0

-  SimpleTypeScope, index = 5
+  TypeScope, index = 5
    classifiers: 0
    callables: 3
      fun equals(other: kotlin.Any?): kotlin.Boolean
@@ -17,7 +17,7 @@ scopes:

  LocalScope, index = 1, empty

-  SimpleTypeScope, index = 2
+  TypeScope, index = 2
    classifiers: 1
      KtNamedClassOrObjectSymbol:
        annotationsList: []
@@ -642,7 +642,7 @@ scopes:
        visibility: Public
    callables: 0

-  SimpleTypeScope, index = 5
+  TypeScope, index = 5
    classifiers: 0
    callables: 3
      KtFunctionSymbol:
@@ -7,13 +7,13 @@ implicit receivers:
  owner symbol: KtFirAnonymousFunctionSymbol

 scopes:
-  SimpleTypeScope, index = 0, empty
+  TypeScope, index = 0, empty

  LocalScope, index = 1, empty

  LocalScope, index = 2, empty

-  SimpleTypeScope, index = 3
+  TypeScope, index = 3
    classifiers: 0
    callables: 5
      fun add(e: T)
@@ -16,13 +16,13 @@ implicit receivers:
  owner symbol: KtFirAnonymousFunctionSymbol

 scopes:
-  SimpleTypeScope, index = 0, empty
+  TypeScope, index = 0, empty

  LocalScope, index = 1, empty

  LocalScope, index = 2, empty

-  SimpleTypeScope, index = 3
+  TypeScope, index = 3
    classifiers: 0
    callables: 5
      KtFunctionSymbol:
@@ -11,7 +11,7 @@ scopes:

  LocalScope, index = 1, empty

-  SimpleTypeScope, index = 2
+  TypeScope, index = 2
    classifiers: 0
    callables: 5
      val propertyInY: kotlin.Int
@@ -28,7 +28,7 @@ scopes:

  LocalScope, index = 1, empty

-  SimpleTypeScope, index = 2
+  TypeScope, index = 2
    classifiers: 0
    callables: 5
      KtKotlinPropertySymbol:
@@ -10,7 +10,7 @@ implicit receivers:
  owner symbol: KtFirNamedClassOrObjectSymbol

 scopes:
-  SimpleTypeScope, index = 0
+  TypeScope, index = 0
    classifiers: 0
    callables: 4
      fun memberInA()
@@ -22,7 +22,7 @@ scopes:

  LocalScope, index = 2, empty

-  SimpleTypeScope, index = 3
+  TypeScope, index = 3
    classifiers: 0
    callables: 4
      fun memberInB()
@@ -58,7 +58,7 @@ scopes:
      T
    callables: 0

-  SimpleTypeScope, index = 10
+  TypeScope, index = 10
    classifiers: 2
      class NestedInC
      class NestedInJavaClass
@@ -19,7 +19,7 @@ implicit receivers:
  owner symbol: KtFirNamedClassOrObjectSymbol

 scopes:
-  SimpleTypeScope, index = 0
+  TypeScope, index = 0
    classifiers: 0
    callables: 4
      KtFunctionSymbol:
@@ -156,7 +156,7 @@ scopes:

  LocalScope, index = 2, empty

-  SimpleTypeScope, index = 3
+  TypeScope, index = 3
    classifiers: 0
    callables: 4
      KtFunctionSymbol:
@@ -416,7 +416,7 @@ scopes:
        variance: INVARIANT
    callables: 0

-  SimpleTypeScope, index = 10
+  TypeScope, index = 10
    classifiers: 2
      KtNamedClassOrObjectSymbol:
        annotationsList: []
@@ -0,0 +1,11 @@
+// FILE: JavaClass.java
+public class JavaClass {
+    public Integer getValue() {
+        return 1;
+    }
+}
+
+// FILE: main.kt
+fun JavaClass.test() {
+    <expr>e</expr>
+}
@@ -0,0 +1,37 @@
+element: e
+implicit receivers:
+  type: JavaClass
+  owner symbol: KtFirFunctionSymbol
+
+scopes:
+  LocalScope, index = 0, empty
+
+  TypeScope, index = 1
+    classifiers: 0
+    callables: 5
+      fun getValue(): kotlin.Int?
+      fun equals(other: kotlin.Any?): kotlin.Boolean
+      fun hashCode(): kotlin.Int
+      fun toString(): kotlin.String
+      val value: kotlin.Int?
+        get()
+
+  LocalScope, index = 2, empty
+
+  ExplicitSimpleImportingScope, index = 3, empty
+
+  PackageMemberScope, index = 4
+    classifiers: 0
+    callables: 1
+      fun JavaClass.test()
+
+  DefaultSimpleImportingScope, index = 5
+
+  DefaultSimpleImportingScope, index = 6
+
+  ExplicitStarImportingScope, index = 7, empty
+
+  DefaultSimpleImportingScope, index = 8
+
+  DefaultStarImportingScope, index = 9
+
@@ -0,0 +1,243 @@
+element: e
+implicit receivers:
+  type: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: JavaClass
+  owner symbol: KtFirFunctionSymbol
+
+scopes:
+  LocalScope, index = 0, empty
+
+  TypeScope, index = 1
+    classifiers: 0
+    callables: 5
+      KtFunctionSymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /JavaClass.getValue
+        contextReceivers: []
+        contractEffects: []
+        hasStableParameterNames: false
+        isBuiltinFunctionInvoke: false
+        isExtension: false
+        isExternal: false
+        isInfix: false
+        isInline: false
+        isOperator: false
+        isOverride: false
+        isStatic: false
+        isSuspend: false
+        modality: OPEN
+        name: getValue
+        origin: JAVA
+        receiverParameter: null
+        returnType: KtFlexibleType:
+          annotationsList: []
+          type: kotlin/Int!
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        valueParameters: []
+        visibility: Public
+      KtFunctionSymbol:
+        annotationsList: []
+        callableIdIfNonLocal: kotlin/Any.equals
+        contextReceivers: []
+        contractEffects: []
+        hasStableParameterNames: true
+        isBuiltinFunctionInvoke: false
+        isExtension: false
+        isExternal: false
+        isInfix: false
+        isInline: false
+        isOperator: true
+        isOverride: false
+        isStatic: false
+        isSuspend: false
+        modality: OPEN
+        name: equals
+        origin: LIBRARY
+        receiverParameter: null
+        returnType: KtUsualClassType:
+          annotationsList: []
+          ownTypeArguments: []
+          type: kotlin/Boolean
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        valueParameters: [
+          KtValueParameterSymbol:
+            annotationsList: []
+            callableIdIfNonLocal: null
+            contextReceivers: []
+            generatedPrimaryConstructorProperty: null
+            hasDefaultValue: false
+            isCrossinline: false
+            isExtension: false
+            isImplicitLambdaParameter: false
+            isNoinline: false
+            isVararg: false
+            name: other
+            origin: LIBRARY
+            receiverParameter: null
+            returnType: KtUsualClassType:
+              annotationsList: []
+              ownTypeArguments: []
+              type: kotlin/Any?
+            symbolKind: LOCAL
+            typeParameters: []
+        ]
+        visibility: Public
+      KtFunctionSymbol:
+        annotationsList: []
+        callableIdIfNonLocal: kotlin/Any.hashCode
+        contextReceivers: []
+        contractEffects: []
+        hasStableParameterNames: true
+        isBuiltinFunctionInvoke: false
+        isExtension: false
+        isExternal: false
+        isInfix: false
+        isInline: false
+        isOperator: false
+        isOverride: false
+        isStatic: false
+        isSuspend: false
+        modality: OPEN
+        name: hashCode
+        origin: LIBRARY
+        receiverParameter: null
+        returnType: KtUsualClassType:
+          annotationsList: []
+          ownTypeArguments: []
+          type: kotlin/Int
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        valueParameters: []
+        visibility: Public
+      KtFunctionSymbol:
+        annotationsList: []
+        callableIdIfNonLocal: kotlin/Any.toString
+        contextReceivers: []
+        contractEffects: []
+        hasStableParameterNames: true
+        isBuiltinFunctionInvoke: false
+        isExtension: false
+        isExternal: false
+        isInfix: false
+        isInline: false
+        isOperator: false
+        isOverride: false
+        isStatic: false
+        isSuspend: false
+        modality: OPEN
+        name: toString
+        origin: LIBRARY
+        receiverParameter: null
+        returnType: KtUsualClassType:
+          annotationsList: []
+          ownTypeArguments: []
+          type: kotlin/String
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        valueParameters: []
+        visibility: Public
+      KtSyntheticJavaPropertySymbol:
+        annotationsList: []
+        backingFieldSymbol: null
+        callableIdIfNonLocal: /JavaClass.value
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: /JavaClass.getValue
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: true
+          isDefault: false
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: OPEN
+          origin: JAVA_SYNTHETIC_PROPERTY
+          receiverParameter: null
+          returnType: KtFlexibleType:
+            annotationsList: []
+            type: kotlin/Int!
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: null
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        javaGetterSymbol: KtFunctionSymbol(/JavaClass.getValue)
+        javaSetterSymbol: null
+        modality: OPEN
+        name: value
+        origin: JAVA_SYNTHETIC_PROPERTY
+        receiverParameter: null
+        returnType: KtFlexibleType:
+          annotationsList: []
+          type: kotlin/Int!
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
+
+  LocalScope, index = 2, empty
+
+  ExplicitSimpleImportingScope, index = 3, empty
+
+  PackageMemberScope, index = 4
+    classifiers: 0
+    callables: 1
+      KtFunctionSymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /test
+        contextReceivers: []
+        contractEffects: []
+        hasStableParameterNames: true
+        isBuiltinFunctionInvoke: false
+        isExtension: true
+        isExternal: false
+        isInfix: false
+        isInline: false
+        isOperator: false
+        isOverride: false
+        isStatic: false
+        isSuspend: false
+        modality: FINAL
+        name: test
+        origin: SOURCE
+        receiverParameter: KtReceiverParameterSymbol:
+          annotationsList: []
+          origin: SOURCE
+          owningCallableSymbol: KtFunctionSymbol(/test)
+          type: KtUsualClassType:
+            annotationsList: []
+            ownTypeArguments: []
+            type: JavaClass
+        returnType: KtUsualClassType:
+          annotationsList: []
+          ownTypeArguments: []
+          type: kotlin/Unit
+        symbolKind: TOP_LEVEL
+        typeParameters: []
+        valueParameters: []
+        visibility: Public
+
+  DefaultSimpleImportingScope, index = 5
+
+  DefaultSimpleImportingScope, index = 6
+
+  ExplicitStarImportingScope, index = 7, empty
+
+  DefaultSimpleImportingScope, index = 8
+
+  DefaultStarImportingScope, index = 9
+