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

Using annotations from reexported libraries

Browse Source
This commit is contained in:
Andrey Breslav
2013-08-29 20:02:47 +04:00
parent 323bbe00cc
commit 1e91fb8d27
10 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/testData/ReexportedDependency/kotlinProject.iml
+1 -1
View File
@@ -5,7 +5,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="module3" />
</component>
jps-plugin/testData/ReexportedDependency/kotlinProject.ipr
+15
View File
@@ -13,4 +13,19 @@
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="libraryTable">
<library name="lib">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/module2/lib" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$PROJECT_DIR$/module2/lib" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/module2/lib" />
</SOURCES>
</library>
</component>
</project>
jps-plugin/testData/ReexportedDependency/module2/lib/j/J.class
BIN
View File
Binary file not shown.
jps-plugin/testData/ReexportedDependency/module2/lib/j/J.java
+9
View File
@@ -0,0 +1,9 @@
package j;
import java.lang.String;
public class J {
public String foo() {
return "";
}
}
jps-plugin/testData/ReexportedDependency/module2/lib/j/annotations.xml
+5
View File
@@ -0,0 +1,5 @@
<root>
<item name='j.J java.lang.String foo()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
</root>
jps-plugin/testData/ReexportedDependency/module2/module2.iml
+3 -2
View File
@@ -5,9 +5,10 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinRuntime" level="project" exported="" />
<orderEntry type="library" exported="" name="KotlinRuntime" level="project" />
<orderEntry type="library" exported="" name="lib" level="project" />
</component>
</module>
jps-plugin/testData/ReexportedDependency/module3/module3.iml
+1 -1
View File
@@ -5,7 +5,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="module2" exported="" />
</component>
jps-plugin/testData/ReexportedDependency/module3/src/m3.kt
+4 -1
View File
@@ -2,4 +2,7 @@ fun f() {
JSecond()
K2()
println("Hi")
}
takeNN(j.J().foo())
}
fun takeNN(a: Any) {}
jps-plugin/testData/ReexportedDependency/src/main.kt
+1
View File
@@ -3,4 +3,5 @@ fun main() {
JSecond()
K2()
println("Hi")
takeNN(j.J().foo())
}