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

Minor: reformat

Browse Source
This commit is contained in:
Pavel Kirpichenkov
2022-01-18 15:32:57 +03:00
committed by TeamCityServer
parent a46e683c85
commit 8ad06ef725
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/ClassicPositioningStrategies.kt
+11 -5
View File
@@ -49,7 +49,8 @@ object ClassicPositioningStrategies {
val callableDeclaration = element as? KtCallableDeclaration val callableDeclaration = element as? KtCallableDeclaration
val incompatibility = diagnostic.firstIncompatibility val incompatibility = diagnostic.firstIncompatibility
return when (incompatibility) { return when (incompatibility) {
null, ExpectActualCompatibility.Incompatible.Unknown, is ExpectActualCompatibility.Incompatible.ClassScopes, ExpectActualCompatibility.Incompatible.EnumEntries -> null null, ExpectActualCompatibility.Incompatible.Unknown, is ExpectActualCompatibility.Incompatible.ClassScopes,
ExpectActualCompatibility.Incompatible.EnumEntries -> null
ExpectActualCompatibility.Incompatible.ClassKind -> { ExpectActualCompatibility.Incompatible.ClassKind -> {
val startElement = val startElement =
element.modifierList?.getModifier(KtTokens.ENUM_KEYWORD) element.modifierList?.getModifier(KtTokens.ENUM_KEYWORD)
@@ -64,7 +65,9 @@ object ClassicPositioningStrategies {
} }
} }
ExpectActualCompatibility.Incompatible.TypeParameterNames, ExpectActualCompatibility.Incompatible.TypeParameterCount, ExpectActualCompatibility.Incompatible.TypeParameterNames, ExpectActualCompatibility.Incompatible.TypeParameterCount,
ExpectActualCompatibility.Incompatible.TypeParameterUpperBounds, ExpectActualCompatibility.Incompatible.TypeParameterVariance, ExpectActualCompatibility.Incompatible.TypeParameterReified -> { ExpectActualCompatibility.Incompatible.TypeParameterUpperBounds,
ExpectActualCompatibility.Incompatible.TypeParameterVariance,
ExpectActualCompatibility.Incompatible.TypeParameterReified -> {
(element as? KtTypeParameterListOwner)?.typeParameterList (element as? KtTypeParameterListOwner)?.typeParameterList
} }
ExpectActualCompatibility.Incompatible.CallableKind -> { ExpectActualCompatibility.Incompatible.CallableKind -> {
@@ -74,14 +77,17 @@ object ClassicPositioningStrategies {
ExpectActualCompatibility.Incompatible.ParameterShape -> { ExpectActualCompatibility.Incompatible.ParameterShape -> {
callableDeclaration?.let { it.receiverTypeReference ?: it.valueParameterList } callableDeclaration?.let { it.receiverTypeReference ?: it.valueParameterList }
} }
ExpectActualCompatibility.Incompatible.ParameterCount, ExpectActualCompatibility.Incompatible.ParameterTypes, ExpectActualCompatibility.Incompatible.ParameterNames, ExpectActualCompatibility.Incompatible.ParameterCount, ExpectActualCompatibility.Incompatible.ParameterTypes,
ExpectActualCompatibility.Incompatible.ValueParameterVararg, ExpectActualCompatibility.Incompatible.ValueParameterNoinline, ExpectActualCompatibility.Incompatible.ValueParameterCrossinline -> { ExpectActualCompatibility.Incompatible.ParameterNames, ExpectActualCompatibility.Incompatible.ValueParameterVararg,
ExpectActualCompatibility.Incompatible.ValueParameterNoinline,
ExpectActualCompatibility.Incompatible.ValueParameterCrossinline -> {
callableDeclaration?.valueParameterList callableDeclaration?.valueParameterList
} }
ExpectActualCompatibility.Incompatible.ReturnType -> { ExpectActualCompatibility.Incompatible.ReturnType -> {
callableDeclaration?.typeReference callableDeclaration?.typeReference
} }
ExpectActualCompatibility.Incompatible.FunctionModifiersDifferent, ExpectActualCompatibility.Incompatible.FunctionModifiersNotSubset, ExpectActualCompatibility.Incompatible.FunctionModifiersDifferent,
ExpectActualCompatibility.Incompatible.FunctionModifiersNotSubset,
ExpectActualCompatibility.Incompatible.PropertyModifiers, ExpectActualCompatibility.Incompatible.ClassModifiers -> { ExpectActualCompatibility.Incompatible.PropertyModifiers, ExpectActualCompatibility.Incompatible.ClassModifiers -> {
element.modifierList element.modifierList
} }