diff options
28 files changed, 302 insertions, 343 deletions
diff --git a/.idea/libraries/asm.xml b/.idea/libraries/asm.xml new file mode 100644 index 00000000..7e0c23e6 --- /dev/null +++ b/.idea/libraries/asm.xml @@ -0,0 +1,9 @@ +<component name="libraryTable"> + <library name="asm"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/lib/asm-all.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component>
\ No newline at end of file diff --git a/.idea/libraries/cli_parser.xml b/.idea/libraries/cli_parser.xml new file mode 100644 index 00000000..5eda5d0e --- /dev/null +++ b/.idea/libraries/cli_parser.xml @@ -0,0 +1,9 @@ +<component name="libraryTable"> + <library name="cli-parser"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/lib/cli-parser-1.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component>
\ No newline at end of file diff --git a/.idea/libraries/guava.xml b/.idea/libraries/guava.xml new file mode 100644 index 00000000..f5469d35 --- /dev/null +++ b/.idea/libraries/guava.xml @@ -0,0 +1,9 @@ +<component name="libraryTable"> + <library name="guava"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/lib/guava-17.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component>
\ No newline at end of file diff --git a/.idea/libraries/intellij_core_analysis.xml b/.idea/libraries/intellij_core_analysis.xml new file mode 100644 index 00000000..84a9f5ee --- /dev/null +++ b/.idea/libraries/intellij_core_analysis.xml @@ -0,0 +1,9 @@ +<component name="libraryTable"> + <library name="intellij-core-analysis"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/lib/intellij-core-analysis.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component>
\ No newline at end of file diff --git a/.idea/libraries/jdom.xml b/.idea/libraries/jdom.xml new file mode 100644 index 00000000..54b3420d --- /dev/null +++ b/.idea/libraries/jdom.xml @@ -0,0 +1,9 @@ +<component name="libraryTable"> + <library name="jdom"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/lib/jdom.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component>
\ No newline at end of file diff --git a/.idea/libraries/kotlin_compiler.xml b/.idea/libraries/kotlin_compiler.xml deleted file mode 100644 index d3199a12..00000000 --- a/.idea/libraries/kotlin_compiler.xml +++ /dev/null @@ -1,134 +0,0 @@ -<component name="libraryTable"> - <library name="kotlin-compiler"> - <CLASSES> - <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-compiler.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="file://$PROJECT_DIR$/../kotlin/js/js.tests/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/js/js.dart-ast/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/js/js.translator/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/j2k/tests/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/descriptors/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/runtime.jvm/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/util.runtime/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/serialization/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/serialization.java/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/descriptor.loader.java/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/docs/exPuzzlers/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/idea/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/idea/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/eval4j/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/grammar/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/cli/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/cli/cli-common/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/util/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/backend/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/frontend/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/preloader/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/preloader/instrumentation/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/android-module/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/frontend.java/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/backend-common/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/jet.as.java.psi/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/integration-tests/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/runtime/target/copied-sources" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kdoc-maven-plugin/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kdoc-maven-plugin/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/main/kotlin" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/AndroidProject/Lib/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/AndroidProject/Android/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/kotlinJavaProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-js-tests-junit/src/test/kotlin" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/target/it/test-classpath/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/target/it/test-helloworld/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/generated" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/simpleProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/additionalJavaSrc/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/additionalJavaSrc/generated" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/examples/kotlin-java-example/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/generators/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/generators/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/kannotator-jps-plugin-test/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/dependencies/download/asm-src" /> - <root url="file://$PROJECT_DIR$/../kotlin/injector-generator/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/ide-compiler-runner/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/js/js.tests/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/js/js.dart-ast/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/js/js.translator/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/j2k/tests/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/descriptors/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/runtime.jvm/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/util.runtime/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/serialization/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/serialization.java/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/descriptor.loader.java/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/docs/exPuzzlers/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/idea/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/idea/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/eval4j/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/grammar/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/cli/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/cli/cli-common/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/util/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/backend/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/frontend/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/preloader/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/preloader/instrumentation/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/android-module/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/frontend.java/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/backend-common/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/jet.as.java.psi/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/integration-tests/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/runtime/target/copied-sources" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kdoc-maven-plugin/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kdoc-maven-plugin/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/main/kotlin" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/AndroidProject/Lib/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/AndroidProject/Android/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/kotlinJavaProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-js-tests-junit/src/test/kotlin" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/target/it/test-classpath/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/target/it/test-helloworld/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/generated" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/simpleProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/additionalJavaSrc/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/additionalJavaSrc/generated" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/examples/kotlin-java-example/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/generators/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/generators/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/kannotator-jps-plugin-test/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/dependencies/download/asm-src" /> - <root url="file://$PROJECT_DIR$/../kotlin/injector-generator/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/ide-compiler-runner/src" /> - </SOURCES> - </library> -</component>
\ No newline at end of file diff --git a/.idea/libraries/kotlin_for_upsource.xml b/.idea/libraries/kotlin_for_upsource.xml new file mode 100644 index 00000000..3ddcc140 --- /dev/null +++ b/.idea/libraries/kotlin_for_upsource.xml @@ -0,0 +1,47 @@ +<component name="libraryTable"> + <library name="kotlin-for-upsource"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/lib/kotlin-for-upsource.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="file://$PROJECT_DIR$/../kotlin/ant/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/compiler/backend-common/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/compiler/backend/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/compiler/cli/cli-common/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/compiler/cli/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/compiler/frontend.java/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/compiler/frontend/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/compiler/light-classes/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/compiler/preloader/instrumentation/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/compiler/preloader/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/compiler/serialization/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/compiler/util/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/core/descriptor.loader.java/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/core/descriptors.runtime/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/core/descriptors/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/core/deserialization/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/core/reflection.jvm/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/core/runtime.jvm/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/core/util.runtime/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/generators/injector-generator/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/generators/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/idea/ide-common/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/idea/idea-analysis/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/idea/idea-completion/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/idea/idea-core/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/idea/idea-jps-common/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/idea/idea-test-framework/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/idea/kotlin-android-plugin/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/idea/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/js/js.dart-ast/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/js/js.frontend/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/js/js.inliner/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/js/js.parser/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/js/js.serializer/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/js/js.translator/src" /> + <root url="file://$PROJECT_DIR$/../kotlin/plugins/android-idea-plugin/src" /> + </SOURCES> + </library> +</component>
\ No newline at end of file diff --git a/.idea/libraries/kotlin_plugin.xml b/.idea/libraries/kotlin_plugin.xml deleted file mode 100644 index e2975946..00000000 --- a/.idea/libraries/kotlin_plugin.xml +++ /dev/null @@ -1,134 +0,0 @@ -<component name="libraryTable"> - <library name="kotlin-plugin"> - <CLASSES> - <root url="jar://$KOTLIN_PLUGIN$/lib/kotlin-plugin.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="file://$PROJECT_DIR$/../kotlin/js/js.tests/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/js/js.dart-ast/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/js/js.translator/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/j2k/tests/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/descriptors/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/runtime.jvm/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/util.runtime/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/serialization/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/serialization.java/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/descriptor.loader.java/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/docs/exPuzzlers/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/idea/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/idea/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/eval4j/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/grammar/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/cli/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/cli/cli-common/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/util/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/backend/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/frontend/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/preloader/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/preloader/instrumentation/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/android-module/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/frontend.java/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/backend-common/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/jet.as.java.psi/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/integration-tests/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/runtime/target/copied-sources" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kdoc-maven-plugin/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kdoc-maven-plugin/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/main/kotlin" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/AndroidProject/Lib/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/AndroidProject/Android/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/kotlinJavaProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-js-tests-junit/src/test/kotlin" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/target/it/test-classpath/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/target/it/test-helloworld/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/generated" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/simpleProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/additionalJavaSrc/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/additionalJavaSrc/generated" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/examples/kotlin-java-example/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/generators/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/generators/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/kannotator-jps-plugin-test/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/dependencies/download/asm-src" /> - <root url="file://$PROJECT_DIR$/../kotlin/injector-generator/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/ide-compiler-runner/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/js/js.tests/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/js/js.dart-ast/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/js/js.translator/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/j2k/tests/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/descriptors/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/runtime.jvm/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/util.runtime/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/serialization/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/serialization.java/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/core/descriptor.loader.java/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/docs/exPuzzlers/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/idea/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/idea/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/eval4j/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/grammar/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/cli/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/cli/cli-common/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/util/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/backend/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/frontend/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/preloader/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/preloader/instrumentation/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/android-tests/android-module/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/frontend.java/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/backend-common/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/jet.as.java.psi/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/compiler/integration-tests/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/runtime/target/copied-sources" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kdoc-maven-plugin/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kdoc-maven-plugin/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/main/kotlin" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/AndroidProject/Lib/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/AndroidProject/Android/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin/target/test-classes/testProject/kotlinJavaProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-js-tests-junit/src/test/kotlin" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/target/it/test-classpath/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-maven-plugin-test/target/it/test-helloworld/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/generated" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/simpleProject/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/additionalJavaSrc/src/main/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/tools/kotlin-gradle-plugin-core/target/test-classes/testProject/additionalJavaSrc/generated" /> - <root url="file://$PROJECT_DIR$/../kotlin/libraries/examples/kotlin-java-example/src/test/java" /> - <root url="file://$PROJECT_DIR$/../kotlin/generators/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/generators/tests" /> - <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/jps-plugin/kannotator-jps-plugin-test/test" /> - <root url="file://$PROJECT_DIR$/../kotlin/dependencies/download/asm-src" /> - <root url="file://$PROJECT_DIR$/../kotlin/injector-generator/src" /> - <root url="file://$PROJECT_DIR$/../kotlin/ide-compiler-runner/src" /> - </SOURCES> - </library> -</component>
\ No newline at end of file diff --git a/.idea/libraries/picocontainer.xml b/.idea/libraries/picocontainer.xml new file mode 100644 index 00000000..ae62c0ee --- /dev/null +++ b/.idea/libraries/picocontainer.xml @@ -0,0 +1,9 @@ +<component name="libraryTable"> + <library name="picocontainer"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/lib/picocontainer.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component>
\ No newline at end of file diff --git a/.idea/libraries/protobuf.xml b/.idea/libraries/protobuf.xml new file mode 100644 index 00000000..cb1e92ad --- /dev/null +++ b/.idea/libraries/protobuf.xml @@ -0,0 +1,9 @@ +<component name="libraryTable"> + <library name="protobuf"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/lib/protobuf-2.5.0-lite.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component>
\ No newline at end of file diff --git a/.idea/libraries/trove4j.xml b/.idea/libraries/trove4j.xml new file mode 100644 index 00000000..a0b77ff5 --- /dev/null +++ b/.idea/libraries/trove4j.xml @@ -0,0 +1,9 @@ +<component name="libraryTable"> + <library name="trove4j"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/lib/trove4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component>
\ No newline at end of file @@ -10,11 +10,17 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="kotlin" level="project" /> - <orderEntry type="library" name="kotlin-compiler" level="project" /> + <orderEntry type="library" name="intellij-core-analysis" level="project" /> <orderEntry type="library" name="junit:junit:4.11" level="project" /> <orderEntry type="library" name="markdown" level="project" /> <orderEntry type="library" name="jsoup" level="project" /> - <orderEntry type="library" name="kotlin-plugin" level="project" /> + <orderEntry type="library" name="kotlin-for-upsource" level="project" /> + <orderEntry type="library" name="cli-parser" level="project" /> + <orderEntry type="library" name="guava" level="project" /> + <orderEntry type="library" name="picocontainer" level="project" /> + <orderEntry type="library" name="trove4j" level="project" /> + <orderEntry type="library" name="jdom" level="project" /> + <orderEntry type="library" name="protobuf" level="project" /> + <orderEntry type="library" name="asm" level="project" /> </component> </module>
\ No newline at end of file diff --git a/lib/asm-all.jar b/lib/asm-all.jar Binary files differnew file mode 100644 index 00000000..80031339 --- /dev/null +++ b/lib/asm-all.jar diff --git a/lib/cli-parser-1.1.1.jar b/lib/cli-parser-1.1.1.jar Binary files differnew file mode 100644 index 00000000..bbad801d --- /dev/null +++ b/lib/cli-parser-1.1.1.jar diff --git a/lib/guava-17.0.jar b/lib/guava-17.0.jar Binary files differnew file mode 100644 index 00000000..661fc747 --- /dev/null +++ b/lib/guava-17.0.jar diff --git a/lib/intellij-core-analysis.jar b/lib/intellij-core-analysis.jar Binary files differnew file mode 100644 index 00000000..d2fc3800 --- /dev/null +++ b/lib/intellij-core-analysis.jar diff --git a/lib/jdom.jar b/lib/jdom.jar Binary files differnew file mode 100644 index 00000000..09d88451 --- /dev/null +++ b/lib/jdom.jar diff --git a/lib/kotlin-for-upsource.jar b/lib/kotlin-for-upsource.jar Binary files differnew file mode 100644 index 00000000..4cd1b188 --- /dev/null +++ b/lib/kotlin-for-upsource.jar diff --git a/lib/markdown.jar b/lib/markdown.jar Binary files differindex dc9fa198..4ca022d5 100644 --- a/lib/markdown.jar +++ b/lib/markdown.jar diff --git a/lib/picocontainer.jar b/lib/picocontainer.jar Binary files differnew file mode 100644 index 00000000..fbb1c925 --- /dev/null +++ b/lib/picocontainer.jar diff --git a/lib/protobuf-2.5.0-lite.jar b/lib/protobuf-2.5.0-lite.jar Binary files differnew file mode 100644 index 00000000..a0819eb6 --- /dev/null +++ b/lib/protobuf-2.5.0-lite.jar diff --git a/lib/trove4j.jar b/lib/trove4j.jar Binary files differnew file mode 100644 index 00000000..93cf8ea9 --- /dev/null +++ b/lib/trove4j.jar diff --git a/src/Analysis/AnalysisEnvironment.kt b/src/Analysis/AnalysisEnvironment.kt index 1813a4b0..1d0631bb 100644 --- a/src/Analysis/AnalysisEnvironment.kt +++ b/src/Analysis/AnalysisEnvironment.kt @@ -1,17 +1,31 @@ package org.jetbrains.dokka -import org.jetbrains.kotlin.cli.common.messages.* -import com.intellij.openapi.* -import org.jetbrains.kotlin.cli.jvm.compiler.* -import org.jetbrains.kotlin.resolve.* -import org.jetbrains.kotlin.psi.* -import java.io.File +import com.intellij.core.CoreApplicationEnvironment +import com.intellij.core.CoreModuleManager +import com.intellij. |