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

fix check for internal from another module in imports and file level annotations

Browse Source 
Original commit: 0035bbba7c
This commit is contained in:
Michael Nedzelsky
2015-09-27 00:17:19 +03:00
parent 8c8a3e549c
commit 4755cab740
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+3 -1
View File
@@ -36,6 +36,7 @@ import org.jetbrains.jps.builders.logging.BuildLoggingManager
import org.jetbrains.jps.incremental.BuilderRegistry import org.jetbrains.jps.incremental.BuilderRegistry
import org.jetbrains.jps.incremental.IncProjectBuilder import org.jetbrains.jps.incremental.IncProjectBuilder
import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.BuildMessage
import org.jetbrains.jps.incremental.messages.CompilerMessage
import org.jetbrains.jps.model.java.JpsJavaDependencyScope import org.jetbrains.jps.model.java.JpsJavaDependencyScope
import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.java.JpsJavaExtensionService
import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.jps.model.module.JpsModule
@@ -480,7 +481,8 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
result.assertFailed() result.assertFailed()
val actualErrors = result.getMessages(BuildMessage.Kind.ERROR) val actualErrors = result.getMessages(BuildMessage.Kind.ERROR)
.map { it.messageText }.sorted().joinToString("\n") .map { it as CompilerMessage }
.map { "${it.messageText} at line ${it.line}, column ${it.column}" }.sorted().joinToString("\n")
val projectRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false)) val projectRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false))
val expectedFile = File(projectRoot, "errors.txt") val expectedFile = File(projectRoot, "errors.txt")
JetTestUtils.assertEqualsToFile(expectedFile, actualErrors) JetTestUtils.assertEqualsToFile(expectedFile, actualErrors)
jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
+4 -3
View File
@@ -1,3 +1,4 @@
'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it 'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 11, column 14
Cannot access 'InternalClass1': it is 'internal' in 'test' Cannot access 'InternalClass1': it is 'internal' in 'test' at line 3, column 13
Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' Cannot access 'InternalClass1': it is 'internal' in 'test' at line 6, column 36
Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 24, column 25
jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt
+2
View File
@@ -1,5 +1,7 @@
package test package test
import test.InternalClass1
// InternalClass1, ClassA1, ClassB1 are in module1 // InternalClass1, ClassA1, ClassB1 are in module1
class ClassInheritedFromInternal1: InternalClass1() class ClassInheritedFromInternal1: InternalClass1()