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

React to review comments

Browse Source
This commit is contained in:
Georgy Bronnikov
2018-11-26 16:05:47 +03:00
parent c9343c89bc
commit c018109bca
14 changed files with 72 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFile.kt
+3 -1
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.ir.symbols.IrFileSymbol
import org.jetbrains.kotlin.ir.symbols.IrPackageFragmentSymbol
import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
import org.jetbrains.kotlin.name.FqName
import java.io.File
interface IrPackageFragment : IrElement, IrDeclarationContainer, IrSymbolOwner {
val packageFragmentDescriptor: PackageFragmentDescriptor
@@ -47,4 +48,5 @@ interface IrFile : IrPackageFragment, IrAnnotationContainer {
accept(transformer, data) as IrFile
}
val IrFile.name: String get() = fileEntry.name
val IrFile.path: String get() = fileEntry.name
val IrFile.name: String get() = File(path).name
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
+1 -1
View File
@@ -49,7 +49,7 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
"EXTERNAL_PACKAGE_FRAGMENT fqName:${declaration.fqName}"
override fun visitFile(declaration: IrFile, data: Nothing?): String =
"FILE fqName:${declaration.fqName} fileName:${declaration.name}"
"FILE fqName:${declaration.fqName} fileName:${declaration.path}"
override fun visitFunction(declaration: IrFunction, data: Nothing?): String =
"FUN ${declaration.renderOriginIfNonTrivial()}${declaration.renderDeclared()}"