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

Fix proguard

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-04-30 19:27:29 +03:00
parent 5262f0a53f
commit 8a2b41c8cb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirProviderImpl.kt
+8 -8
View File
@@ -48,9 +48,9 @@ class FirProviderImpl(val session: FirSession) : FirProvider {
recordFile(file, state) recordFile(file, state)
} }
private fun recordFile(file: FirFile, state: State) = with(state) { private fun recordFile(file: FirFile, state: State) {
val packageName = file.packageFqName val packageName = file.packageFqName
fileMap.merge(packageName, listOf(file)) { a, b -> a + b } state.fileMap.merge(packageName, listOf(file)) { a, b -> a + b }
file.acceptChildren(object : FirVisitorVoid() { file.acceptChildren(object : FirVisitorVoid() {
override fun visitElement(element: FirElement) {} override fun visitElement(element: FirElement) {}
@@ -59,23 +59,23 @@ class FirProviderImpl(val session: FirSession) : FirProvider {
override fun visitRegularClass(regularClass: FirRegularClass) { override fun visitRegularClass(regularClass: FirRegularClass) {
val classId = regularClass.symbol.classId val classId = regularClass.symbol.classId
classifierMap[classId] = regularClass state.classifierMap[classId] = regularClass
classifierContainerFileMap[classId] = file state.classifierContainerFileMap[classId] = file
regularClass.acceptChildren(this) regularClass.acceptChildren(this)
} }
override fun visitTypeAlias(typeAlias: FirTypeAlias) { override fun visitTypeAlias(typeAlias: FirTypeAlias) {
val classId = typeAlias.symbol.classId val classId = typeAlias.symbol.classId
classifierMap[classId] = typeAlias state.classifierMap[classId] = typeAlias
classifierContainerFileMap[classId] = file state.classifierContainerFileMap[classId] = file
} }
override fun visitCallableMemberDeclaration(callableMemberDeclaration: FirCallableMemberDeclaration) { override fun visitCallableMemberDeclaration(callableMemberDeclaration: FirCallableMemberDeclaration) {
val symbol = callableMemberDeclaration.symbol as ConeCallableSymbol val symbol = callableMemberDeclaration.symbol as ConeCallableSymbol
val callableId = symbol.callableId val callableId = symbol.callableId
callableMap.merge(callableId, listOf(symbol)) { a, b -> a + b } state.callableMap.merge(callableId, listOf(symbol)) { a, b -> a + b }
callableContainerMap[symbol] = file state.callableContainerMap[symbol] = file
} }
override fun visitConstructor(constructor: FirConstructor) { override fun visitConstructor(constructor: FirConstructor) {