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

Fix origin calculation in CliFe10AnalysisFacade

Browse Source 
After this commit, all tests in
Fe10IdeNormalAnalysisSourceModuleFileScopeTestGenerated pass
This commit is contained in:
Mikhail Glukhikh
2022-05-20 18:04:35 +02:00
committed by Space
parent b710b26bf5
commit 133f874351
20 changed files with 24 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/CliFe10AnalysisFacade.kt
+1 -1
View File
@@ -64,7 +64,7 @@ class CliFe10AnalysisFacade(project: Project) : Fe10AnalysisFacade {
}
override fun getOrigin(file: VirtualFile): KtSymbolOrigin {
return KtSymbolOrigin.LIBRARY
return KtSymbolOrigin.SOURCE
}
}
analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.descriptors.txt
Vendored
-80
View File
@@ -1,80 +0,0 @@
KtSuccessCallInfo:
call = KtCompoundArrayAccessCall:
compoundAccess = CompoundAssign:
kind = PLUS_ASSIGN
operand = 1
operationPartiallyAppliedSymbol = KtPartiallyAppliedSymbol:
dispatchReceiver = KtExplicitReceiverValue:
expression = m["a"]
isSafeNavigation = false
extensionReceiver = null
signature = KtFunctionLikeSignature:
receiverType = null
returnType = kotlin.Int
symbol = kotlin/Int.plus(<dispatch receiver>: kotlin.Int, other: kotlin.Int): kotlin.Int
valueParameters = [
KtVariableLikeSignature:
name = other
receiverType = null
returnType = kotlin.Int
symbol = other: kotlin.Int
]
getPartiallyAppliedSymbol = KtPartiallyAppliedSymbol:
dispatchReceiver = KtExplicitReceiverValue:
expression = m
isSafeNavigation = false
extensionReceiver = null
signature = KtFunctionLikeSignature:
receiverType = null
returnType = kotlin.Int
symbol = /MyMap.get(<dispatch receiver>: MyMap<K1, V1>, k: K1): V1
valueParameters = [
KtVariableLikeSignature:
name = k
receiverType = null
returnType = kotlin.String
symbol = k: K1
]
indexArguments = [
"a"
]
setPartiallyAppliedSymbol = KtPartiallyAppliedSymbol:
dispatchReceiver = KtImplicitReceiverValue:
symbol = KtNamedClassOrObjectSymbol:
annotationsList: []
classIdIfNonLocal: Foo
classKind: INTERFACE
companionObject: null
isData: false
isExternal: false
isFun: false
isInline: false
isInner: false
modality: ABSTRACT
name: Foo
origin: LIBRARY
superTypes: [
kotlin/Any
]
symbolKind: TOP_LEVEL
typeParameters: []
visibility: Public
extensionReceiver = KtExplicitReceiverValue:
expression = m
isSafeNavigation = false
signature = KtFunctionLikeSignature:
receiverType = MyMap<kotlin.String, kotlin.Int>
returnType = kotlin.Unit
symbol = /Foo.set(<extension receiver>: MyMap<K2, V2>, <dispatch receiver>: Foo, k: K2, v: V2): kotlin.Unit
valueParameters = [
KtVariableLikeSignature:
name = k
receiverType = null
returnType = kotlin.String
symbol = k: K2,
KtVariableLikeSignature:
name = v
receiverType = null
returnType = kotlin.Int
symbol = v: V2
]
analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.descriptors.txt
Vendored
-74
View File
@@ -1,74 +0,0 @@
KtSuccessCallInfo:
call = KtCompoundArrayAccessCall:
compoundAccess = IncOrDecOperation:
kind = INC
precedence = POSTFIX
operationPartiallyAppliedSymbol = KtPartiallyAppliedSymbol:
dispatchReceiver = KtExplicitReceiverValue:
expression = m["a"]
isSafeNavigation = false
extensionReceiver = null
signature = KtFunctionLikeSignature:
receiverType = null
returnType = kotlin.Int
symbol = kotlin/Int.inc(<dispatch receiver>: kotlin.Int): kotlin.Int
valueParameters = []
getPartiallyAppliedSymbol = KtPartiallyAppliedSymbol:
dispatchReceiver = KtExplicitReceiverValue:
expression = m
isSafeNavigation = false
extensionReceiver = null
signature = KtFunctionLikeSignature:
receiverType = null
returnType = kotlin.Int
symbol = /MyMap.get(<dispatch receiver>: MyMap<K1, V1>, k: K1): V1
valueParameters = [
KtVariableLikeSignature:
name = k
receiverType = null
returnType = kotlin.String
symbol = k: K1
]
indexArguments = [
"a"
]
setPartiallyAppliedSymbol = KtPartiallyAppliedSymbol:
dispatchReceiver = KtImplicitReceiverValue:
symbol = KtNamedClassOrObjectSymbol:
annotationsList: []
classIdIfNonLocal: Foo
classKind: INTERFACE
companionObject: null
isData: false
isExternal: false
isFun: false
isInline: false
isInner: false
modality: ABSTRACT
name: Foo
origin: LIBRARY
superTypes: [
kotlin/Any
]
symbolKind: TOP_LEVEL
typeParameters: []
visibility: Public
extensionReceiver = KtExplicitReceiverValue:
expression = m
isSafeNavigation = false
signature = KtFunctionLikeSignature:
receiverType = MyMap<kotlin.String, kotlin.Int>
returnType = kotlin.Unit
symbol = /Foo.set(<extension receiver>: MyMap<K2, V2>, <dispatch receiver>: Foo, k: K2, v: V2): kotlin.Unit
valueParameters = [
KtVariableLikeSignature:
name = k
receiverType = null
returnType = kotlin.String
symbol = k: K2,
KtVariableLikeSignature:
name = v
receiverType = null
returnType = kotlin.Int
symbol = v: V2
]
analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.descriptors.txt
Vendored
-74
View File
@@ -1,74 +0,0 @@
KtSuccessCallInfo:
call = KtCompoundArrayAccessCall:
compoundAccess = IncOrDecOperation:
kind = INC
precedence = PREFIX
operationPartiallyAppliedSymbol = KtPartiallyAppliedSymbol:
dispatchReceiver = KtExplicitReceiverValue:
expression = m["a"]
isSafeNavigation = false
extensionReceiver = null
signature = KtFunctionLikeSignature:
receiverType = null
returnType = kotlin.Int
symbol = kotlin/Int.inc(<dispatch receiver>: kotlin.Int): kotlin.Int
valueParameters = []
getPartiallyAppliedSymbol = KtPartiallyAppliedSymbol:
dispatchReceiver = KtExplicitReceiverValue:
expression = m
isSafeNavigation = false
extensionReceiver = null
signature = KtFunctionLikeSignature:
receiverType = null
returnType = kotlin.Int
symbol = /MyMap.get(<dispatch receiver>: MyMap<K1, V1>, k: K1): V1
valueParameters = [
KtVariableLikeSignature:
name = k
receiverType = null
returnType = kotlin.String
symbol = k: K1
]
indexArguments = [
"a"
]
setPartiallyAppliedSymbol = KtPartiallyAppliedSymbol:
dispatchReceiver = KtImplicitReceiverValue:
symbol = KtNamedClassOrObjectSymbol:
annotationsList: []
classIdIfNonLocal: Foo
classKind: INTERFACE
companionObject: null
isData: false
isExternal: false
isFun: false
isInline: false
isInner: false
modality: ABSTRACT
name: Foo
origin: LIBRARY
superTypes: [
kotlin/Any
]
symbolKind: TOP_LEVEL
typeParameters: []
visibility: Public
extensionReceiver = KtExplicitReceiverValue:
expression = m
isSafeNavigation = false
signature = KtFunctionLikeSignature:
receiverType = MyMap<kotlin.String, kotlin.Int>
returnType = kotlin.Unit
symbol = /Foo.set(<extension receiver>: MyMap<K2, V2>, <dispatch receiver>: Foo, k: K2, v: V2): kotlin.Unit
valueParameters = [
KtVariableLikeSignature:
name = k
receiverType = null
returnType = kotlin.String
symbol = k: K2,
KtVariableLikeSignature:
name = v
receiverType = null
returnType = kotlin.Int
symbol = v: V2
]
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/Base.noGeneric
name: noGeneric
origin: LIBRARY
origin: SOURCE
KtFunctionSymbol:
callableIdIfNonLocal: test/ClassWithGenericBase.withOuterGeneric
@@ -11,7 +11,7 @@ KtFunctionSymbol:
KtFunctionSymbol:
callableIdIfNonLocal: test/Base.withOwnGeneric
name: withOwnGeneric
origin: LIBRARY
origin: SOURCE
KtFunctionSymbol:
callableIdIfNonLocal: test/ClassWithGenericBase.withOuterAndOwnGeneric
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/Base.noGeneric
name: noGeneric
origin: LIBRARY
origin: SOURCE
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/ClassWithGenericBase.withOuterGeneric
@@ -11,7 +11,7 @@ KtKotlinPropertySymbol:
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/Base.withOwnGeneric
name: withOwnGeneric
origin: LIBRARY
origin: SOURCE
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/ClassWithGenericBase.withOuterAndOwnGeneric
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/InterfaceWithFun.noGenerics_InterfaceWithFun
name: noGenerics_InterfaceWithFun
origin: LIBRARY
origin: SOURCE
KtFunctionSymbol:
callableIdIfNonLocal: test/ClassWithInterfaceWithFun.withOuterGeneric_InterfaceWithFun
@@ -11,7 +11,7 @@ KtFunctionSymbol:
KtFunctionSymbol:
callableIdIfNonLocal: test/InterfaceWithFunBase.noGenerics_InterfaceWithFunBase
name: noGenerics_InterfaceWithFunBase
origin: LIBRARY
origin: SOURCE
KtFunctionSymbol:
callableIdIfNonLocal: test/InterfaceWithFun.withOuterGenericT1_InterfaceWithFunBase
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.txt
Vendored
+4 -4
View File
@@ -1,7 +1,7 @@
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/InterfaceWithVal.noGenerics_InterfaceWithVal
name: noGenerics_InterfaceWithVal
origin: LIBRARY
origin: SOURCE
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOuterGeneric_InterfaceWithVal
@@ -11,7 +11,7 @@ KtKotlinPropertySymbol:
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/InterfaceWithVal.withOwnGeneric_InterfaceWithVal
name: withOwnGeneric_InterfaceWithVal
origin: LIBRARY
origin: SOURCE
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOwnAndOuterGeneric_InterfaceWithVal
@@ -21,7 +21,7 @@ KtKotlinPropertySymbol:
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/InterfaceWithValBase.noGenerics_InterfaceWithValBase
name: noGenerics_InterfaceWithValBase
origin: LIBRARY
origin: SOURCE
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/InterfaceWithVal.withOuterGenericT1_InterfaceWithValBase
@@ -36,7 +36,7 @@ KtKotlinPropertySymbol:
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/InterfaceWithValBase.withOwnGeneric_InterfaceWithValBase
name: withOwnGeneric_InterfaceWithValBase
origin: LIBRARY
origin: SOURCE
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/InterfaceWithVal.withOwnAndOuterGenericT1_InterfaceWithValBase
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
KtFunctionSymbol:
callableIdIfNonLocal: null
name: noGenerics
origin: LIBRARY
origin: SOURCE
KtFunctionSymbol:
callableIdIfNonLocal: null
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
KtFunctionSymbol:
callableIdIfNonLocal: null
name: noGenerics
origin: LIBRARY
origin: SOURCE
KtFunctionSymbol:
callableIdIfNonLocal: null
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.txt
Vendored
+2 -2
View File
@@ -1,12 +1,12 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Base.noGeneric
name: noGeneric
origin: LIBRARY
origin: SOURCE
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Base.withOuter
name: withOuter
origin: LIBRARY
origin: SOURCE
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.txt
Vendored
+2 -2
View File
@@ -1,12 +1,12 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Base.noGeneric
name: noGeneric
origin: LIBRARY
origin: SOURCE
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Base.withOuter
name: withOuter
origin: LIBRARY
origin: SOURCE
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Child.withOwnAndOuter
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Base.noGeneric
name: noGeneric
origin: LIBRARY
origin: SOURCE
KtFunctionSymbol:
callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Base.noGeneric
name: noGeneric
origin: LIBRARY
origin: SOURCE
KtFunctionSymbol:
callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Base.noGeneric
name: noGeneric
origin: LIBRARY
origin: SOURCE
KtFunctionSymbol:
callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/MyInterface.withOwnGeneric_InterfaceWithValBase
name: withOwnGeneric_InterfaceWithValBase
origin: LIBRARY
origin: SOURCE
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/Inheritor.withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase
analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.descriptors.txt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ KtNamedClassOrObjectSymbol:
isInner: false
modality: FINAL
name: MyClass
origin: LIBRARY
origin: SOURCE
superTypes: [
kotlin/Any
]
analysis/analysis-api/testData/symbols/symbolByReference/explicitLambdaParameter.descriptors.txt
Vendored
-14
View File
@@ -1,14 +0,0 @@
KtValueParameterSymbol:
annotationsList: []
callableIdIfNonLocal: null
hasDefaultValue: false
isExtension: false
isImplicitLambdaParameter: false
isVararg: false
name: it
origin: LIBRARY
receiverType: null
returnType: kotlin/Int
symbolKind: LOCAL
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
analysis/analysis-api/testData/symbols/symbolByReference/genericFromOuterClassInInnerClass.descriptors.txt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ KtFunctionSymbol:
isSuspend: false
modality: FINAL
name: withOuter
origin: LIBRARY
origin: SOURCE
receiverType: null
returnType: Outer?
symbolKind: CLASS_MEMBER
analysis/analysis-api/testData/symbols/symbolByReference/withTestCompilerPluginEnabled/generatedCompanionWorksAsValue.descriptors.txt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ KtNamedClassOrObjectSymbol:
isInner: false
modality: FINAL
name: WithGeneratedCompanion
origin: LIBRARY
origin: SOURCE
superTypes: [
kotlin/Any
]