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

[FIR] Rename new visibilities to CamelCase

Browse Source 
It's more convenient since they are objects now instead of
  const fields in FE 1.0
This commit is contained in:
Dmitriy Novozhilov
2020-08-14 18:47:51 +03:00
parent 43821b681c
commit 18ae593700
48 changed files with 196 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenVisibilityTransformer.kt
+4 -4
View File
@@ -63,10 +63,10 @@ class AllOpenVisibilityTransformer(session: FirSession) : FirStatusTransformerEx
val symbol = (argument.calleeReference as? FirResolvedNamedReference)?.resolvedSymbol as? FirVariableSymbol<*> ?: return null
val name = symbol.callableId.takeIf { it.classId == VisibilityClassId }?.callableName ?: return null
return when (name) {
PublicName -> Visibilities.PUBLIC
InternalName -> Visibilities.INTERNAL
PrivateName -> Visibilities.PRIVATE
ProtectedName -> Visibilities.PROTECTED
PublicName -> Visibilities.Public
InternalName -> Visibilities.Internal
PrivateName -> Visibilities.Private
ProtectedName -> Visibilities.Protected
else -> null
}
}
plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenNestedClassGenerator.kt
+3 -3
View File
@@ -40,7 +40,7 @@ class AllOpenNestedClassGenerator(session: FirSession) : FirDeclarationGeneratio
resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
origin = FirDeclarationOrigin.Plugin(key)
status = FirResolvedDeclarationStatusImpl(
Visibilities.PRIVATE,
Visibilities.Private,
Modality.FINAL
).apply {
isInner = true
@@ -65,7 +65,7 @@ class AllOpenNestedClassGenerator(session: FirSession) : FirDeclarationGeneratio
type = ConeClassLikeTypeImpl(ConeClassLikeLookupTagImpl(classId), emptyArray(), isNullable = false)
}
status = FirResolvedDeclarationStatusImpl(
Visibilities.PUBLIC,
Visibilities.Public,
Modality.FINAL
)
symbol = FirConstructorSymbol(CallableId(classId, classId.shortClassName))
@@ -77,7 +77,7 @@ class AllOpenNestedClassGenerator(session: FirSession) : FirDeclarationGeneratio
origin = FirDeclarationOrigin.Plugin(key)
returnTypeRef = session.builtinTypes.intType
status = FirResolvedDeclarationStatusImpl(
Visibilities.PUBLIC,
Visibilities.Public,
Modality.FINAL
)
name = Name.identifier("hello")
plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenRecursiveNestedClassGenerator.kt
+1 -1
View File
@@ -38,7 +38,7 @@ class AllOpenRecursiveNestedClassGenerator(session: FirSession) : FirDeclaration
resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
origin = FirDeclarationOrigin.Plugin(key)
status = FirResolvedDeclarationStatusImpl(
Visibilities.PUBLIC,
Visibilities.Public,
Modality.FINAL
)
classKind = ClassKind.CLASS
plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenTopLevelDeclarationsGenerator.kt
+2 -2
View File
@@ -36,7 +36,7 @@ class AllOpenTopLevelDeclarationsGenerator(session: FirSession) : FirDeclaration
resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
origin = FirDeclarationOrigin.Plugin(key)
status = FirResolvedDeclarationStatusImpl(
Visibilities.PUBLIC,
Visibilities.Public,
Modality.FINAL
)
classKind = ClassKind.OBJECT
@@ -55,7 +55,7 @@ class AllOpenTopLevelDeclarationsGenerator(session: FirSession) : FirDeclaration
origin = FirDeclarationOrigin.Plugin(key)
returnTypeRef = session.builtinTypes.intType
status = FirResolvedDeclarationStatusImpl(
Visibilities.PUBLIC,
Visibilities.Public,
Modality.FINAL
)
name = Name.identifier("hello")