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

Pass isPackage = false when processing class proto

Browse Source 
KT-8487
This commit is contained in:
Alexey Tsvetkov
2016-02-19 16:00:09 +03:00
parent eff972d613
commit ba386f031b
7 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt
+1 -1
View File
@@ -191,7 +191,7 @@ open class IncrementalCacheImpl<Target>(
addToClassStorage(kotlinClass, sourceFiles.first()) addToClassStorage(kotlinClass, sourceFiles.first())
protoMap.process(kotlinClass, isPackage = false) + protoMap.process(kotlinClass, isPackage = false) +
constantsMap.process(kotlinClass, isPackage = true) + constantsMap.process(kotlinClass, isPackage = false) +
inlineFunctionsMap.process(kotlinClass, isPackage = false) inlineFunctionsMap.process(kotlinClass, isPackage = false)
} }
else -> CompilationResult.NO_CHANGES else -> CompilationResult.NO_CHANGES
jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log
Vendored
+1 -1
View File
@@ -16,4 +16,4 @@ Compiling files:
src/usage.kt src/usage.kt
End of files End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log
Vendored
+4 -2
View File
@@ -7,7 +7,9 @@ End of files
Compiling files: Compiling files:
src/const.kt src/const.kt
End of files End of files
Exit code: OK Marked as dirty by Kotlin:
src/usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------ ------------------------------------------
Cleaning output files: Cleaning output files:
out/production/module/test/Klass$Companion.class out/production/module/test/Klass$Companion.class
@@ -19,4 +21,4 @@ Compiling files:
src/usage.kt src/usage.kt
End of files End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log
Vendored
+1 -1
View File
@@ -15,4 +15,4 @@ Compiling files:
src/usage.kt src/usage.kt
End of files End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log
Vendored
+3 -1
View File
@@ -6,7 +6,9 @@ End of files
Compiling files: Compiling files:
src/const.kt src/const.kt
End of files End of files
Exit code: OK Marked as dirty by Kotlin:
src/usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------ ------------------------------------------
Cleaning output files: Cleaning output files:
out/production/module/test/Object.class out/production/module/test/Object.class
jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log
Vendored
+1 -1
View File
@@ -16,4 +16,4 @@ Compiling files:
src/usage.kt src/usage.kt
End of files End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log
Vendored
+3 -1
View File
@@ -7,7 +7,9 @@ End of files
Compiling files: Compiling files:
src/const.kt src/const.kt
End of files End of files
Exit code: OK Marked as dirty by Kotlin:
src/usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------ ------------------------------------------
Cleaning output files: Cleaning output files:
out/production/module/test/Trait$Companion.class out/production/module/test/Trait$Companion.class