Compare commits

..

462 Commits

Author SHA1 Message Date
Mikhail Glukhikh
8f5f714ae7 Return back intention "convert to expression body" #KT-19759 Fixed 2017-08-18 23:45:08 +03:00
Mikhael Bogdanov
a065db9dbf Fix IDEAndroidLayoutXmlFileManager: use AndroidModuleModel 2017-08-11 09:52:02 +03:00
Yan Zhulanow
1602860481 AndroidGradleModel was renamed to AndroidModuleModel 2017-08-11 09:52:01 +03:00
Yan Zhulanow
1bb905451f Minor: Fix modules.xml 2017-08-11 09:52:00 +03:00
Mikhael Bogdanov
c0f83c0f1a Update AndroidProjectKey package 2017-08-11 09:51:59 +03:00
Vyacheslav Gerasimov
f8a079bdbe Fix duplication of related files gutter icon in AS 2.3
#KT-18760 Fixed
2017-08-11 09:51:55 +03:00
Vyacheslav Gerasimov
c25e416f7a Update to AS 2.3.3 2017-08-11 09:51:54 +03:00
Dmitry Jemerov
999bb9b223 No Maven in AS 2017-08-11 09:51:53 +03:00
Dmitry Jemerov
be26c175ae Compilation fixes for as23 2017-08-11 09:51:51 +03:00
Vyacheslav Gerasimov
af644c9bb6 Fix tests compilation 2017-08-11 09:51:50 +03:00
Vyacheslav Gerasimov
55a01ed23d Fix compilation AndroidResourceReferenceAnnotator 2017-08-11 09:51:49 +03:00
Vyacheslav Gerasimov
6077546a96 Revert "Quickfix to enable language feature works for Maven project"
This reverts commit aabd560eef.
2017-08-11 09:51:47 +03:00
Vyacheslav Gerasimov
c6a6d0d618 Revert "Quickfix to enable coroutine support works in Maven projects"
This reverts commit 7346fee513.
2017-08-11 09:51:45 +03:00
Vyacheslav Gerasimov
54b98692d5 Revert "Move: Remove duplicating conflict messages from test data"
This reverts commit 411a8dc206.

(cherry picked from commit fec1336)
2017-08-11 09:51:43 +03:00
Vyacheslav Gerasimov
ab30570112 Use 'android.studio.version' variable for downloading, update to 2.3.1.0 2017-08-11 09:51:42 +03:00
Vyacheslav Gerasimov
662c91aa0d Revert "Minor: remove warnings in KotlinDebuggerTestBase"
This reverts commit 5405c81106.
2017-08-11 09:51:41 +03:00
Vyacheslav Gerasimov
606a7432f4 Fix compilation errors 2017-08-11 09:51:39 +03:00
Mikhail Glukhikh
8630c05cf9 Fix compilation in AS23 (PlatformAndroidGradleDetector) 2017-08-11 09:51:38 +03:00
Mikhail Glukhikh
0ebf1294d0 Use AS 2-3-0 build instead of canary latest 2017-08-11 09:51:36 +03:00
Mikhail Glukhikh
9da5b63ab5 Fix compilation (ResourceFoldingBuilder) 2017-08-11 09:51:35 +03:00
Mikhail Glukhikh
4b04494608 Fix compilation (KotlinGradleAndroidModuleModel...) 2017-08-11 09:51:34 +03:00
Alexey Sedunov
598f39f122 Kotlin Facet: Configure facet on Gradle project sync in Android Studio 2.3
#KT-15909 Fixed
2017-08-11 09:51:32 +03:00
Ilya Chernikov
9f6946866e Upgrade Android plugin code to Android Studio 2.3 Canary 3 2017-08-11 09:51:31 +03:00
Yan Zhulanow
1a06a93c6c Update Android plugin code to Android Studio 2.3 Canary 3
(cherry picked from commit 4d69491)
2017-08-11 09:51:29 +03:00
Yan Zhulanow
20a491f272 Remove Maven components from all-open and no-arg plugins
(cherry picked from commit 44a0a13)
2017-08-11 09:51:28 +03:00
Yan Zhulanow
48b8b4ddd0 Remove Maven plugin dependency in plugin.xml cause we don't have proper Maven support in plugins for AS anyway
(cherry picked from commit 2fe0ad2)

(cherry picked from commit 772fa4c)
2017-08-11 09:51:27 +03:00
Yan Zhulanow
a564ddb807 CreateFileResourceQuickFix now accepts ResourceFolderType instead of ResourceType
(cherry picked from commit 1c12e9a)

(cherry picked from commit ffa0609)

(cherry picked from commit 7d083a2)
2017-08-11 09:51:26 +03:00
Yan Zhulanow
91f51e3053 Disable Maven and JPS modules which is not available in AS
(cherry picked from commit c00cc57)

# Conflicts:
#	.idea/modules.xml
#	jps-plugin/bare-plugin/bare-plugin.iml

(cherry picked from commit 3dfd930)
2017-08-11 09:51:24 +03:00
Vyacheslav Gerasimov
01b70567fe Fixed KotlinAndroidResourceQuickFixProvider for AS 2.2 2017-08-11 09:51:23 +03:00
Yan Zhulanow
73c43721b4 MyReferredResourceFieldInfo now requires module 2017-08-11 09:51:20 +03:00
Dmitry Jemerov
befd5d20f3 fix compilation against AS 2.3 2017-08-11 09:51:19 +03:00
Dmitry Jemerov
862c8b83c5 fix compilation against AS 2.3 (ApiDetector + ...) 2017-08-11 09:51:17 +03:00
Dmitry Jemerov
20852b127f fix compilation
(cherry picked from commit fbdc55c)
2017-08-11 09:51:16 +03:00
Dmitry Jemerov
942f3ba515 workaround for incorrectly compiled PsiTreeUtil.class in AS 2.3: specify explicit type for PsiTreeUtil 2017-08-11 09:51:15 +03:00
Dmitry Jemerov
734f09c51b update list of core libraries 2017-08-11 09:51:14 +03:00
Pavel V. Talanov
6cc56b303a Add step to patch plugin xml so that it only works in Android Studio
(cherry picked from commit fcee4eb)

(cherry picked from commit 14f7731)
2017-08-11 09:51:12 +03:00
Yan Zhulanow
4e5ca5a821 Disable Maven and JPS modules which is not available in AS
(cherry picked from commit c00cc57)

(cherry picked from commit 3dfd930)
2017-08-11 09:51:11 +03:00
Dmitry Jemerov
8f591ab145 always update Android Studio
(cherry picked from commit bda1893)
2017-08-11 09:51:07 +03:00
Stanislav Erokhin
19e23fd2d9 download Android Studio 2.3 2017-08-11 09:51:06 +03:00
Dmitry Jemerov
c79bd6c4de fix compilation 2017-08-11 09:51:05 +03:00
Dmitry Jemerov
e8ffcad914 update for moved Gradle sync classes 2017-08-11 09:51:04 +03:00
Dmitry Jemerov
d9b4afc1f9 update path to Android common jar
(cherry picked from commit f7e528d)
2017-08-11 09:51:02 +03:00
Ilya Gorbunov
bbde8ad5e5 Revert JDK to 1.6 for jps-plugin module 2017-08-11 09:51:01 +03:00
Mikhail Glukhikh
6901fbd6ae Revert "Remove ModalityState.any() from J2kPostProcessor"
This reverts commit 96e9545
So #KT-19615 Fixed
2017-08-11 09:48:44 +03:00
Mikhael Bogdanov
cdd6c6efa8 Use ASM5 Opcode 2017-08-11 09:46:39 +03:00
Ilya Gorbunov
6e69194331 Reimplement JpsBuildTestCase.buildAllModules missing in IDEA 162 2017-08-11 09:46:38 +03:00
Mikhail Glukhikh
83d349a5a5 Fix convert { -> } to :: and back infrastructure for branch 162
Both relevant inspections made INFO and disabled by default
(there is no INFORMATION severity in this branch)
Both intentions enabled
2017-08-11 09:46:37 +03:00
Alexey Sedunov
7d4434d639 Fix compilation and failing Move tests 2017-08-11 09:46:35 +03:00
Alexey Andreev
1c8791fbf1 Fix for "Introduce inspection "replace arrayOf with literal"" 2017-08-11 09:46:34 +03:00
Vyacheslav Gerasimov
98383a7893 Revert "Initial implementation of rainbow highlighting for Kotlin"
This reverts commit 5315f4d9da.
2017-08-11 09:46:32 +03:00
Vyacheslav Gerasimov
20df4b73d4 Fix guava version 2017-08-11 09:46:31 +03:00
Vyacheslav Gerasimov
9fbb2e305b Revert "Add codegen tests with substituted bytecode version (1.8->1.9)"
This reverts commit 46cdf0215e.
2017-08-11 09:46:30 +03:00
Vyacheslav Gerasimov
3d15193974 Fix compilation testUtils 2017-08-11 09:46:28 +03:00
Vyacheslav Gerasimov
a2b3bc1d0c Fix compilation AbstractAndroidQuickFixMultiFileTest 2017-08-11 09:46:27 +03:00
Vyacheslav Gerasimov
6ec4db04e7 Fix compilation after rebase 2017-08-11 09:46:26 +03:00
Vyacheslav Gerasimov
2fc4070c7d Fix compilation KotlinCliJavaFileManagerImpl 2017-08-11 09:46:25 +03:00
Vyacheslav Gerasimov
7c9236123a Fix compilation KotlinInlineFunctionDialog 2017-08-11 09:46:24 +03:00
Vyacheslav Gerasimov
4215200c3c Fix compilation MovePropertyToConstructorIntention 2017-08-11 09:46:22 +03:00
Mikhail Glukhikh
ac4b0c0be1 Branch 162 patch: only builds 162.1...162.* are compatible 2017-08-11 09:46:21 +03:00
Mikhail Zarechenskiy
470398e126 Revert "Advance idea.plugins.compatible.build"
This reverts commit b101550cae.
2017-08-11 09:46:20 +03:00
Mikhail Zarechenskiy
26e79aff7b Revert "fix compilation" (+ more for 162 branch)
This reverts commit 594e2b6a77.
2017-08-11 09:46:19 +03:00
Mikhail Zarechenskiy
014db68498 Revert "doMoveFile() now accepts not-null PsiDirectory"
This reverts commit 0995f2700e.
2017-08-11 09:46:18 +03:00
Mikhael Bogdanov
ef4beaf5ad Copy readSeq/writeSeq from IDEA 171 2017-08-11 09:43:39 +03:00
Mikhael Bogdanov
53f3eae9f2 Use ConfigLibraryUtil.INSTANCE after convertion to Kotlin 2017-08-11 09:43:38 +03:00
Mikhael Bogdanov
96aaffed4f Revert "Use ASM 6 API to read class files in IDE" 2017-08-11 09:43:37 +03:00
Mikhael Bogdanov
b222d4fe9a Revert "Fix codegen tests on JDK 9 with jdkKind = FULL_JDK" 2017-08-11 09:43:35 +03:00
Nikolay Krasko
03b910f3dc Revert Re-enable optimize on the fly activation when unused imports found
This reverts commit 9122f58d5d
2017-08-11 09:43:34 +03:00
Alexey Sedunov
757cd01693 Revert New File Action: Do not start under write action
This reverts commit 58addf72ff
2017-08-11 09:43:33 +03:00
Nikolay Krasko
5514c7987b Comment step over for suspended calls in 162
Need to copy private API for creating step over command in
DebugProcessImplHelper.java

Support "Force Step Over" action over suspended calls (KT-18453)
850568b8e9

Step over for suspended calls (KT-18453)
0e8e8ef546
2017-08-11 09:43:32 +03:00
Vyacheslav Gerasimov
a6233a7957 Fix compilation: Set sdk to Jdk8 for some modules 2017-08-11 09:43:30 +03:00
Vyacheslav Gerasimov
65af86b100 Revert "Update to ASM 6-alpha from intellij 171"
This reverts commit 15502b4153.

# Conflicts:
#	.idea/libraries/idea_full.xml
#	.idea/libraries/intellij_core.xml
#	ultimate/.idea/libraries/idea_full.xml
#	ultimate/.idea/libraries/intellij_core.xml
2017-08-11 09:43:29 +03:00
Ilya Gorbunov
c6ffeabf98 Disable modular JDK9 support
PsiJavaModule is not supported in 162
2017-08-11 09:43:28 +03:00
Ilya Gorbunov
7cee0bc82b Compilation fixes related to "Support compilation against modular JDK (9+)"
These fixes makes it unsupported again
2017-08-11 09:43:26 +03:00
Alexey Andreev
96fc46bcdc Fix for "Copy: Support class copying" 2017-08-11 09:43:25 +03:00
Alexey Andreev
9edf11287d Fix for "Introduce isFromSourceCodeInScope function" 2017-08-11 09:43:24 +03:00
Vyacheslav Gerasimov
6a5eb9a4dc Revert "Inlay param/type support for kotlin" 2017-08-11 09:43:23 +03:00
Vyacheslav Gerasimov
a65ea602b1 Fix compilation KotlinInlineValDialog 2017-08-11 09:43:21 +03:00
Vyacheslav Gerasimov
1ba68056d8 Revert "fix compilation against branch 163"
This reverts commit a2b0b3d6eb.
2017-08-11 09:43:19 +03:00
Vyacheslav Gerasimov
cbc38c3930 Revert "LightQuickFixTestCase.parseActionHint() method was removed"
This reverts commit 4f079d2768.
2017-08-11 09:43:18 +03:00
Vyacheslav Gerasimov
d50828445e Revert "AbstractQuickFixTest: rename to .kt"
This reverts commit ad59a122ac.
2017-08-11 09:43:16 +03:00
Vyacheslav Gerasimov
6aa6716f80 Revert "AbstractQuickFixTest: J2K"
This reverts commit 34ad19a912.
2017-08-11 09:43:15 +03:00
Vyacheslav Gerasimov
1a8f6c1c1e Revert "Rewrite AbstractQuickFixTest based on light fixture test case"
This reverts commit e2f75463d7.
2017-08-11 09:43:14 +03:00
Vyacheslav Gerasimov
5caa9ccd29 Revert "AbstractQuickFixMultiFileTest: rename to .kt"
This reverts commit d11ea64f00.
2017-08-11 09:43:12 +03:00
Vyacheslav Gerasimov
98cf3c92ba Revert "AbstractQuickFixMultiFileTest: J2K"
This reverts commit 387dbdf3bb.
2017-08-11 09:43:10 +03:00
Vyacheslav Gerasimov
73643c039f Revert "Convert AbstractQuickFixMultiFileTest to light fixture test case"
This reverts commit 4f229c3fdc.
2017-08-11 09:43:09 +03:00
Vyacheslav Gerasimov
11584d5182 Revert "Convert AddOpenToClassDeclarationTest to regular multifile quickfix test"
This reverts commit 79c814636e.
2017-08-11 09:43:07 +03:00
Mikhail Zarechenskiy
7b2df4b43e Revert "Update IDEA to 171.2613.7"
This reverts commit 99af2a809b.
2017-08-11 09:43:06 +03:00
Mikhail Zarechenskiy
c47e4e4220 Revert "Migrate IDEA plugin code to Android Studio 2.2 (br 145)"
This reverts commit 24c9b6e171.
2017-08-11 09:43:05 +03:00
Mikhail Zarechenskiy
e251b079e3 Revert "fix compilation against branch 163"
This reverts commit a2b0b3d6eb.
2017-08-11 09:43:03 +03:00
Mikhail Zarechenskiy
4ef61e12b2 Revert "Update compatible build number range"
This reverts commit aced2e7eb4.
2017-08-11 09:43:01 +03:00
Mikhail Zarechenskiy
767c8dae14 Revert "update Kotlin icons according to new IntelliJ style"
This reverts commit fcdd5e0a19.
2017-08-11 09:43:00 +03:00
Mikhail Zarechenskiy
97dc49ffad Revert "Add resources_en.jar to properties plugin classpath"
This reverts commit 036bfed984.
2017-08-11 09:42:59 +03:00
Mikhail Zarechenskiy
a7c58a2a16 Revert "register PsiElementFinder extensions before JavaPsiFacade is registered"
This reverts commit e51018406f.
2017-08-11 09:42:58 +03:00
Mikhail Zarechenskiy
8183278a0a Revert "Fix dist by ignoring some library classes during compiler shrinking"
This reverts commit 6d958eb32b.
2017-08-11 09:42:57 +03:00
Mikhail Zarechenskiy
1eee3b4677 Revert "JPS: implement tracking of null annotations"
This reverts commit 05f278ce20.
2017-08-11 09:42:56 +03:00
Mikhail Zarechenskiy
cd378129e3 Revert "fix compilation of new lint checks against IDEA 163"
This reverts commit b10073465c.
2017-08-11 09:42:54 +03:00
Mikhail Zarechenskiy
e37ef01196 Revert "remove write action around closeAndDeleteProject()"
This reverts commit ab5067a0d3.
2017-08-11 09:42:52 +03:00
Mikhail Zarechenskiy
e48f462284 Revert "fix compilation"
This reverts commit 594e2b6a77.
2017-08-11 09:42:51 +03:00
Mikhail Zarechenskiy
e5efa609dc Revert "Fixed KotlinAndroidResourceQuickFixProvider for AS 2.2"
This reverts commit 180ae070ee.
2017-08-11 09:42:50 +03:00
Mikhail Zarechenskiy
a74c85d56e Revert "Fix test code after UsefulTestCase api changes"
This reverts commit 4be5fcc14a.
2017-08-11 09:42:48 +03:00
Mikhail Zarechenskiy
db22314517 Revert "CreateFileResourceQuickFix now accepts ResourceFolderType instead of ResourceType"
This reverts commit 59055e28ee.
2017-08-11 09:42:47 +03:00
Mikhail Zarechenskiy
39e51e56f6 Revert "Fix compilation"
This reverts commit 60a2151a33.
2017-08-11 09:42:46 +03:00
Mikhail Zarechenskiy
da44f07bf5 Revert "Workaround for hanging test"
This reverts commit 715410a9bc.
2017-08-11 09:42:44 +03:00
Mikhail Zarechenskiy
a502c16085 Revert "Move android modules to Java 8 SDK"
This reverts commit 2eb6c393a4.
2017-08-11 09:42:43 +03:00
Mikhail Zarechenskiy
30df84e69e Revert "Fix ConfigureProjectTestGenerated / GradleConfigureProject ... for branch 163 (jre7->jre8)"
This reverts commit 83a8b041ad.
2017-08-11 09:42:42 +03:00
Mikhail Zarechenskiy
ea3b2a479a Revert "Fix imports vs 2016.3 (ResourceFoldingBuilder)"
This reverts commit e6cefba98b.
2017-08-11 09:42:41 +03:00
Mikhail Zarechenskiy
38d5ebec42 Revert "Remove unused import"
This reverts commit ed9e083008.
2017-08-11 09:42:39 +03:00
Mikhail Zarechenskiy
0f917668fd Revert "Update guava 19.0 sources jar"
This reverts commit 9f51b12193.
2017-08-11 09:42:38 +03:00
Mikhail Zarechenskiy
df06e6a1ac Revert "LightQuickFixTestCase.parseActionHint() method was removed"
This reverts commit 4f079d2768.
2017-08-11 09:42:37 +03:00
Mikhail Zarechenskiy
8d053e6745 Revert "Updated nullability in RunLineMarkerContributor"
This reverts commit 3e6f57b684.
2017-08-11 09:42:36 +03:00
Mikhail Zarechenskiy
3a7a674a96 Revert "Update after separating JPS builders into two modules"
This reverts commit 95061885b0.
2017-08-11 09:42:34 +03:00
Mikhail Zarechenskiy
d13b632762 Revert "Do not wrap analyze into write action priority in tests"
This reverts commit 82a2a705fb.
2017-08-11 09:42:33 +03:00
Mikhail Zarechenskiy
395e5f0dcc Revert "Run tests in read action and not in EDT thread"
This reverts commit bcf29e6fbf.
2017-08-11 09:42:32 +03:00
Mikhail Zarechenskiy
c48831e1b3 Revert "Use new api from idea 171 in KotlinStepOverInlinedLinesHint"
This reverts commit eb8415a1f3.
2017-08-11 09:42:31 +03:00
Mikhail Zarechenskiy
19137cc3d2 Revert "Try to avoid exception in getOffset() call"
This reverts commit 615f9d3a1f.
2017-08-11 09:42:30 +03:00
Mikhail Zarechenskiy
204157d9c6 Revert "Replace removed method in LibraryPresentationProviders"
This reverts commit e57b3651c2.
2017-08-11 09:42:28 +03:00
Mikhail Zarechenskiy
41f0d4fdbb Revert "Port setInPerformanceTest -> setInStressTest"
This reverts commit 7da424d53f.
2017-08-11 09:42:27 +03:00
Mikhail Zarechenskiy
a18d68932d Revert "! (TODO) Update build test data in 171"
This reverts commit 1d29c81346.
2017-08-11 09:42:26 +03:00
Mikhail Zarechenskiy
443835b838 Revert "Update to 171.SNAPSHOT to pick up fix for IDEA-169570; fix compilation"
This reverts commit 12fc89f35d.
2017-08-11 09:42:25 +03:00
Mikhail Zarechenskiy
2cec820ed9 Revert "Fix testdata: Android projects use kotlin-stdlib-jre7"
This reverts commit 49a4625368.
2017-08-11 09:42:23 +03:00
Mikhail Zarechenskiy
668fb44e5e Revert "Fix GradleFacetImportTest: run write action only in EDT"
This reverts commit 3d98237304.
2017-08-11 09:42:22 +03:00
Mikhail Zarechenskiy
ee218a0ec0 Revert "Don't try to create "add modifier" fix for read-only elements"
This reverts commit 374cf517e1.
2017-08-11 09:42:20 +03:00
Mikhail Zarechenskiy
3ed8ee8ffa Revert "Fix testdata according to changes in automatic renaming rules in 17.1"
This reverts commit d6709b726e.
2017-08-11 09:42:19 +03:00
Mikhail Zarechenskiy
033c6dbf6a Revert "Fix testdata according to comment selection changes in 2017.1"
This reverts commit ad821e83bd.
2017-08-11 09:42:18 +03:00
Mikhail Zarechenskiy
0d44b55d8a Revert "Fix testdata according to contract inference changes in 2017.1"
This reverts commit a539939388.
2017-08-11 09:42:17 +03:00
Mikhail Zarechenskiy
ef52af010a Revert "Fix service and EP registration according to changes in 2017.1"
This reverts commit 097ba45783.
2017-08-11 09:42:16 +03:00
Mikhail Zarechenskiy
7188fe8722 Revert "Register MetaLanguage extension point in ParsingTestCase"
This reverts commit b9f326bfa1.
2017-08-11 09:42:14 +03:00
Mikhail Zarechenskiy
f9c3f226ef Revert "Remove write action around finishLookup(), according to IJ 2017.1 req"
This reverts commit 61f157e89d.
2017-08-11 09:42:13 +03:00
Mikhail Zarechenskiy
b90c51aaff Revert "Register MetaLanguage.EP_NAME in J2K test"
This reverts commit a8bd529871.
2017-08-11 09:42:12 +03:00
Mikhail Zarechenskiy
8f4060ae48 Revert "Remove Java 6/7 warning from expected output of the compiler"
This reverts commit 0d86bdd216.
2017-08-11 09:42:11 +03:00
Mikhail Zarechenskiy
bfd98a693f Revert "Fix NPE in tests when ProjectFileIndex is not available"
This reverts commit 0638106bf3.
2017-08-11 09:42:10 +03:00
Mikhail Zarechenskiy
4086497d36 Revert "Don't warn about ElementTraversal"
This reverts commit 4cae0538a8.
2017-08-11 09:42:08 +03:00
Mikhail Zarechenskiy
09de82f81b Revert "Keep class file version during shrinking; generate Java 8 bytecode"
This reverts commit 3a8cf68541.
2017-08-11 09:42:07 +03:00
Mikhail Zarechenskiy
240ad83f55 Revert "JPS tests: avoid using deprecated API"
This reverts commit 40574d31ac.
2017-08-11 09:42:06 +03:00
Mikhail Zarechenskiy
c8005dfa38 Revert "Black box update"
This reverts commit 496a21254b.
2017-08-11 09:42:05 +03:00
Mikhail Zarechenskiy
0b50fd8ac6 Revert "Move: Fix tests in IDEA 2017.1"
This reverts commit b65460c12f.
2017-08-11 09:42:03 +03:00
Mikhail Zarechenskiy
f9c0d2e93f Revert "Safe Delete: Fix tests in IDEA 2017.1"
This reverts commit ecd56c6a40.
2017-08-11 09:42:02 +03:00
Mikhail Zarechenskiy
400ec6a898 Revert "Move getting source position to manager thread in tests"
This reverts commit 4edfd0d960.
2017-08-11 09:42:01 +03:00
Mikhail Zarechenskiy
b81aa3ee0b Revert "Fix compileJavaAgainstKotlin tests"
This reverts commit 3c96099f7c.
2017-08-11 09:41:59 +03:00
Mikhail Zarechenskiy
6549ca758c Revert "Fix JvmRuntimeDescriptorLoaderTestGenerated"
This reverts commit 33e9e660c4.
2017-08-11 09:41:58 +03:00
Mikhail Zarechenskiy
05be4c4a4e Revert "Fix KotlinVersionsTest, use SAX parser instead of DOM"
This reverts commit 449d1f6ad2.
2017-08-11 09:41:56 +03:00
Mikhail Zarechenskiy
41eff34dc2 Revert "Update test data for ant task tests"
This reverts commit 999e1061b8.
2017-08-11 09:41:55 +03:00
Mikhail Zarechenskiy
73c818a613 Revert "Adjust test data for IDEA 2017.1"
This reverts commit 10aedaf0f4.
2017-08-11 09:41:54 +03:00
Mikhail Zarechenskiy
0abce8b603 Revert "kt1770.kt test rewrote during migration to 171 platform"
This reverts commit 211b58ac6e.
2017-08-11 09:41:53 +03:00
Mikhail Zarechenskiy
13f9e4fdcf Revert "Fix test: check highlighting only in one direction"
This reverts commit cf18c2243f.
2017-08-11 09:41:51 +03:00
Mikhail Zarechenskiy
a0ae933524 Revert "Fix regression of completion inside string templates"
This reverts commit 2804264289.
2017-08-11 09:41:50 +03:00
Mikhail Zarechenskiy
703fd40e0b Revert "Spring Support: Fix tests in IDEA 2017.1"
This reverts commit 2e3617adbb.
2017-08-11 09:41:49 +03:00
Dmitry Jemerov
f14a9d4516 Revert Show more correct type hints
This reverts commit 8077a71aec
2017-08-11 09:41:48 +03:00
Mikhael Bogdanov
698b781726 Add changelog for 1.1.4-eap-76 2017-08-10 16:08:18 +02:00
Denis Zharkov
0640fd43db Fix types enhancement for properties' getters overrides in Java
Prior to the 1.1.4, nullability related annotations were stored
in types that became hard to maintain at some moment and
we got rid of it (see 57b7b91444)

But enhancement for properties overrides stopped working
because there were effectively no annotations in the
resulting descriptor

 #KT-19409 Fixed

 #KT-19409 Fixed
2017-08-10 17:35:22 +07:00
Denis Zharkov
23592cd549 Minor. Move type qualifiers computation to their first usage 2017-08-10 17:35:11 +07:00
Dmitry Jemerov
9794ec70ae Set correct library kind for transitive dependencies
(cherry picked from commit 022430c)
2017-08-10 11:45:01 +02:00
Mikhail Glukhikh
96e9545294 Remove ModalityState.any() from J2kPostProcessor #KT-19453 Fixed
(cherry picked from commit 5904b7f)
2017-08-08 11:58:31 +03:00
Alexey Andreev
3ca24659a2 Fix infinite loop during continuous Gradle build including JS DCE
It's basically a workaround fox bug in Gradle.
See https://github.com/gradle/gradle/issues/2651
2017-08-07 16:39:47 +03:00
Mikhail Glukhikh
061741aab9 Keep coroutines classes in ProGuard #KT-19433 In Progress
(cherry picked from commit 0e4089e)
2017-08-04 17:24:09 +03:00
Dmitry Jemerov
c77ac2da37 Include org.json classes in Kotlin plugin jar
(cherry picked from commit 563472e)
2017-08-04 15:37:06 +02:00
Vyacheslav Gerasimov
6089b9e459 UAST: Implement getFunctionalInterfaceType for KotlinULambdaExpression 2017-08-03 20:36:56 +03:00
Mikhael Bogdanov
94780418e7 Add changelog for 1.1.4-eap-69 2017-08-03 08:20:03 +02:00
Dmitry Jemerov
a7685779f2 Add missing read action
(cherry picked from commit 82c62b4)
2017-08-02 17:45:38 +02:00
Dmitry Jemerov
5131bb58a3 Look at library content to detect library kind when importing
(cherry picked from commit 8842031)
2017-08-02 17:45:28 +02:00
Mikhail Glukhikh
6e43210160 Downgrade "use expression body" inspection to INFORMATION default level 2017-08-02 18:35:05 +03:00
Yan Zhulanow
20e492e886 Parcelable: Disable box tests temporarily 2017-08-02 17:27:30 +03:00
Dmitry Jemerov
11889bda0b Load JSR-305 annotations for libraries if it's enabled for any module
#KT-19303 Fixed

(cherry picked from commit b423d58)
2017-08-02 15:34:17 +02:00
Mikhail Glukhikh
44a84889c0 J2K: use refactorings and runWriteAction more accurately #KT-19371 Fixed
Do not invoke runWriteAction for post-processings
in Convert(Text)JavaCopyPasteProcessor.
Instead each processing can need write action or not,
and J2kPostProcessor takes this into account.

(cherry picked from commit 4ca8d3d)
2017-08-02 15:34:02 +03:00
Mikhail Glukhikh
df8ff29b07 Inline variable: do not show dialog / preview from J2K #KT-19332 Fixed
(cherry picked from commit 8d5e69b)
2017-08-02 15:33:46 +03:00
Yan Zhulanow
d49767bbc6 Ensure there won't be the same classpath entries in the resulting classpath 2017-08-02 03:41:02 +03:00
Bill Collins
9f950a2648 Don't overwrite plugin classpaths detected earlier for annotation processing. Fixes #KT-18022 2017-08-02 03:40:57 +03:00
Yan Zhulanow
129b1c9521 Minor: Fix test data for CLI test (defaultCacheImplementation option was added in Android Extensions) 2017-08-02 03:40:51 +03:00
Yan Zhulanow
b153b4c84e Minor: Change test format to JUnit 3 2017-08-02 03:40:47 +03:00
Yan Zhulanow
6bbe95d5bc Fix "'Redundant modality' is not reported with all-open" (KT-18195) 2017-08-02 03:40:42 +03:00
Yan Zhulanow
9ee8c283ea Android Extensions: Downgrade to old Android variant processing logic when 'experimental' flag is disabled (KT-19270) 2017-08-02 03:40:38 +03:00
Yan Zhulanow
34787901ed AllOpen: Make private members open again because of KT-19047 2017-08-02 03:40:33 +03:00
Yan Zhulanow
0b0d3db726 Parcelable, minor: Change error message 2017-08-02 03:40:28 +03:00
Yan Zhulanow
e8aadd25c0 Parcelable, Lint: Do not report "CREATOR field missing" warnings on our '@Parselize' Parcelables 2017-08-02 03:40:24 +03:00
Yan Zhulanow
21d9fc6782 Report errors from compiler plugins as compiler PLUGIN_ERRORs (KT-19311) 2017-08-02 03:39:23 +03:00
Yan Zhulanow
2da7b7d3b6 NoArg: Fix IllegalAccessError on instantiating sealed class child via Java reflection (KT-18245) 2017-08-02 03:39:14 +03:00
Yan Zhulanow
743d662b80 AllOpen: Support @SpringBootTest annotation (KT-18262) 2017-08-02 03:39:08 +03:00
Yan Zhulanow
89c4cae585 Kapt: Fix "Anonymous class types are not rendered properly in stubs" (KT-18682) 2017-08-02 03:39:02 +03:00
Yan Zhulanow
e32943571d Android Extensions: Support smart-casted receivers (KT-18545) 2017-08-02 03:38:57 +03:00
Mikhail Glukhikh
7777f0b245 Make MODIFIERS_ORDER consistent with code style document
(cherry picked from commit 9e9c4f7)
2017-08-01 20:49:39 +03:00
Nikolay Krasko
317e0948fa Skip method check for non-relevant positions (KT-19403)
#KT-19403 Fixed

(cherry picked from commit 65ea929)
2017-08-01 20:16:30 +03:00
Alexey Tsvetkov
fbba4610e9 Remove Gradle plugin dependency on Apache Commons
We have used `commons-lang` to detect
if current OS is a Windows.
`org.apache.commons.lang.SystemUtils` also
tries to parse JDK version in `clinit` and,
as of AC version 2.4, fails on JDK 9.

I preferred to remove the dependency completely
and copy an implementation of `isWindows` from Intellij
platform, because the code is quite simple
and minimizing unnecessary dependencies will help to avoid
compatibility problems in future.

Gradle plugin also declares a dependency on `commons-io`,
but it seems unused, so the dependency is also removed.

    #KT-18832 fixed
2017-08-01 19:46:21 +03:00
Mikhail Glukhikh
a5c684a969 Do not suggest "can be private" for elements with given annotations
So #KT-19272 Fixed

(cherry picked from commit 87cdc76)
2017-08-01 18:03:38 +03:00
Mikhail Glukhikh
8235c607dc Report "Make <visibility>" for visibility fixes #KT-19274 Fixed
(instead of "Add <visibility> modifier")

(cherry picked from commit 1ed1751)
2017-08-01 12:13:03 +03:00
Toshiaki Kameyama
af5c9efbd5 Do not report "property can be private" in annotations #KT-19273 Fixed
(cherry picked from commit 29dba9e)
2017-08-01 12:03:59 +03:00
Toshiaki Kameyama
a4f5a0c918 Do not report "can be private" on effectively private / local elements
So #KT-18822 Fixed

(cherry picked from commit be0b01a)
2017-07-31 16:03:52 +03:00
Pavel V. Talanov
2e6173e833 script.runtime 1.1.4: Update test data implementations 2017-07-30 18:34:04 +03:00
Pavel V. Talanov
0a0a1c6fcd script.runtime 1.1.4: IDE and compiler use 'kotlin.script.experimental' 2017-07-30 18:34:02 +03:00
Pavel V. Talanov
d70dfd457c script.runtime 1.1.4: Remove new API from 'kotlin.script' package
Copy of new API is in 'kotlin.script.experimental' package
2017-07-30 18:33:59 +03:00
Pavel V. Talanov
9a80c0c7ab script.runtime 1.1.4: Remove copy of ScriptContents class
This class is not new(experimental) API is not supposed to be moved
2017-07-30 18:33:57 +03:00
Pavel V. Talanov
1cd723a552 script.runtime 1.1.4: Copy new API to kotlin.script.experimental package
Minor: Move Environment type alias to resolvers_deprecated.kt file
2017-07-28 20:05:32 +03:00
Pavel V. Talanov
5ca11db512 script.runtime 1.1.4: Undeprecate old API 2017-07-28 19:46:52 +03:00
Pavel V. Talanov
8b62b3ae55 script.runtime: add 'kotlin-runtime' dependency
script.runtime is not built by JPS, this just affects highlighting
2017-07-28 19:45:48 +03:00
Pavel V. Talanov
3b42f4fff6 Send roots changed iff combined dependencies of all scripts changed
This reduces total number of reindex requests when working with scripts

ScriptDependenciesCache::onChange logic is independent from ScriptDependenciesUpdater::onChange
2017-07-28 15:44:29 +03:00
Pavel V. Talanov
a8fdc88ac7 Filter out invalid files before contributing them for indexing
#EA-104574
2017-07-28 15:44:26 +03:00
Mikhael Bogdanov
b15a441fc2 Add changelog for 1.1.4-eap-54 2017-07-27 17:00:29 +02:00
Yan Zhulanow
3a2fb489cb Remove test for KT-19179 temporary, it causes a compilation error 2017-07-27 14:11:56 +03:00
Mikhael Bogdanov
a208adf522 Properly generate inner classes when compiling source for inline
KT-19175: Compiler generates different bytecode when classes are compiled separately or together

 #KT-19175 Fixed

(cherry picked from commit ff676c0)
2017-07-26 21:27:41 +02:00
Toshiaki Kameyama
838a74d9de Fix Math.min with coerceAtMost intention inside qualified expression
So #KT-19232 Fixed

(cherry picked from commit 5290553)
2017-07-26 20:18:08 +03:00
Sergey Igushkin
8e590d5913 Fix Kapt3 classes not consumed by kotlinCompile tasks from their friend 2017-07-26 18:38:17 +03:00
Yan Zhulanow
aac8c19cf1 Parcelable, minor: Rename MagicParcel to Parcelize 2017-07-26 18:38:17 +03:00
Yan Zhulanow
c49b55721b Android Extensions, minor: Fix test 2017-07-26 18:38:17 +03:00
Yan Zhulanow
0f38b4636b Minor: Clarify module name in warning message about empty output classpath/output directories 2017-07-26 18:38:17 +03:00
Yan Zhulanow
93d9627054 Kapt: Register kapt classes output directory as Java classes directory (KT-19211)
This is relevant to pure (non-Android) Java projects and Gradle 4.0+.
2017-07-26 18:38:17 +03:00
Yan Zhulanow
2a4b6152a4 Kapt: Do not use AbstractCompile as a supertype for KaptTask (KT-19179)
Gradle sometimes tells that kaptCompile is UP-TO-DATE even when it's not true, so the annotation processing step is silently skipped.
Looks like replacing `mapSource {}` with an explicit getter or with manual `source()` invocation does not fix the problem.

This looks like a bug in Gradle appeared since 3.0. The test from this commit works with Gradle 2.14.1.
2017-07-26 18:38:16 +03:00
Yan Zhulanow
60e2e4911c Kapt: 'kaptKotlin' task should be invoked only when all task dependencies from kapt configuration is built (KT-19178) 2017-07-26 18:38:16 +03:00
Yan Zhulanow
92aa22aa9a Android Extensions: Support defaultCacheImplementation in Gradle 2017-07-26 18:38:16 +03:00
Yan Zhulanow
674e0404d0 Android Extensions: Add global cache flag in compiler plugin 2017-07-26 18:38:16 +03:00
Yan Zhulanow
60f6754e0c Parcelable: Support Android Extensions experimental flag 2017-07-26 18:38:16 +03:00
Yan Zhulanow
cab7560089 Android Extensions: Add kotlin-android-extensions-runtime only if experimental flag is enabled 2017-07-26 18:38:16 +03:00
Yan Zhulanow
7a1acaafad Android Extensions: Migrate enabled status check to Gradle importer #KT-17641 2017-07-26 18:38:16 +03:00
Yan Zhulanow
421962ab0f Parcelable: Fixes after review 2017-07-26 18:38:16 +03:00
Yan Zhulanow
f43aa241da Parcelable: Support SortedSet, NavigableSet, SortedMap, NavigableMap 2017-07-26 18:38:16 +03:00
Yan Zhulanow
5d96a185bc Parcelable: Report error on unsupported parameter types, add @RawValue annotation support 2017-07-26 18:38:16 +03:00
Yan Zhulanow
166e81bd6d Parcelable: Support CharSequence, IBinder/IInterface, objects, enums. Serialize Parcelable efficiently if possible 2017-07-26 18:38:16 +03:00
Yan Zhulanow
9fd7d949a4 Parcelable: Add test for clinit merging 2017-07-26 18:38:16 +03:00
Yan Zhulanow
b7a21e6cd8 Parcelable: Support Parcelizer interface in order to be able to customize serialization 2017-07-26 18:38:15 +03:00
Yan Zhulanow
62ba625247 Parcelable: Correctly handle writeToParcel() overriding, report errors on custom writeToParcel() and CREATOR 2017-07-26 18:38:15 +03:00
Yan Zhulanow
c8fd0468f1 Parcelable: Allow custom describeContents() implementation 2017-07-26 18:38:15 +03:00
Yan Zhulanow
ba57d31391 Parcelable: Add declaration checker 2017-07-26 18:38:15 +03:00
Yan Zhulanow
878403bba4 Parcelable: Add Parcelable functionality to Android Extensions plugin 2017-07-26 18:38:15 +03:00
Yan Zhulanow
d62e95f2d6 Parcelable: Download Robolectric artifacts in order to use them in tests 2017-07-26 18:38:15 +03:00
Ilya Chernikov
b8fbe1d808 Add tests for client/session flags removal, minor fix in shutdown logic 2017-07-26 17:13:54 +02:00
Toshiaki Kameyama
d41fbcd285 Support "Lift return out of when" for exhaustive when without else
So #KT-18852 Fixed

(cherry picked from commit c3988ef)
2017-07-26 17:52:52 +03:00
Alexey Andreev
12ed6c5ed2 Support inlining internal functions to friend modules in JS BE
There's one exception: if an inline internal function calls
private function, this will fail at run time.
2017-07-26 16:18:55 +03:00
Mikhail Glukhikh
b17ddb679c Remove unused variable with constant initializer #KT-13886 Fixed
(cherry picked from commit 9781d1f)
2017-07-26 15:25:01 +03:00
Mikhail Glukhikh
b24f272b99 Cast to type quick-fix: handle case with qualified elements correctly
Same fix for 'add !!' fix
So #KT-18368 Fixed

(cherry picked from commit a08f55c)
2017-07-26 15:24:42 +03:00
Mikhail Glukhikh
008ff26687 More accurate deparenthesize (keeping annotations) in some IDE actions
So #KT-19004 Fixed

(cherry picked from commit e6872c5)
2017-07-26 15:24:24 +03:00
Nikolay Krasko
f72bbfb527 Enable replace for deprecated alias in whole project (KT-14929)
#KT-14929 Fixed

(cherry picked from commit 732d112)
2017-07-26 14:26:31 +03:00
Nikolay Krasko
22391b8737 Enable ReplaceWith for type aliases (KT-14929)
#KT-14929 Fixed

(cherry picked from commit 5df2698)
2017-07-26 14:26:01 +03:00
Alexander Udalov
28169a8a51 Change -Xload-jsr305-annotations argument to -Xjsr305-annotations={ignore|enable}
See https://youtrack.jetbrains.com/issue/KT-19229 for a complete
explanation

 #KT-19229 Fixed
 #KT-10942

(cherry picked from commit 224df7a1ea)
2017-07-26 11:46:12 +03:00
Alexander Udalov
0396e5a9eb Refactor AnalysisFlags and their support in IDE
* Support flags with any value (not just Boolean)
* Support all flags by parsing arguments in KotlinFacetSettings, instead
  of manually listing known flags

 #KT-19210 Fixed

(cherry picked from commit 2f99f6ad34)
2017-07-26 11:46:10 +03:00
Alexander Udalov
9c173bdd06 Minor, change parameter type of parseCommandLineArguments
(cherry picked from commit 845de7aa4d)
2017-07-26 11:46:09 +03:00
Alexander Udalov
017bd3d9e0 Revert "Update to jline 3.3.1 and jansi 1.16"
This reverts commit b08f36eabc.
2017-07-26 00:42:23 +03:00
Ilya Chernikov
336b3402a8 Fix daemon clients cleanup, fixes hanging daemon processes 2017-07-25 22:47:09 +02:00
Simon Ogorodnik
754733f514 Disable completion binding context caching by default
Now it opt-in in internal mode, due duplication problems
 #KT-19191 fixed

(cherry picked from commit fa88fb7)
2017-07-25 19:46:16 +03:00
Simon Ogorodnik
85fbf3478d KT-14606: Never compute decompiled text in BasicLookupElementFactory
#KT-14606 fixed

(cherry picked from commit 4cdc3fd)
2017-07-25 19:46:16 +03:00
Simon Ogorodnik
341eab5536 Prevent KotlinDecompiledFileViewProvider from reading vfile when possible
(cherry picked from commit 6036c95)
2017-07-25 19:46:16 +03:00
Dmitry Jemerov
e1c12f3847 Correctly detect library kind when not using modules per sourceset
#KT-19219 Fixed

(cherry picked from commit c78ad9c)
2017-07-25 18:21:27 +02:00
Alexander Udalov
b08f36eabc Update to jline 3.3.1 and jansi 1.16
Note that the history file name was changed (.kotlin_history ->
.kotlinc_history) because the history is now stored in a different
(incompatible) format.

 #KT-11369 Fixed

(cherry picked from commit f313001b2d)
2017-07-25 11:11:29 +03:00
Dmitry Jemerov
114ea51232 Migration for pre-1.1.3 JS libraries
#KT-19156 Fixed

(cherry picked from commit e0dc7a2)
2017-07-24 19:56:21 +02:00
Dmitry Jemerov
7e3ea63586 ConfigureKotlinTest refactoring to avoid duplicating production logic
(cherry picked from commit 861219f)
2017-07-24 19:56:13 +02:00
Dmitry Jemerov
91b05f6648 Add missing read action
(cherry picked from commit 63c6ba7)
2017-07-24 19:56:06 +02:00
Dmitry Jemerov
b2f0004a8b Correctly detect stdlib in Gradle projects; move detection out of EDT
To detect whether a module has an stdlib in its dependencies, look at
source root modules and not at base module.

(cherry picked from commit f370d74)
2017-07-24 19:55:59 +02:00
Dmitry Jemerov
5b158f6d5a Check for non-configured modules in background thread
#KT-17835 Fixed

(cherry picked from commit 0971af8)
2017-07-24 19:55:51 +02:00
Dmitry Jemerov
79212bbf2b Use Kotlin/JVM and Kotlin/JS terms in the UI
(cherry picked from commit e1f7c91)
2017-07-24 19:55:43 +02:00
Dmitry Jemerov
f77bbf18d0 JavaFrameworkType: J2K
(cherry picked from commit 0f2992d)
2017-07-24 19:55:34 +02:00
Dmitry Jemerov
680462393f JavaFrameworkType: rename to .kt
(cherry picked from commit 079f769)
2017-07-24 19:55:28 +02:00
Dmitry Jemerov
9cd56e691f Use distinct icon for Kotlin/JS module and libraries
(cherry picked from commit 6dbaec0)
2017-07-24 19:55:21 +02:00
Dmitry Jemerov
54c74041b6 JSFrameworkType: J2K
(cherry picked from commit 6eff8c7)
2017-07-24 19:55:12 +02:00
Dmitry Jemerov
079f0ced7f JSFrameworkType: rename to .kt
(cherry picked from commit 57a501e)
2017-07-24 19:55:04 +02:00
Pavel V. Talanov
eee5c1e836 Fix calling GSS.union for empty array
EA-104046
2017-07-24 18:54:56 +03:00
Pavel V. Talanov
fd411bdae1 Refactor: Make DependenciesCache and ScriptDependenciesUpdater services
Rename: DependenciesCache -> ScriptDependenciesCache
    (makes sense to make name more specific since it is a service now)
2017-07-24 18:54:54 +03:00
Pavel V. Talanov
95264f818d Minor, more precise error message 2017-07-24 18:54:52 +03:00
Kirill Rakhman
a1fd1726ce "Use destructuring declaration" should not be available for top-level and class properties (#1205)
Fixes #KT-19167

(cherry picked from commit 4c7ddbe)
2017-07-24 14:36:46 +02:00
Ilya Chernikov
3b4b9c15d5 Fix xmx setting for the daemon in tests
(cherry picked from commit e38aaf3)
2017-07-24 13:00:27 +02:00
Ilya Chernikov
fabb150abc Improve logging and exception handling in the daemon
(cherry picked from commit 17a189a)
2017-07-24 12:59:25 +02:00
Alexander Udalov
ce8943975e Fix IAE at protoDifferenceUtils.kt on new metadata field
The class_local_variable/package_local_variable JVM extensions were
added in 616d575fb6

 #KT-19155 Fixed

(cherry picked from commit f69e96b240)
2017-07-21 20:13:38 +03:00
Nikolay Krasko
103c23250a Fix outdated highlighting for Kotlin injected fragments (KT-18842)
Do not use cached value for injection in non-dispatch threads and throw
PCE if value isn't ready. Otherwise outdated value may be stored in
highlighting.

 #KT-18842 Fixed

(cherry picked from commit b6bd3e1)
2017-07-21 20:03:02 +03:00
Nikolay Krasko
cd380e6407 Fix slow typing because of counting injected fragments (KT-18842)
- cache result of kotlin injection on modification tracker
- never count injection in dispatch thread, use cached result instead
- compute injection with write action priority, reuse cache if unfinished

 #KT-18842 Fixed

(cherry picked from commit f4038f7)
2017-07-21 20:02:45 +03:00
Nikolay Krasko
0f82e76e9b Refactoring: show using ProcessCancelException in method name
(cherry picked from commit 436b637)
2017-07-21 20:02:33 +03:00
Nikolay Krasko
8b95973f6a Refactoring: delete unused CachedValueProperty class
(cherry picked from commit fbe16f7)
2017-07-21 20:02:21 +03:00
Alexander Udalov
92a49239b4 Suppress FNFE in .kotlin_metadata index
Similarly to VirtualFileKotlinClass.create.

This could happen for example when some files are removed from
kotlin-stdlib-common

(cherry picked from commit 7f8e7c66f5)
2017-07-21 19:09:57 +03:00
Alexander Udalov
ed23880d60 Discriminate header classes in favor of non-header type aliases
In the test case, the problem was that Foo.a's type was resolved to the
_class A_, which was written to metadata on JVM instead of the class
AImpl with typealias A as an abbreviation. This metadata was incorrect
because there's no class A from the JVM compiler's point of view; that's
why the error "cannot access class A" was reported

 #KT-19151 Fixed

(cherry picked from commit ebdf5aa223)
2017-07-21 19:09:55 +03:00
Mikhail Glukhikh
756872a878 Code cleanup: KotlinSafeDeleteProcessor
(cherry picked from commit 6ee94da)
2017-07-21 19:06:18 +03:00
Mikhail Glukhikh
d245ff328c Search for KtTypeAlias in safe delete processor
Related to KT-16046

(cherry picked from commit d05a525)
2017-07-21 19:06:05 +03:00
Mikhail Glukhikh
3f35fd3dcd Add type aliases into UnusedSymbolInspection / safe delete
So #KT-16046 Fixed

(cherry picked from commit dd0cf82)
2017-07-21 19:05:51 +03:00
Mikhail Glukhikh
4b3ead85d9 If-then to safe access: more correct receiver calculation
So #KT-18928 Fixed

(cherry picked from commit 202fb19)
2017-07-21 19:05:16 +03:00
Mikhail Glukhikh
457fad7146 Invoke back setting "show inline dialog for local variables"
So #KT-19130 Fixed

(cherry picked from commit 31bb1cc)
2017-07-21 19:04:24 +03:00
Kirill Rakhman
3f71b1af4f Fix some type hints related issues (#1204)
* Type hints shouldn't appear for negative literals
Fixes #KT-18974

* Make type hints work for destructuring declarations
Fixes #KT-18444

* Hide type hints for generic constructor calls if type arguments are explicitly specified
Fixes #KT-19167

(cherry picked from commit a7084ce)
2017-07-21 16:32:53 +02:00
Denis Zharkov
0203243fe0 Fix nullable variables spilling in coroutines
See the last comment in testData for clarification

 #KT-18983 Fixed
2017-07-21 12:49:49 +03:00
Denis Zharkov
f0a5fab759 Use known jvm binary class for package part if possible 2017-07-21 12:49:49 +03:00
Denis Zharkov
444f14371d Minor. Rename compactIfPossible -> compact
As ArrayList can always be compacted
2017-07-21 12:49:49 +03:00
Denis Zharkov
9d2d0c61d5 Optimize memory footprint for case of empty annotations in types
It seems that most of the simple types don't have any annotations,
so for that case it's worth removing the field from SimpleTypeImpl

Also introduce a NotNullSimpleType being used when replacing nullability
2017-07-21 12:49:49 +03:00
Denis Zharkov
51f85aa8a5 Optimize JavaTypeResolver by avoiding using some language features
It's quite a hot point and using local functions with default
parameters seem to affect negatively to overall performance
(at least some of compiler benchmark have shown it)
2017-07-21 12:49:49 +03:00
Denis Zharkov
22ea5a0679 Call compactIfPossible where it's possible in BinaryJava*
It helps to avoid retaining a lot of redundant empty SmartList's
instances
2017-07-21 12:49:49 +03:00
Denis Zharkov
b7f4a583cf Reduce memory footprint after functions substitution
Do not recreate new instances if descriptors' parts remain
effectively the same
2017-07-21 12:49:49 +03:00
Denis Zharkov
fcb81c8c06 Reduce memory footprint of TypeSubstitutor
Avoid creating new instances if types remain unchanged
2017-07-21 12:49:49 +03:00
Denis Zharkov
cf39aed382 Reduce memory footprint for basic case of flexible types
The case is when we have a simple type constructor
(not array nor collection) and type is not raw:
A<T1, >..A<T1>?

Actually these types are almost equal besides of nullability,
but we create and resolve two different simple types,
they have different arguments' lists, etc.

The idea is to add NullableSimpleType subclass with delegate
to another simple type

It should help a lot both with common cases and with corner ones:
flexibles types in spark for Function22 having exponential size
because of its flexibility

 #KT-14375 Fixed
 #KT-14323 Fixed
2017-07-21 12:49:49 +03:00
Denis Zharkov
39c3733786 Avoid creating SimpleType instances for default type 2017-07-21 12:48:08 +03:00
Denis Zharkov
cbbf796be2 Use SmartList instead of SmartSet for overridden descriptors
SmartSet was used because it was the only lightweight collection
available in core, but now there is org.jetbrains.kotlin.utils.SmartList
2017-07-21 12:48:08 +03:00
Denis Zharkov
b577a087ff Reduce memory size retained by LookupTrackerImpl
By default SmartList is used there for storing values of a multimap,
so a lot of duplicated items is stored there (file names are being
duplicated).

Even although there is a separate interner for these values,
retained memory size has been reduced for 30M when compiling `idea`
module in Kotlin project
2017-07-21 12:48:08 +03:00
Denis Zharkov
d2192447ff Use SmartList for storing annotations in binary classes
Looks like in the most cases there are <= 1 annotations
in real declarations
2017-07-21 12:48:08 +03:00
Mikhail Glukhikh
0d55ab0750 Use "unnecessary variable" inspection in J2K
Unused variables are no more treated as unnecessary
Related to KT-15958

(cherry picked from commit 44790ec)
2017-07-21 11:58:35 +03:00
Mikhail Glukhikh
6612f57767 Do not report "redundant Unit" for generic calls coerced to Unit
So #KT-18999 Fixed

(cherry picked from commit 39f1ef3)
2017-07-21 11:58:18 +03:00
Mikhail Glukhikh
f6777e8af9 Move: RemoveSetterParameterTypeInspection to inspections package
(cherry picked from commit c554bfa)
2017-07-21 11:58:01 +03:00
Mikhail Glukhikh
0383370588 Move: RedundantUnitReturnTypeInspection to inspections package
(cherry picked from commit e154e4c)
2017-07-21 11:57:46 +03:00
Mikhael Bogdanov
01779f10c3 Update changelog for 1.1.4-eap-33 2017-07-20 16:19:18 +02:00
Dmitry Jemerov
aebc35a8f7 EA-104855 - (1.1.4) NPE: KotlinCommonBlockKt.isFirstParameter
(cherry picked from commit 9213c4a)
2017-07-20 12:55:39 +02:00
Dmitry Jemerov
ae6973b8e4 Fix tests affected by annotation wrapping changes
(cherry picked from commit fbcc519)
2017-07-20 12:41:09 +02:00
Mikhail Glukhikh
6325fb1455 Unnecessary variable: do not start inlining in write action
So #KT-19110 Fixed
2017-07-20 12:25:12 +03:00
Dmitry Jemerov
1efeec513f Advance source stub version which wasn't advanced in 5d87276cf
#KT-19113 Fixed

(cherry picked from commit 4df6db1)
2017-07-19 18:53:27 +02:00
Mikhail Glukhikh
6c43e3f46b Minor test fix
(cherry picked from commit 43f9035)
2017-07-19 18:14:48 +03:00
Dmitry Jemerov
1558f81e1f Merge remote-tracking branch 'origin/1.1.4' into 1.1.4 2017-07-19 16:16:07 +02:00
Dmitry Jemerov
70a0ca5b24 Add options for wrapping local variable and property annotations
#KT-14950 Fixed

(cherry picked from commit 9513920)
2017-07-19 16:15:57 +02:00
Dmitry Jemerov
517e226ceb Implement wrapping options for enum constants
#KT-14126 Fixed

(cherry picked from commit 050ff03)
2017-07-19 16:15:50 +02:00
Dmitry Jemerov
dee73deb28 Support formatting of 'where' clauses
#KT-14083 Fixed

(cherry picked from commit 7555bb6)
2017-07-19 16:13:31 +02:00
Dmitry Jemerov
e8bb5f7a47 Reformat expression body property accessors
#KT-17394 Fixed

(cherry picked from commit 325e950)
2017-07-19 16:13:21 +02:00
Dmitry Jemerov
0e0d429810 Consistent name for option controlling spaces around ..
(cherry picked from commit 4db8639)
2017-07-19 16:12:56 +02:00
Yan Zhulanow
cee07c769e Use compiling evaluator only if there is non-inline lambda or a loop in the bytecode 2017-07-19 16:53:34 +03:00
Yan Zhulanow
7823bee0a2 Minor: Fixes after review 2017-07-19 16:53:33 +03:00
Yan Zhulanow
ea26411f86 Pass byte array more efficiently
Filling byte[] values is especially slow on Android (>3000ms to fill a byte[3000] on emulator).
2017-07-19 16:53:32 +03:00
Yan Zhulanow
94b51d8be0 Debugger: Disable code interpreting by default in evaluator
Provide the compiled bytecode to debugger instead of interpreting the expression by default.
This significantly increases evaluation speed in numerous cases, e.g. `(1..10000).map { it.toString() }.count()`.
Leave interpreter mode as a fallback.

Android does not provide decent in-memory class loading support.
Moreover, we need to run dex on the compiled classes, and it required significant time.
So for now compiling evaluator for Android is available only in Android O, and only if there're any local classes or non-inline lambdas (evaluator didn't work for them before so we may consider this change as an improvement).
2017-07-19 16:53:31 +03:00
Yan Zhulanow
935cf4d352 Android Extensions: put new functionality under the flag 2017-07-19 16:53:30 +03:00
Yan Zhulanow
369d03d3f4 Kapt: Map kaptGenerateStubsKotlin task classpath properly, ensure the destination for compileKotlin isn't in it (KT-18799) 2017-07-19 16:53:29 +03:00
Yan Zhulanow
fae73c5b6e Android Exensions: Add kotlin-android-extensions-runtime dependency automatically in Gradle plugin 2017-07-19 16:53:28 +03:00
Yan Zhulanow
7faebbaadf Android Extensions: Fixes after review 2017-07-19 16:53:27 +03:00
Yan Zhulanow
6fe94b33fe Android Extensions: Add SparseArray implementation for the View cache (KT-18250) 2017-07-19 16:53:26 +03:00
Yan Zhulanow
e0b200a2fc Minor: Group plugin modules 2017-07-19 16:53:25 +03:00
Yan Zhulanow
83890dea47 Remove obsolete kapt2 implementation 2017-07-19 16:53:24 +03:00
Yan Zhulanow
a05abc0f1b Android Extensions: Support LayoutContainer in code generation 2017-07-19 16:53:23 +03:00
Yan Zhulanow
9fa065142b Android Extensions: Use Activity and Fragment supertypes in INVOKE_VIRTUAL calls instead of the user implementation class names 2017-07-19 16:53:22 +03:00
Yan Zhulanow
aac8c847f7 Android Extensions: Support @ContainerOptions in compiler plugin 2017-07-19 16:53:21 +03:00
Yan Zhulanow
fa9086e994 Android Extensions: Add runtime library with LayoutContainer and its options 2017-07-19 16:53:20 +03:00
Yan Zhulanow
91cc4df61a Android Extensions: Support cache in custom Views 2017-07-19 16:53:19 +03:00
Yan Zhulanow
ef3fb6e744 Minor: Android Extensions compiler plugin refactoring 2017-07-19 16:53:19 +03:00
Yan Zhulanow
2a67ad5957 Minor: Move Android Extensions compiler plugin tests to some other package 2017-07-19 16:53:18 +03:00
Yan Zhulanow
84547b535a Minor: Move AndroidExtensionsReportSubmitter to other KAE files 2017-07-19 16:53:17 +03:00
Yan Zhulanow
cf3a2a6072 Use descriptor modality in IDE inspections/intentions
This fixes KT-18160, KT-18194, KT-18195, KT-18197
2017-07-19 16:53:16 +03:00
Yan Zhulanow
61f8931080 Android Extensions: Add synthetic property highlighting 2017-07-19 16:53:13 +03:00
Yan Zhulanow
0f6b8d6d24 Android Extensions: Show warning on a dot-call of a reference which is missing in some configurations (KT-18012)
When more than one layout configuration is available, a particular resource (view or fragment) may be absent in some of them.
We should show a warning on such resource reference calls as the call may lead to NPE.
2017-07-19 16:52:09 +03:00
Yan Zhulanow
c2398cfc79 Android Extensions: Support Android variants and library dependencies (KT-14086, KT-16934) 2017-07-19 16:52:08 +03:00
Yan Zhulanow
8f6e990b34 Kapt: Add gradle warnings for Android projects
1. When the old kapt (aka kapt1) is used
2. (for Android projects) When Kotlin plugin is applied but annotationProcessor (Java-only) dependencies are found
2017-07-19 16:52:07 +03:00
Nikolay Krasko
68ec640421 Rewrite test class to make it work on Windows
Stop using dummy file and assert result with assertEqualsToFile().

Previous version didn't work on Windows because of `\r`.

(cherry picked from commit dd2a87d)
2017-07-19 15:07:49 +03:00
Dmitry Jemerov
00ed7d37e0 Fix GradleLanguageFeatureQuickFixTest on Windows
(cherry picked from commit 31840fa)
2017-07-19 13:57:58 +02:00
Nikolay Krasko
22945c8adf Force OOB in accessors for properties without explicit type (KT-19062)
(cherry picked from commit 4e76975)

 #KT-19062 Fixed
2017-07-19 12:52:00 +03:00
Nikolay Krasko
9a44ad14b7 Check OOB stays the same for string in super type constructor call
(cherry picked from commit bcbff98)
2017-07-19 12:51:39 +03:00
Anton Bannykh
b874c92ea4 fixup: updated EXPECTED_REACHABLE_NODES
(cherry-picked from commit e43a145)
2017-07-19 12:30:31 +03:00
Anton Bannykh
89484720a9 JS tests: changes to kotlin.test + the way compiler tests are generated.
(cherry-picked from commit 6ed7eaf)
2017-07-19 12:30:31 +03:00
Dmitry Petrov
9afad21355 Generate proper initialization for possibly nullable SAM wrapper 2017-07-19 11:58:24 +03:00
Alexey Sedunov
2ef1c2638d Minor: Fix tests
(cherry picked from commit eda747c)
2017-07-19 11:51:50 +03:00
Alexey Sedunov
4aea15253b Create from Usage: Remove extra space before type parameters list
#KT-16352 Fixed

(cherry picked from commit d2dbc47)
2017-07-19 11:51:30 +03:00
Alexey Sedunov
092f498c87 Create Class from Usage: Use type parameter bounds as supertypes
#KT-15242 Fixed

(cherry picked from commit e98af7b)
2017-07-19 11:49:54 +03:00
Alexey Sedunov
0052a60102 Create from Usage: Make property lateinit where possible
#KT-17651 Fixed

(cherry picked from commit 95769dc)
2017-07-19 11:49:35 +03:00
Alexey Sedunov
271b03e709 Create from Usage: Add test for KT-17537
#KT-17537 Fixed

(cherry picked from commit e9bf1d2)
2017-07-19 11:49:19 +03:00
Alexey Sedunov
5085082882 Create from Usage: Do not create type parameter by constuctor reference
#KT-17353 Fixed

(cherry picked from commit 0365d3a)
2017-07-19 11:48:59 +03:00
Alexey Sedunov
e8c55ff562 Control Flow: Fix CFG usage info for double-colon expressions
#KT-12551 Fixed
 #KT-17092 Fixed

(cherry picked from commit 2e76a76)
2017-07-19 11:48:42 +03:00
Alexey Sedunov
3ac20bb452 Implement Members: Do not generate 'header' keyword
#KT-18466 Fixed

(cherry picked from commit 216b28e)
2017-07-19 11:48:22 +03:00
Alexey Sedunov
c5b9c208b4 Create from Usage: Infer expected type for lambda body
#KT-18186 Fixed

(cherry picked from commit 26d6088)
2017-07-19 11:47:47 +03:00
Alexey Sedunov
8e046c937a Create from Usage: Create data class property from destructuring entry
#KT-18540 Fixed

(cherry picked from commit b48feb2)
2017-07-19 11:46:28 +03:00
Alexander Udalov
f4f6c1f9a8 Maven plugin: initial support for Java 9 modules
(cherry picked from commit b2b492447f)
2017-07-19 11:21:09 +03:00
Alexander Udalov
bc17f4a037 Maven plugin: fix warnings, update copyrights
(cherry picked from commit 848edc14cb)
2017-07-19 11:21:04 +03:00
Alexander Udalov
3525d7b114 Minor, remove unneeded codegen test
This test is already present in compiler/testData/cli/jvm/

(cherry picked from commit 1d46070bd5)
2017-07-19 11:20:56 +03:00
Pavel V. Talanov
154939a2b0 Update CodegenTestCase after rebasing on latest changes 2017-07-19 10:53:51 +03:00
Pavel V. Talanov
a15ad448fa Catch and report exceptions from DependenciesResolver 2017-07-19 10:53:50 +03:00
Pavel V. Talanov
728db429df ScriptDependenciesUpdater: compute script contents synchronously 2017-07-19 10:53:49 +03:00
Simon Ogorodnik
96a650085c Add kotlinx-coroutines-core to kotlin-ultimate 2017-07-19 10:53:48 +03:00
Pavel V. Talanov
09ecacabae ScriptDependenciesUpdater: set job to null after processing result
Fix inconsistency introduced after extracting ScriptDependenciesUpdater
2017-07-19 10:53:48 +03:00
Pavel V. Talanov
8887728cae DependenciesCache: remove ad-hoc ScriptDependencies comparison 2017-07-19 10:53:47 +03:00
Pavel V. Talanov
246d958b7a Make sure template classpath is always among script dependencies 2017-07-19 10:53:46 +03:00
Pavel V. Talanov
8a0f296e4f Offload legacy dependency resolver work to a separate thread pool
This is mainly to improve experience for kdsl users before gradle migrates to new API
2017-07-19 10:53:45 +03:00
Pavel V. Talanov
4cc8cdd603 Fix creating DependenciesResolver with default arguments 2017-07-19 10:53:45 +03:00
Pavel V. Talanov
7d8a66bd7e Refactor ScriptDependenciesUpdater: improve readability a bit 2017-07-19 10:53:44 +03:00
Pavel V. Talanov
7366f6f885 Minor: extract ScriptContentLoader::getEnvironment 2017-07-19 10:53:43 +03:00
Pavel V. Talanov
c61453dfe4 ScriptDependenciesUpdater: use Job explicitly instead of futures
Cancel jobs without interrupting
2017-07-19 10:53:42 +03:00
Pavel V. Talanov
1c2d598ad8 Rename services related to script dependencies
KotlinScriptConfigurationManager -> ScriptDependenciesManager
KotlinScriptExternalImportsProvider -> ScriptDependenciesProvider
2017-07-19 10:53:42 +03:00
Pavel V. Talanov
d25c2b321f ScriptDependenciesUpdater, minor: improve isLastSentRequestCheck 2017-07-19 10:53:41 +03:00
Pavel V. Talanov
9bae9ef919 Rename: dependenciesClasspath -> templateClasspath
Clearer distinction from additionalResolverClasspath
2017-07-19 10:53:40 +03:00
Pavel V. Talanov
f27ab21489 Refactor KotlinScriptConfigurationManager: extract parts
Introduce ScriptDependenciesUpdater, DependenciesCache and ScriptContentLoader
2017-07-19 10:53:39 +03:00
Pavel V. Talanov
fff44b9a86 Support @AcceptedAnnotations for different kinds of resolvers 2017-07-19 10:53:39 +03:00
Pavel V. Talanov
6af24876f9 AsyncDependenciesResolver: provide implementation for sync resolve 2017-07-19 10:53:38 +03:00
Pavel V. Talanov
9cff205755 Compiler build depends on kotlinx-coroutines-core 2017-07-19 10:53:37 +03:00
Pavel V. Talanov
e24becab2a Minor, template providers: don't create classloader for empty classpath 2017-07-19 10:53:36 +03:00
Pavel V. Talanov
989fe6197d Gradle Kotlin DSL uses compiler-embdeddable jar when loading resolver 2017-07-19 10:53:36 +03:00
Pavel V. Talanov
dafc0d3eef GradleScriptTemplateProvider: avoid duplicating template loading code 2017-07-19 10:53:35 +03:00
Pavel V. Talanov
f0327ca99d ScriptTemplatesProvider: refactor dependency loading
Change dependenciesClasspath is of type List<File>
Add additionalResolverClasspath
2017-07-19 10:53:34 +03:00
Pavel V. Talanov
1f928ded2d Catch errors when instantiating script templates
If we throw from this code IDE becomes unusable

 #KT-18945 Fixed
2017-07-19 10:53:33 +03:00
Pavel V. Talanov
cf00d29b0d ScriptDependenciesFileAttribute: fix TODOs 2017-07-19 10:53:33 +03:00
Pavel V. Talanov
cb2b038f26 Minor: suppress deprecation warning 2017-07-19 10:53:32 +03:00
Pavel V. Talanov
9047547f8d Script templates: search for parameterless constructor of resolver 2017-07-19 10:53:31 +03:00
Pavel V. Talanov
aa8713953b Propagate reports from script dependency resolver
Compiler: show as compiler messages
IDE: annotate code in a separate highlighting pass
2017-07-19 10:53:30 +03:00
Pavel V. Talanov
51cfd9cda8 Support legacy resolver interface 2017-07-19 10:53:29 +03:00
Pavel V. Talanov
9f8557d782 Update project code to use new script.runtime APIs 2017-07-19 10:53:29 +03:00
Pavel V. Talanov
22710fdd72 Add coroutines-jdk8 to project 2017-07-19 10:53:28 +03:00
Pavel V. Talanov
1a450eaad0 Refactor: move KotlinScriptExternalImportsProviderImpl to 'cli' module 2017-07-19 10:53:27 +03:00
Pavel V. Talanov
deb5fe104c Script IDE API: remove <TF: Any> 2017-07-19 10:53:26 +03:00
Pavel V. Talanov
04f707f8f8 AbstractScriptConfigurationTest: adapt to changes in API 2017-07-19 10:53:25 +03:00
Pavel V. Talanov
fb9f0e8b3f Refactor getting dependencies for script files API
Deprecate KotlinScriptDefinition#getDependenciesFor
Expose dependencyResolver as a property
KotlinScriptExternalImportsProvider is the component clients should be asking for dependencies
2017-07-19 10:53:25 +03:00
Pavel V. Talanov
f94d8145e2 KSCM: fix wrong update on null return from Template.getDependenciesFor 2017-07-19 10:53:24 +03:00
Pavel V. Talanov
e6e5f14c12 KSCM: persist script dependencies between idea launches 2017-07-19 10:53:23 +03:00
Pavel V. Talanov
fca0f9da29 KSCM: rework async requests 2017-07-19 10:53:23 +03:00
Pavel V. Talanov
11004ed7a0 KSCM: temporary workaround gradle returning results in unstable order 2017-07-19 10:53:22 +03:00
Pavel V. Talanov
7f16ac6155 Introduce ScriptDependenciesFileAttribute to persist script dependencies 2017-07-19 10:53:21 +03:00
Pavel V. Talanov
420747ef79 Support async script dependency updates for annotation based templates
Do not try to cache dependencies for every script on startup
Schedule cache updates upon request as opposed to updating them synchronously
2017-07-19 10:53:20 +03:00
Pavel V. Talanov
0f7e48aeef Split compiler and ide specific parts of script dependency caching
Move all caching logic to ide specific KotlinScriptConfigurationManager
Clean up apis
Remove logging when updating caches
2017-07-19 10:53:20 +03:00
Roman Elizarov
bab228a111 Support inline suspend functions built with compiler version less than 1.1.4/1.2-M1
The error message is removed and is replaced with a code that adapts
inline suspend functions produced by the old compiler with the
suspension markers that new compiler expects.
2017-07-19 08:54:27 +03:00
Roman Elizarov
e8ea1968ec Pull implementations up from AbstractCoroutineContextElemenet
Fixes KT-18671
2017-07-18 23:49:45 +03:00
Alexander Udalov
ecf69556d6 Reduce classpath for class loader in CodegenTestCase
There's no point in adding JDK (mock or full) roots to it, as well as
stdlib/reflect/test (they are loaded by the parent class loader, created
in ForTestCompileRuntime)
2017-07-18 20:10:51 +03:00
Alexander Udalov
5ac69ed138 Fix ReplInterpreter on Java 9 2017-07-18 20:10:50 +03:00
Alexander Udalov
8238785405 Fix execution of simple .kts scripts on Java 9 2017-07-18 20:10:50 +03:00
Alexander Udalov
2ec1e5aff9 Remove unused class GenericRepl 2017-07-18 20:10:50 +03:00
Alexander Udalov
9e27416df4 Do not allow to access compiler internals in .kts scripts
Set parent class loader to null explicitly instead of the system class
loader
2017-07-18 20:10:50 +03:00
Alexander Udalov
4c0f1e1dd8 Minor, move deserializeToDescriptor to package kotlin.reflect.jvm.internal
To prevent binary-compatibility-validator from reporting it as a public
API; that happens because the signature is different after the
gradle-shadow-plugin is applied
2017-07-18 20:10:50 +03:00
Toshiaki Kameyama
fa52e816e8 Wrong caption "Change to property access" for Quick Fix to convert class instantiation to object reference #KT-13870 Fixed (#1189)
(cherry picked from commit 865f9d4)
2017-07-18 15:49:22 +02:00
Dmitry Jemerov
110314c0c1 Merge remote-tracking branch 'origin/1.1.4' into 1.1.4 2017-07-18 15:48:35 +02:00
Mikhail Glukhikh
4b50020acc Add "unnecessary local variable" inspection #KT-15958 Fixed
(cherry picked from commit 987c7f5)
2017-07-18 16:39:54 +03:00
Dmitry Neverov
bc8fc980e1 Do not report "property can be private" on JvmField properties
So #KT-18970 Fixed

(cherry picked from commit 9d06a80)
2017-07-18 15:52:47 +03:00
Nikolay Krasko
5a0b269f91 Don't ignore filters in smart step over for inline calls
(cherry picked from commit 5281602)
2017-07-18 14:47:07 +03:00
Nikolay Krasko
3e875d017f Check correspondent call on end token for better step over (KT-18949)
#KT-18949 Fixed

(cherry picked from commit f664ffb)
2017-07-18 14:47:06 +03:00
Nikolay Krasko
b4683315f6 Don't add double linenumber when return expression is absent (KT-18949)
#KT-18949 Fixed

(cherry picked from commit d282f14)
2017-07-18 14:47:06 +03:00
Nikolay Krasko
c42299a37f Avoid state machine build for suspend function with single inline call
#KT-18949 Fixed

(cherry picked from commit a41c9d2)
2017-07-18 14:47:06 +03:00
Nikolay Krasko
432f0ba0f4 Replace return with nop to avoid merging line instructions (KT-18949)
Dex ignores subsequent line numbers for same instructions and interprets
instruction after inline as if they were inlined. This makes debugger
behaves as if there's nowhere to stop on line with breakpoint.

This also makes stepping through inline function consistent with
non-inline analog. In both context debugger now stops on '}'.

 #KT-18949 Fixed
 #KT-17120 Fixed

(cherry picked from commit ce4f923)
2017-07-18 14:47:06 +03:00
Nikolay Krasko
fbf9bc7a07 Refactoring: extract common part to function
(cherry picked from commit fc685aa)
2017-07-18 14:47:06 +03:00
Nikolay Krasko
8d9adfda7c Refactoring: mark getTopmostElementAtOffset() as not-null
(cherry picked from commit 179ec84)
2017-07-18 14:47:06 +03:00
Mikhail Glukhikh
b62cb188f7 CFG: fix label binding for last instruction of finally block
So #KT-18698 Fixed

(cherry picked from commit c0e1b3e)
2017-07-18 14:41:52 +03:00
Mikhail Glukhikh
51bac281f5 PseudocodeLabel: add slightly better exception diagnostics
(cherry picked from commit ab0e734)
2017-07-18 14:38:33 +03:00
Toshiaki Kameyama
9cb7cba8ed Correct "before" sample in description for intention Convert to enum class #KT-18722 Fixed (#1196)
(cherry picked from commit fda097f)
2017-07-18 13:53:46 +03:00
Toshiaki Kameyama
a3e439c51b Misleading quick fix message for an 'open' modifier on an interface member #KT-18738 Fixed
(cherry picked from commit f8cf0f2)
2017-07-18 13:53:25 +03:00
Toshiaki Kameyama
04984e5d1a Correct "after" sample for intention "Convert to apply" #KT-18723 Fixed
(cherry picked from commit 0af3c65)
2017-07-18 13:13:21 +03:00
Toshiaki Kameyama
af86bc314d Support generic type parameters in 'Specify return type explicitly'
So #KT-18074 Fixed

(cherry picked from commit 8f9b680)
2017-07-18 13:10:55 +03:00
Mikhail Glukhikh
c316a9922b Refactoring (clone remove) of LiftAssignmentOutOfTryFix
Related to KT-18830

(cherry picked from commit 0ca5c0f)
2017-07-18 13:08:49 +03:00
Toshiaki Kameyama
b785d38f06 Introduce "Lift return out of try" intention #KT-18830 Fixed
(cherry picked from commit 8cc9330)
2017-07-18 13:08:35 +03:00
Mikhail Glukhikh
f489311884 Add groupPath/Name, change displayName for null checks -> safe call
Related to KT-14799

(cherry picked from commit cc4e55b)
2017-07-18 13:08:02 +03:00
Dimach
522bd3abe8 Add inspection to simplify successive null checks #KT-14799 Fixed
(cherry picked from commit 7407083)
2017-07-18 13:07:40 +03:00
Kirill Rakhman
cc2a6fc683 Add "simplify if with constant" inspection #KT-17919 Fixed
(cherry picked from commit cb19a86)
2017-07-18 13:06:39 +03:00
Toshiaki Kameyama
dcc7e94493 Do not report "can be private" on properties of private class
So #KT-18822 Fixed

(cherry picked from commit 848f742)
2017-07-18 13:05:39 +03:00
Simon Ogorodnik
6a924c57cd KT-17074: Make completion respect DslMarker's
#KT-17074 fixed

(cherry picked from commit cc8933c)
2017-07-17 16:44:22 +03:00
Nikolay Krasko
e6403e8e97 Add reference equality shortcut for equals() in light members
(cherry picked from commit dfef1f4)
2017-07-17 14:53:13 +03:00
Nikolay Krasko
06887e4f90 Implement equivalence of light members by origin when possible
Previous implementation worked through equality that used equality
of method stubs (see LightMemberOriginForCompiledMethod). But method
stubs for compiled element can be recreated when caches are outdated,
including weak reference cleaning (see ClsJavaStubByVirtualFileCache).

This could cause misbehave of find usages when java reference has an
outdated version of light element in resolution cache.

(cherry picked from commit 44ed903)
2017-07-17 14:53:04 +03:00
Toshiaki Kameyama
dbf2a0cb88 Correct "before" sample in description for intention Convert to enum class #KT-18722 Fixed (#1196)
(cherry picked from commit fda097f)
2017-07-17 13:04:06 +02:00
Nikolay Krasko
ab7a945eee Minor: fix weak warnings and formatting in KotlinReferencesSearcher.kt
(cherry picked from commit b3e9dfc)
2017-07-17 13:48:33 +03:00
Nikolay Krasko
a06ae76487 Do not wrap to light elements if Kotlin search is requested (KT-19054)
#KT-19054 Fixed

(cherry picked from commit d93e0ad)
2017-07-17 13:48:19 +03:00
Dmitry Jemerov
702eb3d921 Fix JS tests in AbstractConfigureKotlinTest
(cherry picked from commit 6baa861)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
952c276c01 AbstractConfigureKotlinTest: J2K
(cherry picked from commit 2c2b64d)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
9f1bd71780 AbstractConfigureKotlinTest: rename to .kt
(cherry picked from commit 4198a5c)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
2dbb6f8f2a Specify library kind when configuring library in tests
(cherry picked from commit 0e6c9a9)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
9855b9a268 ConfigLibraryUtil: J2K
(cherry picked from commit 060b8e0)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
967d16547d ConfigLibraryUtil: rename to .kt
(cherry picked from commit 921db30)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
30a976f75a Provide library kind for common libraries; get rid of autodetection
(cherry picked from commit 0fa09ad)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
e356c460b0 Better encapsulate JS library detection
(cherry picked from commit c7e85ea)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
ec8295e674 Set library kind when importing projects from Maven
(cherry picked from commit b8d453e)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
83c8a92f6b Set library kind when importing projects from Gradle
(cherry picked from commit 608f589)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
42abb2ccf8 Implement explicit library kind for JS libraries, don't autodetect
(cherry picked from commit 902fe1f)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
67e4833b11 Get library versions directly, not through LibraryPresentationProvider
(cherry picked from commit 1367e6f)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
976afd2f77 JSLibraryStdDescription: J2K
(cherry picked from commit 2d1ac69)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
0cd618103f JSLibraryStdDescription: J2K
(cherry picked from commit 5f3366d)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
424fd67f9e KotlinJsModuleConfigurator: J2K
(cherry picked from commit c185730)
2017-07-17 12:20:28 +02:00
Dmitry Jemerov
021d7c17e4 KotlinJsModuleConfigurator: rename to .kt
(cherry picked from commit ffb3e2f)
2017-07-17 12:20:28 +02:00
Dmitry Petrov
119124a79c Generate constant "" for effectively empty string 2017-07-17 09:20:13 +03:00
Alexander Udalov
c2972a53e7 Restore anonymous classes for local delegate metadatas in inline functions
The problem is that now that the local delegated property metadata is in
the $$delegatedProperties array of the containing class, the access to
it from code calling an inline function with a local delegated property
is illegal.

Currently it seems to be a lot of work to support this rather rare case
properly (see the comment in ExpressionCodegen.getVariableMetadataValue)
so we postpone it and return the old behavior of using the anonymous
KProperty subclass for metadata
2017-07-14 15:19:54 +03:00
Alexander Udalov
60e34ca808 Support reflection for local delegated properties
#KT-15222 Fixed
2017-07-14 15:19:54 +03:00
Alexander Udalov
e5a5d72e00 Ignore $$delegatedProperties in light analysis mode tests
For tests with local delegated properties, this field is generated in
the full mode, but is not generated in the lite mode because local
variables are not analyzed properly in the lite mode
2017-07-14 15:19:53 +03:00
Alexander Udalov
d11ee91d03 Rework property metadata generation for local delegated properties
Instead of generating an anonymous class for each delegated local
variable, store metadatas in the $$delegatedProperties array of the
containing class, as is done for member properties
2017-07-14 15:19:53 +03:00
Alexander Udalov
48cf1f05a7 Remove unused and obsolete code in JVM backend 2017-07-14 15:19:53 +03:00
Alexander Udalov
26f3174d09 Refactor generation of metadata for delegated properties
In CodegenAnnotatingVisitor, store all delegated properties whose
metadata should be generated in each class (identified by ASM Type).
Use the stored information later, both in the $$delegatedProperties
array generation and in the access to it from property's accessor
methods, instead of an heuristical indexOfDelegatedProperty()
2017-07-14 15:19:53 +03:00
Alexander Udalov
06d60b53b2 Remove CodegenBinding.LOCAL_VARIABLE_DELEGATE
Calculate this value at call sites explicitly instead
2017-07-14 15:19:53 +03:00
Alexander Udalov
c3aeabed8c Minor, extract fakeDescriptorsForReferences.kt 2017-07-14 15:19:53 +03:00
Nikolay Krasko
18b374ccba Process UastContext service absence (EA-100670)
(cherry picked from commit 1dcdb72)
2017-07-14 13:47:25 +03:00
Dmitry Jemerov
668e882db2 Don't trigger update check when an in-memory file is modified
#KT-18954 Fixed

(cherry picked from commit 9b37e76)
2017-07-13 12:51:08 +02:00
Mikhael Bogdanov
7f135ce137 Update ChangeLog.md to 1.1.4-EAP-11 2017-07-12 16:40:59 +02:00
Yan Zhulanow
1605475cc4 NoArg: Do not invoke initializers by default. Require "invokeInitializers" option to be set explicitly (KT-18667, KT-18668)
(cherry picked from commit b990079)
2017-07-12 08:38:13 +02:00
Yan Zhulanow
0eb102f332 Kapt: Handle parameter with Java names clashing with Java keywords properly (KT-18377)
(cherry picked from commit a983137)
2017-07-12 08:38:07 +02:00
Alexey Tsvetkov
59b9d0a5ad Use ANSI escape codes only with CLI tools
Before this change jansi was used by the compiler,
unless "kotlin.colors.enabled" is not set to false.
This caused multiple issues in different build systems,
where newer or older version of jansi could crash the JVM
since it uses native code.

The following short term solutions were discussed:
* Set "kotlin.colors.enabled" to false where jansi is not needed
(basically in any build system).
* Set "kotlin.colors.enabled" to true where jansi is needed,
and use it only when the system property is set to true.

Escaped codes are only needed in CLI tools (kotlinc, REPL),
so the second solution is preferred (less places to set the property).

     #KT-17031 fixed
     #KT-18874 fixed
     #KT-18927 fixed
2017-07-11 21:04:07 +03:00
Alexey Andreev
f54dcb3b3f Fix module re-importing when inlining functions in JS BE
When inliner reads function's body from other module, it performs
substitution _ -> moduleAlias. However, local alias can't be used
for this purpose, since call site can be in public inline function
itself, so the correct substitution would be -> _.$$imports$$.alias
2017-07-11 19:28:37 +03:00
Ilya Chernikov
453cd2e615 Rolling back commits related to Unit -> Void? confersion in RMI interface
since it breaks the compatibility and doesn't actually help - the problem
with NoClassDef Unit is apparently elsewhere.
2017-07-11 09:00:38 +02:00
Ilya Chernikov
4e43cc6bb6 Switch to the newer gradle plugin, fix jansi problem, in-process compiling in gradle parts
Switching to in-process to avoid compilation warnings caused by introduced
daemon interface changes.
Switching to the gradle plugin 1.1.3 causes jansi incompatibility in
in-process compilation mode, so disabling jansi usage to avoid it.
2017-07-11 08:35:56 +02:00
Alexey Andreev
5cdb2d80bd Copy stdlib-js source map during JPS build
(cherry picked from commit 7edb352)
2017-07-10 13:38:16 +03:00
Alexander Udalov
4f618353ad JPS: use module path instead of classpath for modular projects
No test added because it would involve running javac 9 and because tests
run JavaBuilder in the same process, this would require either a new
module in our project with dependency on JDK 9 (which would require
everyone to install JDK 9), or complex code that runs javac in another
process

(cherry picked from commit 9269de721e)
2017-07-10 13:24:32 +03:00
Alexander Udalov
1dcb888d6d Use module path instead of class path for stdlib on Java 9
Also report the "named does not read unnamed" error, which was not
possible previously because we wouldn't be able to read anything from
kotlin-stdlib (because it was added to the unnamed module by default)

(cherry picked from commit 03a6488464)
2017-07-10 13:24:28 +03:00
Alexander Udalov
f28d21bc6d Remove obsolete code about runtime versions conflict
(cherry picked from commit c94b21edd5)
2017-07-10 13:24:25 +03:00
Alexander Udalov
91417cc4e5 Move JavaModuleGraph from 'frontend.java' to 'cli'
(cherry picked from commit 4128064f87)
2017-07-10 13:24:22 +03:00
Alexander Udalov
132b588af7 Implement module accessibility checks differently in compiler and IDE
Essentially, the logic that was previously in
JvmModuleAccessibilityChecker.diagnosticFor, is moved into a new
abstract method JavaModuleResolver.checkAccessibility, which is
implemented differently in the compiler and in the IDE. In the compiler,
we use our JavaModuleInfo and JavaModuleGraph, as previously. In the
IDE, we use intellij's PsiJavaModule and JavaModuleGraphUtil.

This fixes strange behavior in IDE where some modules could be observed
in an invalid state. The cause of that was the JavaModuleGraph instance
caching modules in IdeJavaModuleResolver, which is a project component.

Moreover, this will allow to report an error "named module does not read
unnamed module" in the compiler, and avoid reporting it in the IDE (see
the comment in IdeJavaModuleResolver about that)

(cherry picked from commit 5b8e58fe36)
2017-07-10 13:24:18 +03:00
61717 changed files with 699483 additions and 2584220 deletions

7
.bunch
View File

@@ -1,7 +0,0 @@
193
201
202_201
192
as36_192
as40
as41_201

6
.gitattributes vendored
View File

@@ -1,7 +1 @@
**/testData/** linguist-vendored
*Generated.java linguist-generated=true
* text=auto
* eol=lf
*.png binary
compiler/cli/bin/* eol=lf
compiler/cli/bin/*.bat eol=crlf

55
.gitignore vendored
View File

@@ -1,61 +1,24 @@
.DS_Store
.idea/shelf
/confluence/target
/dependencies/repo
/android.tests.dependencies
/dependencies/android.tests.dependencies
/confluence/target
/dependencies
/dist
/local
/gh-pages
/ideaSDK
/clionSDK
/android-studio/sdk
out/
/out
/tmp
workspace.xml
*.versionsBackup
/idea/testData/debugger/tinyApp/classes*
/jps-plugin/testData/kannotator
/js/js.translator/testData/out/
/js/js.translator/testData/out-min/
/js/js.translator/testData/out-pir/
/ultimate/dependencies
/ultimate/ideaSDK
/ultimate/out
/ultimate/tmp
/js/js.translator/testData/**/out/
.gradle/
build/
!**/src/**/build
!**/test/**/build
*.iml
!**/testData/**/*.iml
.idea/libraries/Gradle*.xml
.idea/libraries/Maven*.xml
.idea/artifacts/PILL_*.xml
.idea/artifacts/KotlinPlugin.xml
.idea/modules
.idea/runConfigurations/JPS_*.xml
.idea/runConfigurations/PILL_*.xml
.idea/libraries
.idea/modules.xml
.idea/gradle.xml
.idea/compiler.xml
.idea/inspectionProfiles/profiles_settings.xml
.idea/.name
.idea/artifacts/dist_auto_*
.idea/artifacts/dist.xml
.idea/artifacts/ideaPlugin.xml
.idea/artifacts/kotlinc.xml
.idea/artifacts/kotlin_compiler_jar.xml
.idea/artifacts/kotlin_plugin_jar.xml
.idea/artifacts/kotlin_jps_plugin_jar.xml
.idea/artifacts/kotlin_daemon_client_jar.xml
.idea/artifacts/kotlin_imports_dumper_compiler_plugin_jar.xml
.idea/artifacts/kotlin_main_kts_jar.xml
.idea/artifacts/kotlin_compiler_client_embeddable_jar.xml
.idea/artifacts/kotlin_reflect_jar.xml
.idea/artifacts/kotlin_stdlib_js_ir_*
.idea/artifacts/kotlin_test_js_ir_*
.idea/artifacts/kotlin_stdlib_wasm_*
.idea/jarRepositories.xml
kotlin-ultimate/
node_modules/
.rpt2_cache/
libraries/tools/kotlin-test-js-runner/lib/
local.properties

1
.idea/.name generated Normal file
View File

@@ -0,0 +1 @@
Kotlin

23
.idea/ant.xml generated Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AntConfiguration">
<buildFile url="file://$PROJECT_DIR$/compiler/frontend/buildLexer.xml" />
<buildFile url="file://$PROJECT_DIR$/build.xml">
<antCommandLine value="-J-ea" />
<maximumHeapSize value="1024" />
</buildFile>
<buildFile url="file://$PROJECT_DIR$/update_dependencies.xml" />
<buildFile url="file://$PROJECT_DIR$/TeamCityBuild.xml">
<maximumHeapSize value="512" />
</buildFile>
<buildFile url="file://$PROJECT_DIR$/idea-runner/runner.xml" />
<buildFile url="file://$PROJECT_DIR$/libraries/build-docs.xml">
<maximumHeapSize value="1024" />
<properties>
<property name="dokka.path" value="../../dokka" />
</properties>
</buildFile>
<buildFile url="file://$PROJECT_DIR$/TeamCityRelay.xml" />
<buildFile url="file://$PROJECT_DIR$/node_utils.xml" />
</component>
</project>

9
.idea/artifacts/IdeLazyResolver.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<component name="ArtifactManager">
<artifact type="jar" name="IdeLazyResolver">
<output-path>$PROJECT_DIR$/out/artifacts/internal/</output-path>
<root id="archive" name="kotlin-ide-common.jar">
<element id="module-output" name="ide-common" />
<element id="dir-copy" path="$PROJECT_DIR$/idea/ide-common" />
</root>
</artifact>
</component>

9
.idea/artifacts/Instrumentation.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<component name="ArtifactManager">
<artifact type="jar" name="Instrumentation">
<output-path>$PROJECT_DIR$/out/artifacts/Instrumentation</output-path>
<root id="archive" name="Instrumentation.jar">
<element id="module-output" name="instrumentation" />
<element id="extracted-dir" path="$PROJECT_DIR$/ideaSDK/lib/asm-all.jar" path-in-jar="/" />
</root>
</artifact>
</component>

9
.idea/artifacts/KotlinFormatter.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<component name="ArtifactManager">
<artifact type="jar" name="KotlinFormatter">
<output-path>$PROJECT_DIR$/out/artifacts/internal</output-path>
<root id="archive" name="kotlin-formatter.jar">
<element id="module-output" name="formatter" />
<element id="dir-copy" path="$PROJECT_DIR$/idea/formatter" />
</root>
</artifact>
</component>

112
.idea/artifacts/KotlinPlugin.xml generated Normal file
View File

@@ -0,0 +1,112 @@
<component name="ArtifactManager">
<artifact name="KotlinPlugin">
<output-path>$PROJECT_DIR$/out/artifacts/Kotlin</output-path>
<properties id="ant-postprocessing">
<options enabled="true">
<file>file://$PROJECT_DIR$/idea-runner/runner.xml</file>
<target>copy-runtime-for-idea-plugin</target>
</options>
</properties>
<root id="root">
<element id="directory" name="lib">
<element id="archive" name="kotlin-plugin.jar">
<element id="extracted-dir" path="$PROJECT_DIR$/dependencies/cli-parser-1.1.2.jar" path-in-jar="/" />
<element id="module-output" name="backend" />
<element id="module-output" name="frontend" />
<element id="module-output" name="descriptors" />
<element id="module-output" name="frontend.java" />
<element id="module-output" name="descriptor.loader.java" />
<element id="module-output" name="idea" />
<element id="module-output" name="light-classes" />
<element id="module-output" name="util" />
<element id="module-output" name="util.runtime" />
<element id="module-output" name="j2k" />
<element id="module-output" name="js.frontend" />
<element id="module-output" name="js.parser" />
<element id="module-output" name="cli-common" />
<element id="module-output" name="idea-jps-common" />
<element id="module-output" name="build-common" />
<element id="module-output" name="preloader" />
<element id="module-output" name="deserialization" />
<element id="module-output" name="backend-common" />
<element id="library" level="project" name="builtins" />
<element id="module-output" name="js.ast" />
<element id="directory" name="kotlin">
<element id="dir-copy" path="$PROJECT_DIR$/core/builtins/native/kotlin" />
<element id="dir-copy" path="$PROJECT_DIR$/core/builtins/src/kotlin" />
</element>
<element id="module-output" name="eval4j" />
<element id="module-output" name="idea-analysis" />
<element id="module-output" name="ide-common" />
<element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
<element id="module-output" name="idea-android" />
<element id="module-output" name="idea-android-output-parser" />
<element id="module-output" name="js.serializer" />
<element id="module-output" name="serialization" />
<element id="module-output" name="idea-completion" />
<element id="module-output" name="idea-core" />
<element id="module-output" name="container" />
<element id="module-output" name="daemon-common" />
<element id="module-output" name="idea-repl" />
<element id="module-output" name="idea-live-templates" />
<element id="module-output" name="resolution" />
<element id="module-output" name="plugin-api" />
<element id="module-output" name="formatter" />
<element id="extracted-dir" path="$PROJECT_DIR$/dependencies/protobuf-2.6.1.jar" path-in-jar="/" />
<element id="module-output" name="backend.common" />
<element id="module-output" name="ir.tree" />
<element id="module-output" name="backend.jvm" />
<element id="module-output" name="ir.psi2ir" />
<element id="module-output" name="annotation-based-compiler-plugins-ide-support" />
<element id="module-output" name="frontend.script" />
<element id="extracted-dir" path="$PROJECT_DIR$/dependencies/json-org.jar" path-in-jar="/" />
</element>
<element id="library" level="project" name="javax.inject" />
<element id="library" level="project" name="markdown" />
<element id="archive" name="android-extensions-ide.jar">
<element id="module-output" name="android-extensions-idea" />
</element>
<element id="archive" name="android-extensions-compiler.jar">
<element id="module-output" name="android-extensions-compiler" />
<element id="module-output" name="android-extensions-runtime" />
</element>
<element id="archive" name="android-lint.jar">
<element id="module-output" name="uast-kotlin" />
<element id="module-output" name="lint-idea" />
<element id="module-output" name="lint-checks" />
<element id="module-output" name="lint-api" />
<element id="module-output" name="uast-kotlin-idea" />
</element>
<element id="archive" name="allopen-ide-plugin.jar">
<element id="module-output" name="allopen-ide" />
</element>
<element id="archive" name="allopen-compiler-plugin.jar">
<element id="module-output" name="allopen-cli" />
</element>
<element id="archive" name="noarg-compiler-plugin.jar">
<element id="module-output" name="noarg-cli" />
</element>
<element id="archive" name="noarg-ide-plugin.jar">
<element id="module-output" name="noarg-ide" />
</element>
<element id="file-copy" path="$PROJECT_DIR$/dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-script-runtime.jar" />
<element id="archive" name="sam-with-receiver-compiler-plugin.jar">
<element id="module-output" name="sam-with-receiver-cli" />
</element>
<element id="archive" name="sam-with-receiver-ide-plugin.jar">
<element id="module-output" name="sam-with-receiver-ide" />
</element>
<element id="archive" name="kotlin-gradle-tooling.jar">
<element id="module-output" name="kotlin-gradle-tooling" />
</element>
<element id="library" level="project" name="uast-java" />
<element id="library" level="project" name="kotlinx-coroutines-core" />
<element id="library" level="project" name="javaslang" />
<element id="library" level="project" name="kotlinx-coroutines-jdk8" />
</element>
<element id="directory" name="kotlinc">
<element id="dir-copy" path="$PROJECT_DIR$/dist/kotlinc" />
</element>
</root>
</artifact>
</component>

View File

@@ -1,8 +0,0 @@
<component name="ArtifactManager">
<artifact build-on-make="true" name="dist_root">
<output-path>$PROJECT_DIR$/dist</output-path>
<root id="root">
<element id="artifact" artifact-name="dist" />
</root>
</artifact>
</component>

289
.idea/codeStyleSettings.xml generated Normal file
View File

@@ -0,0 +1,289 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectCodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS">
<value>
<option name="OTHER_INDENT_OPTIONS">
<value>
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="4" />
<option name="TAB_SIZE" value="8" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</value>
</option>
<option name="LINE_SEPARATOR" value="&#10;" />
<option name="PREFER_LONGER_NAMES" value="false" />
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
<value>
<package name="java.awt" withSubpackages="false" static="false" />
<package name="javax.tools" withSubpackages="true" static="false" />
<package name="javax.swing" withSubpackages="false" static="false" />
</value>
</option>
<option name="STATIC_METHODS_ORDER_WEIGHT" value="5" />
<option name="METHODS_ORDER_WEIGHT" value="4" />
<option name="RIGHT_MARGIN" value="140" />
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
<option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="WHILE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
<option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
<option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
<option name="SPACE_AFTER_TYPE_CAST" value="false" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="EXTENDS_LIST_WRAP" value="1" />
<option name="THROWS_LIST_WRAP" value="5" />
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
<option name="THROWS_KEYWORD_WRAP" value="1" />
<option name="METHOD_CALL_CHAIN_WRAP" value="1" />
<option name="BINARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="FOR_STATEMENT_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
<option name="ASSIGNMENT_WRAP" value="1" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="DOWHILE_BRACE_FORCE" value="1" />
<option name="WHILE_BRACE_FORCE" value="1" />
<option name="FOR_BRACE_FORCE" value="1" />
<option name="FIELD_ANNOTATION_WRAP" value="0" />
<MarkdownNavigatorCodeStyleSettings>
<option name="RIGHT_MARGIN" value="72" />
</MarkdownNavigatorCodeStyleSettings>
<XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
<codeStyleSettings language="CFML">
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="WHILE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="BINARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="FOR_STATEMENT_WRAP" value="5" />
<option name="ASSIGNMENT_WRAP" value="1" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
</codeStyleSettings>
<codeStyleSettings language="CoffeeScript">
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
</codeStyleSettings>
<codeStyleSettings language="ECMA Script Level 4">
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="WHILE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="EXTENDS_LIST_WRAP" value="1" />
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
<option name="BINARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="FOR_STATEMENT_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
<option name="ASSIGNMENT_WRAP" value="1" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="DOWHILE_BRACE_FORCE" value="1" />
<option name="WHILE_BRACE_FORCE" value="1" />
<option name="FOR_BRACE_FORCE" value="1" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
</codeStyleSettings>
<codeStyleSettings language="GSP">
<indentOptions>
<option name="INDENT_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="Groovy">
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
<option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
<option name="SPACE_AFTER_TYPE_CAST" value="false" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="EXTENDS_LIST_WRAP" value="1" />
<option name="THROWS_LIST_WRAP" value="5" />
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
<option name="THROWS_KEYWORD_WRAP" value="1" />
<option name="METHOD_CALL_CHAIN_WRAP" value="1" />
<option name="BINARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="FOR_STATEMENT_WRAP" value="5" />
<option name="ASSIGNMENT_WRAP" value="1" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="WHILE_BRACE_FORCE" value="1" />
<option name="FOR_BRACE_FORCE" value="1" />
<option name="FIELD_ANNOTATION_WRAP" value="0" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
</codeStyleSettings>
<codeStyleSettings language="HTML">
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="4" />
<option name="TAB_SIZE" value="8" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JAVA">
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
<option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="WHILE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
<option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
<option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
<option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
<option name="EXTENDS_LIST_WRAP" value="1" />
<option name="THROWS_LIST_WRAP" value="5" />
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
<option name="THROWS_KEYWORD_WRAP" value="1" />
<option name="METHOD_CALL_CHAIN_WRAP" value="1" />
<option name="BINARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="FOR_STATEMENT_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
<option name="ASSIGNMENT_WRAP" value="1" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="DOWHILE_BRACE_FORCE" value="1" />
<option name="WHILE_BRACE_FORCE" value="1" />
<option name="FOR_BRACE_FORCE" value="1" />
<option name="FIELD_ANNOTATION_WRAP" value="0" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
<indentOptions>
<option name="TAB_SIZE" value="8" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JavaScript">
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="WHILE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="BINARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="FOR_STATEMENT_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
<option name="ASSIGNMENT_WRAP" value="1" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="DOWHILE_BRACE_FORCE" value="1" />
<option name="WHILE_BRACE_FORCE" value="1" />
<option name="FOR_BRACE_FORCE" value="1" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
</codeStyleSettings>
<codeStyleSettings language="Scala">
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="WHILE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
<option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="EXTENDS_LIST_WRAP" value="1" />
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
<option name="METHOD_CALL_CHAIN_WRAP" value="1" />
<option name="BINARY_OPERATION_WRAP" value="5" />
<option name="FOR_STATEMENT_WRAP" value="5" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="DOWHILE_BRACE_FORCE" value="1" />
<option name="WHILE_BRACE_FORCE" value="1" />
<option name="FOR_BRACE_FORCE" value="1" />
<option name="FIELD_ANNOTATION_WRAP" value="0" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
</codeStyleSettings>
<codeStyleSettings language="TypeScript">
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="WHILE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="EXTENDS_LIST_WRAP" value="1" />
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
<option name="BINARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="FOR_STATEMENT_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
<option name="ASSIGNMENT_WRAP" value="1" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="DOWHILE_BRACE_FORCE" value="1" />
<option name="WHILE_BRACE_FORCE" value="1" />
<option name="FOR_BRACE_FORCE" value="1" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
</codeStyleSettings>
<codeStyleSettings language="XML">
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
<option name="TAB_SIZE" value="8" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="WHILE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
</codeStyleSettings>
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</component>
</project>

View File

@@ -1,119 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<option name="LINE_SEPARATOR" value="&#10;" />
<option name="RIGHT_MARGIN" value="140" />
<JavaCodeStyleSettings>
<option name="PREFER_LONGER_NAMES" value="false" />
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
<value>
<package name="java.awt" withSubpackages="false" static="false" />
<package name="javax.tools" withSubpackages="true" static="false" />
<package name="javax.swing" withSubpackages="false" static="false" />
</value>
</option>
</JavaCodeStyleSettings>
<JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value>
<package name="java.util" alias="false" withSubpackages="false" />
<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
</value>
</option>
<option name="PACKAGES_IMPORT_LAYOUT">
<value>
<package name="" alias="false" withSubpackages="true" />
<package name="java" alias="false" withSubpackages="true" />
<package name="javax" alias="false" withSubpackages="true" />
<package name="kotlin" alias="false" withSubpackages="true" />
<package name="" alias="true" withSubpackages="true" />
</value>
</option>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
<MarkdownNavigatorCodeStyleSettings>
<option name="RIGHT_MARGIN" value="72" />
</MarkdownNavigatorCodeStyleSettings>
<codeStyleSettings language="HTML">
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JAVA">
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
<option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="WHILE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
<option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
<option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
<option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
<option name="EXTENDS_LIST_WRAP" value="1" />
<option name="THROWS_LIST_WRAP" value="5" />
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
<option name="THROWS_KEYWORD_WRAP" value="1" />
<option name="METHOD_CALL_CHAIN_WRAP" value="1" />
<option name="BINARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="FOR_STATEMENT_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
<option name="ASSIGNMENT_WRAP" value="1" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="DOWHILE_BRACE_FORCE" value="1" />
<option name="WHILE_BRACE_FORCE" value="1" />
<option name="FOR_BRACE_FORCE" value="1" />
<option name="FIELD_ANNOTATION_WRAP" value="0" />
</codeStyleSettings>
<codeStyleSettings language="JavaScript">
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="WHILE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="BINARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="FOR_STATEMENT_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
<option name="ASSIGNMENT_WRAP" value="1" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="DOWHILE_BRACE_FORCE" value="1" />
<option name="WHILE_BRACE_FORCE" value="1" />
<option name="FOR_BRACE_FORCE" value="1" />
</codeStyleSettings>
<codeStyleSettings language="PROTO">
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="XML">
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
</codeStyleSettings>
</code_scheme>
</component>

View File

@@ -1,5 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

35
.idea/compiler.xml generated Normal file
View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="BUILD_PROCESS_HEAP_SIZE" value="2000" />
<excludeFromCompile>
<directory url="file://$PROJECT_DIR$/core/reflection.jvm" includeSubdirectories="true" />
<directory url="file://$PROJECT_DIR$/core/runtime.jvm" includeSubdirectories="true" />
<directory url="file://$PROJECT_DIR$/core/builtins" includeSubdirectories="true" />
<directory url="file://$PROJECT_DIR$/core/script.runtime" includeSubdirectories="true" />
</excludeFromCompile>
<wildcardResourcePatterns>
<entry name="!?*.java" />
<entry name="!?*.form" />
<entry name="!?*.class" />
<entry name="!?*.groovy" />
<entry name="!?*.scala" />
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
</wildcardResourcePatterns>
<bytecodeTargetLevel>
<module name="android-studio" target="1.8" />
<module name="idea" target="1.8" />
<module name="idea-analysis" target="1.8" />
<module name="idea-completion" target="1.8" />
<module name="idea-core" target="1.8" />
<module name="idea-live-templates" target="1.8" />
<module name="idea-repl" target="1.8" />
<module name="idea-runner" target="1.8" />
<module name="idea-test-framework" target="1.8" />
<module name="j2k" target="1.8" />
<module name="kannotator-jps-plugin-test" target="1.8" />
</bytecodeTargetLevel>
</component>
</project>

View File

@@ -1,7 +1,9 @@
<component name="CopyrightManager">
<copyright>
<option name="allowReplaceRegexp" value="JetBrains" />
<option name="notice" value="Copyright 2010-&amp;#36;today.year JetBrains s.r.o. and Kotlin Programming Language contributors.&#10;Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file." />
<option name="notice" value="Copyright 2010-&amp;#36;today.year JetBrains s.r.o.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
<option name="keyword" value="Copyright" />
<option name="allowReplaceKeyword" value="JetBrains" />
<option name="myName" value="apache" />
<option name="myLocal" value="true" />
</copyright>
</component>

View File

@@ -1,7 +1,7 @@
<component name="CopyrightManager">
<settings>
<settings default="">
<module2copyright>
<element module="Apply copyright" copyright="apache" />
<element module="all except testData" copyright="apache" />
</module2copyright>
<LanguageOptions name="Groovy">
<option name="fileTypeOverride" value="1" />

View File

@@ -1,18 +1,7 @@
<component name="ProjectDictionaryState">
<dictionary name="4u7">
<words>
<w>bintray</w>
<w>cacheability</w>
<w>cacheable</w>
<w>cidr</w>
<w>foldable</w>
<w>instrumentator</w>
<w>jdks</w>
<w>protobuf</w>
<w>redirector</w>
<w>remapper</w>
<w>sonatype</w>
<w>unpresent</w>
</words>
</dictionary>
</component>

View File

@@ -2,32 +2,25 @@
<dictionary name="Nikolay.Krasko">
<words>
<w>accessors</w>
<w>coroutines</w>
<w>crossinline</w>
<w>fqname</w>
<w>goto</w>
<w>gradle</w>
<w>infos</w>
<w>intrinsics</w>
<w>kdoc</w>
<w>lateinit</w>
<w>kompiler</w>
<w>memoize</w>
<w>memoized</w>
<w>multiline</w>
<w>navigatable</w>
<w>preload</w>
<w>preloader</w>
<w>preloading</w>
<w>preprocess</w>
<w>proximities</w>
<w>redeclarations</w>
<w>reparsed</w>
<w>smap</w>
<w>subclassed</w>
<w>subgraph</w>
<w>substep</w>
<w>tailrec</w>
<w>typealias</w>
</words>
</dictionary>
</component>

View File

@@ -2,14 +2,9 @@
<dictionary name="bashor">
<words>
<w>ctor</w>
<w>inlining</w>
<w>interner</w>
<w>intrinsicify</w>
<w>kclass</w>
<w>lookups</w>
<w>minification</w>
<w>minifier</w>
<w>minify</w>
<w>unescape</w>
</words>
</dictionary>

View File

@@ -1,19 +0,0 @@
<component name="ProjectDictionaryState">
<dictionary name="dmitriy.dolovov">
<words>
<w>cinterop</w>
<w>commonizable</w>
<w>commonization</w>
<w>commonize</w>
<w>commonized</w>
<w>commonizer</w>
<w>commonizers</w>
<w>commonizes</w>
<w>commonizing</w>
<w>jetbrains</w>
<w>konan</w>
<w>kotlinx</w>
<w>macos</w>
</words>
</dictionary>
</component>

View File

@@ -3,11 +3,8 @@
<words>
<w>checkcast</w>
<w>coroutine</w>
<w>experimentalities</w>
<w>experimentality</w>
<w>insn</w>
<w>liveness</w>
<w>parameterless</w>
</words>
</dictionary>
</component>
</component>

View File

@@ -1,7 +0,0 @@
<component name="ProjectDictionaryState">
<dictionary name="sergey.igushkin">
<words>
<w>klib</w>
</words>
</dictionary>
</component>

View File

@@ -1,9 +0,0 @@
<component name="ProjectDictionaryState">
<dictionary name="skuzmich">
<words>
<w>anyref</w>
<w>ushr</w>
<w>wasm</w>
</words>
</dictionary>
</component>

View File

@@ -1,22 +1,11 @@
<component name="ProjectDictionaryState">
<dictionary name="yan">
<words>
<w>debuggee</w>
<w>deserializes</w>
<w>destructured</w>
<w>hacky</w>
<w>impls</w>
<w>inlined</w>
<w>kapt</w>
<w>kotlinc</w>
<w>mutators</w>
<w>parceler</w>
<w>repl</w>
<w>testdata</w>
<w>uast</w>
<w>unbox</w>
<w>unboxed</w>
<w>unmute</w>
</words>
</dictionary>
</component>

View File

@@ -1,7 +0,0 @@
<component name="ProjectDictionaryState">
<dictionary name="yole">
<words>
<w>multiplatform</w>
</words>
</dictionary>
</component>

20
.idea/encodings.xml generated
View File

@@ -1,24 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/libraries" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/examples/browser-example" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/examples/browser-example-with-library" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/examples/js-example" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/examples/kotlin-java-example" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/examples/kotlin-js-library-example" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/tools/idl2k" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/tools/kotlin-annotation-processing-maven" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/tools/kotlin-maven-allopen" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/tools/kotlin-maven-noarg" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/tools/kotlin-maven-plugin" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/tools/kotlin-maven-plugin-test" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/tools/kotlin-maven-sam-with-receiver" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/tools/kotlin-maven-serialization" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/tools/kotlin-osgi-bundle" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/tools/maven-archetypes" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/tools/maven-archetypes/kotlin-archetype-js" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/libraries/tools/maven-archetypes/kotlin-archetype-jvm" charset="UTF-8" />
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
<file url="PROJECT" charset="UTF-8" />
</component>
</project>

BIN
.idea/icon.png generated

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -21,6 +21,7 @@
</inspection_tool>
<inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="BusyWait" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="CStyleArrayDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="CastConflictsWithInstanceof" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="CastToIncompatibleInterface" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="ChainedEquality" enabled="false" level="WARNING" enabled_by_default="true" />
@@ -54,6 +55,9 @@
<inspection_tool class="DoubleCheckedLocking" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoreOnVolatileVariables" value="true" />
</inspection_tool>
<inspection_tool class="DuplicateCondition" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoreMethodCalls" value="false" />
</inspection_tool>
<inspection_tool class="EmptyStatementBody" enabled="true" level="WARNING" enabled_by_default="true">
<option name="m_reportEmptyBlocks" value="false" />
</inspection_tool>
@@ -75,7 +79,6 @@
<option name="m_ignoreLoopsWithoutConditions" value="false" />
</inspection_tool>
<inspection_tool class="ForLoopThatDoesntUseLoopVariable" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="GrPackage" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
<option name="myValues">
<value>
@@ -95,15 +98,6 @@
<option name="insideTryAllowed" value="false" />
</inspection_tool>
<inspection_tool class="IfStatementWithIdenticalBranches" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="IncompatibleAPI" enabled="true" level="ERROR" enabled_by_default="true">
<option name="problems">
<list>
<Problem reference="com.intellij.util.JdomKt#element" reason="Removed in 191" />
<Problem reference="org.jetbrains.kotlin.idea.reporter.ITNReporterCompat#submit" reason="parentComponent is nullable in AS" />
<Problem reference="com.intellij.diagnostic.ITNReporter#submit" reason="parentComponent is nullable in AS" />
</list>
</option>
</inspection_tool>
<inspection_tool class="InnerClassMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="InstanceofCatchParameter" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="InstanceofIncompatibleInterface" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -241,6 +235,7 @@
<scope name="idea openapi" level="WARNING" enabled="true" />
<scope name="runtime.classes" level="ERROR" enabled="true" />
</inspection_tool>
<inspection_tool class="LoopToCallChain" enabled="false" level="INFO" enabled_by_default="false" />
<inspection_tool class="MethodMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true">
<option name="m_onlyPrivateOrFinal" value="false" />
<option name="m_ignoreEmptyMethods" value="true" />
@@ -253,10 +248,6 @@
<option name="ignoreObjectMethods" value="true" />
<option name="ignoreAnonymousClassMethods" value="false" />
</inspection_tool>
<inspection_tool class="MissingRecentApi" enabled="true" level="ERROR" enabled_by_default="true">
<option name="sinceBuildString" value="183.3284" />
<option name="untilBuildString" value="192.SNAPSHOT" />
</inspection_tool>
<inspection_tool class="MisspelledCompareTo" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MisspelledEquals" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MisspelledHashcode" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -285,29 +276,28 @@
<inspection_tool class="PackageDirectoryMismatch" enabled="true" level="WARNING" enabled_by_default="false">
<scope name="all except testData" level="WARNING" enabled="true" />
</inspection_tool>
<inspection_tool class="PackageName" enabled="true" level="WEAK WARNING" enabled_by_default="true">
<option name="namePattern" value="[a-z_][a-z\d_]*(\.[a-z_][a-zA-Z\d_]*)*" />
</inspection_tool>
<inspection_tool class="ProtectedMemberInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="PublicFieldAccessedInSynchronizedContext" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="PyCompatibilityInspection" enabled="true" level="ERROR" enabled_by_default="true">
<option name="fromVersion" value="2.4" />
<option name="toVersion" value="3.1" />
</inspection_tool>
<inspection_tool class="Reformat" enabled="true" level="WEAK WARNING" enabled_by_default="true">
<option name="processChangedFilesOnly" value="true" />
</inspection_tool>
<inspection_tool class="ReplaceAssignmentWithOperatorAssignment" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoreLazyOperators" value="true" />
<option name="ignoreObscureOperators" value="true" />
</inspection_tool>
<inspection_tool class="SSBasedInspection" enabled="true" level="WARNING" enabled_by_default="true">
<searchConfiguration name="SwingUtilities.invokeLater" text="SwingUtilities.invokeLater($runnable$)" recursive="false" caseInsensitive="false" type="JAVA">
<constraint name="Instance" regexp="SwingUtilities" minCount="0" target="true" within="" contains="" />
<constraint name="MethodCall" within="" contains="" />
<constraint name="Parameter" minCount="0" maxCount="2147483647" within="" contains="" />
<constraint name="__context__" within="" contains="" />
<constraint name="runnable" within="" contains="" />
</searchConfiguration>
<replaceConfiguration name="DirectCallOfDispose" text="$Instance$.dispose()" recursive="false" caseInsensitive="false" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="Disposer.dispose($Instance$)">
<constraint name="Instance" regexp="super" nameOfExprType="Disposable" withinHierarchy="true" exprTypeWithinHierarchy="true" minCount="0" negateName="true" within="" contains="" />
<constraint name="MethodCall" target="true" within="" contains="" />
<constraint name="Parameter" minCount="0" maxCount="2147483647" within="" contains="" />
<constraint name="__context__" within="" contains="" />
</replaceConfiguration>
<replaceConfiguration name="new Object[0]" text="new Object[0]" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.util.ArrayUtil.EMPTY_OBJECT_ARRAY" />
@@ -371,7 +361,6 @@
</inspection_tool>
<inspection_tool class="StringEquality" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="StringEqualsEmptyString" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="StringOperationCanBeSimplifiedMerged" />
<inspection_tool class="SwitchStatementWithConfusingDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="SynchronizeOnThis" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="SystemOutErr" enabled="true" level="WARNING" enabled_by_default="true">
@@ -414,30 +403,13 @@
<inspection_tool class="UnnecessaryFullyQualifiedName" enabled="true" level="WARNING" enabled_by_default="true">
<scope name="IDEA Test Sources" level="WARNING" enabled="false">
<option name="m_ignoreJavadoc" value="true" />
<option name="ignoreInModuleStatements" value="true" />
</scope>
<option name="m_ignoreJavadoc" value="true" />
<option name="ignoreInModuleStatements" value="true" />
</inspection_tool>
<inspection_tool class="UnnecessaryLabelOnBreakStatement" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="UnnecessaryLabelOnContinueStatement" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="UnnecessaryQualifierForThis" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="UnnecessaryUnboxing" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="UnstableApiUsage" enabled="true" level="WARNING" enabled_by_default="true">
<option name="unstableApiAnnotations">
<set>
<option value="com.google.common.annotations.Beta" />
<option value="io.reactivex.annotations.Beta" />
<option value="io.reactivex.annotations.Experimental" />
<option value="org.apache.http.annotation.Beta" />
<option value="org.jetbrains.annotations.ApiStatus.Experimental" />
<option value="org.jetbrains.annotations.ApiStatus.Internal" />
<option value="org.jetbrains.annotations.ApiStatus.ScheduledForRemoval" />
<option value="rx.annotations.Beta" />
<option value="rx.annotations.Experimental" />
</set>
</option>
</inspection_tool>
<inspection_tool class="UseOfPropertiesAsHashtable" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="UtilityClassWithPublicConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="VolatileLongOrDoubleField" enabled="true" level="WARNING" enabled_by_default="true" />

View File

@@ -1,6 +1,7 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="PROJECT_PROFILE" value="idea.default" />
<option name="USE_PROJECT_PROFILE" value="true" />
<version value="1.0" />
</settings>
</component>

14
.idea/kotlinc.xml generated
View File

@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Kotlin2JsCompilerArguments">
<option name="sourceMapEmbedSources" />
<option name="sourceMapPrefix" />
</component>
<component name="Kotlin2JvmCompilerArguments">
<option name="jvmTarget" value="1.8" />
</component>
<component name="KotlinCommonCompilerArguments">
<option name="errors">
<ArgumentParseErrors />
</option>
<option name="languageVersion" value="1.1" />
<option name="apiVersion" value="1.1" />
</component>
<component name="KotlinCompilerSettings">
<option name="additionalArguments" value="-version -Xallow-kotlin-package -Xskip-metadata-version-check -Xread-deserialized-contracts" />
<option name="additionalArguments" value="-version -Xallow-kotlin-package -Xskip-metadata-version-check" />
</component>
</project>

9
.idea/libraries/android_layoutlib.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="android-layoutlib">
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/plugins/android/lib/layoutlib.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

18
.idea/libraries/android_plugin.xml generated Normal file
View File

@@ -0,0 +1,18 @@
<component name="libraryTable">
<library name="android-plugin">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$PROJECT_DIR$/ideaSDK/plugins/android/lib" />
<root url="file://$PROJECT_DIR$/ideaSDK/plugins/android/lib/jps" />
<root url="jar://$PROJECT_DIR$/ideaSDK/lib/android-base-common.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/android/lib" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/android/lib/jps" recursive="false" />
</library>
</component>

10
.idea/libraries/android_studio.xml generated Normal file
View File

@@ -0,0 +1,10 @@
<component name="libraryTable">
<library name="android-studio">
<CLASSES>
<root url="file://$PROJECT_DIR$/android-studio/sdk/lib" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$PROJECT_DIR$/android-studio/sdk/lib" recursive="false" />
</library>
</component>

14
.idea/libraries/ant.xml generated Normal file
View File

@@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="ant">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/ant-1.8/lib/ant.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.8.2-src.zip!/apache-ant-1.8.2/src/main" />
</SOURCES>
</library>
</component>

14
.idea/libraries/asm.xml generated Normal file
View File

@@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="asm">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/lib/asm-all.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
</SOURCES>
</library>
</component>

9
.idea/libraries/builtins.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="builtins">
<CLASSES>
<root url="file://$PROJECT_DIR$/dist/builtins" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

14
.idea/libraries/copyright_plugin.xml generated Normal file
View File

@@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="copyright-plugin">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/plugins/copyright/lib/copyright.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
</library>
</component>

12
.idea/libraries/coverage_plugin.xml generated Normal file
View File

@@ -0,0 +1,12 @@
<component name="libraryTable">
<library name="coverage-plugin">
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/plugins/coverage/lib/coverage.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/plugins/coverage/lib/jacocoant.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
</library>
</component>

14
.idea/libraries/dx_android.xml generated Normal file
View File

@@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="dx-android">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/android-5.0/lib/dx.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/dependencies/dx-src/src" />
</SOURCES>
</library>
</component>

View File

@@ -0,0 +1,19 @@
<component name="libraryTable">
<library name="gradle-and-groovy-plugin">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$PROJECT_DIR$/ideaSDK/plugins/gradle/lib" />
<root url="file://$PROJECT_DIR$/ideaSDK/plugins/Groovy/lib" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/ideaSDK/plugins/gradle/lib" />
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/gradle/lib" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/Groovy/lib" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/gradle/lib" recursive="false" type="SOURCES" />
</library>
</component>

14
.idea/libraries/guava.xml generated Normal file
View File

@@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="guava">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/lib/guava-17.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
</SOURCES>
</library>
</component>

18
.idea/libraries/idea_full.xml generated Normal file
View File

@@ -0,0 +1,18 @@
<component name="libraryTable">
<library name="idea-full">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$PROJECT_DIR$/ideaSDK/lib" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/lib" recursive="false" />
</library>
</component>

29
.idea/libraries/intellij_core.xml generated Normal file
View File

@@ -0,0 +1,29 @@
<component name="libraryTable">
<library name="intellij-core">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/core/annotations.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/core/asm-all.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/core/intellij-core.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/core/jdom.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/core/jna.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/core/log4j.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/core/picocontainer.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/core/snappy-in-java-0.5.1.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/core/trove4j.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/core/util.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/core/xpp3-1.1.4-min.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/core/xstream-1.4.8.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/core/guava-17.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
</library>
</component>

11
.idea/libraries/intellilang_plugin.xml generated Normal file
View File

@@ -0,0 +1,11 @@
<component name="libraryTable">
<library name="intellilang-plugin">
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/plugins/IntelliLang/lib/IntelliLang.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
</library>
</component>

11
.idea/libraries/jansi.xml generated Normal file
View File

@@ -0,0 +1,11 @@
<component name="libraryTable">
<library name="jansi">
<CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/jansi.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/jansi-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -0,0 +1,11 @@
<component name="libraryTable">
<library name="java-decompiler-plugin">
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/plugins/java-decompiler/lib/java-decompiler.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
</library>
</component>

14
.idea/libraries/java_i18n.xml generated Normal file
View File

@@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="java-i18n">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/plugins/java-i18n/lib/java-i18n.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
</library>
</component>

11
.idea/libraries/javaslang.xml generated Normal file
View File

@@ -0,0 +1,11 @@
<component name="libraryTable">
<library name="javaslang">
<CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/javaslang-2.0.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/javaslang-2.0.6-sources.jar!/" />
</SOURCES>
</library>
</component>

11
.idea/libraries/javax_inject.xml generated Normal file
View File

@@ -0,0 +1,11 @@
<component name="libraryTable">
<library name="javax.inject">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/javax.inject.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/javax.inject-src.zip!/" />
</SOURCES>
</library>
</component>

14
.idea/libraries/jline.xml generated Normal file
View File

@@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="jline">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/jline.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/jline-sources.jar!/" />
</SOURCES>
</library>
</component>

15
.idea/libraries/jps.xml generated Normal file
View File

@@ -0,0 +1,15 @@
<component name="libraryTable">
<library name="jps">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$PROJECT_DIR$/ideaSDK/jps" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/jps" recursive="false" />
</library>
</component>

14
.idea/libraries/jps_model.xml generated Normal file
View File

@@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="jps-model">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/jps/jps-model.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
</library>
</component>

15
.idea/libraries/jps_test.xml generated Normal file
View File

@@ -0,0 +1,15 @@
<component name="libraryTable">
<library name="jps-test">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$PROJECT_DIR$/ideaSDK/jps/test" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/jps/test" recursive="false" />
</library>
</component>

9
.idea/libraries/json_org.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="json-org">
<CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/json-org.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

16
.idea/libraries/junit_4_12.xml generated Normal file
View File

@@ -0,0 +1,16 @@
<component name="libraryTable">
<library name="junit-4.12">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/lib/hamcrest-core-1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/lib/junit-4.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/hamcrest-core-1.3-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/junit-4.12-sources.jar!/" />
</SOURCES>
</library>
</component>

15
.idea/libraries/junit_plugin.xml generated Normal file
View File

@@ -0,0 +1,15 @@
<component name="libraryTable">
<library name="junit-plugin">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/plugins/junit/lib/idea-junit.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/plugins/junit/lib/resources_en.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
</library>
</component>

12
.idea/libraries/kotlin_reflect.xml generated Normal file
View File

@@ -0,0 +1,12 @@
<component name="libraryTable">
<library name="kotlin-reflect">
<CLASSES>
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/core/reflection.jvm/src" />
<root url="file://$PROJECT_DIR$/core/descriptors.runtime/src" />
</SOURCES>
</library>
</component>

13
.idea/libraries/kotlin_runtime.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="kotlin-runtime">
<CLASSES>
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/libraries/stdlib/src" />
<root url="file://$PROJECT_DIR$/core/builtins/native" />
<root url="file://$PROJECT_DIR$/core/builtins/src" />
</SOURCES>
</library>
</component>

View File

@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="kotlin-script-runtime">
<CLASSES>
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-script-runtime.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

13
.idea/libraries/kotlin_test.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="kotlin-test">
<CLASSES>
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/libraries/kotlin.test/junit/src/main/kotlin" />
<root url="file://$PROJECT_DIR$/libraries/kotlin.test/common/src/main/kotlin" />
<root url="file://$PROJECT_DIR$/libraries/kotlin.test/jvm/src/main/kotlin" />
</SOURCES>
</library>
</component>

View File

@@ -0,0 +1,11 @@
<component name="libraryTable">
<library name="kotlinx-coroutines-core">
<CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/kotlinx-coroutines-core.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/kotlinx-coroutines-core-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -0,0 +1,11 @@
<component name="libraryTable">
<library name="kotlinx-coroutines-jdk8">
<CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/kotlinx-coroutines-jdk8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/kotlinx-coroutines-jdk8-sources.jar!/" />
</SOURCES>
</library>
</component>

9
.idea/libraries/markdown.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="markdown">
<CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/markdown.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

15
.idea/libraries/maven.xml generated Normal file
View File

@@ -0,0 +1,15 @@
<component name="libraryTable">
<library name="maven">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$PROJECT_DIR$/ideaSDK/plugins/maven/lib" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/maven/lib" recursive="false" />
</library>
</component>

View File

@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="native-platform-uberjar">
<CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/native-platform-uberjar.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

14
.idea/libraries/properties.xml generated Normal file
View File

@@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="properties">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/plugins/properties/lib/properties.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
</library>
</component>

14
.idea/libraries/protobuf_java.xml generated Normal file
View File

@@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="protobuf-java">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/protobuf-2.6.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/protobuf-2.6.1-sources.jar!/" />
</SOURCES>
</library>
</component>

59
.idea/libraries/robolectric.xml generated Normal file
View File

@@ -0,0 +1,59 @@
<component name="libraryTable">
<library name="robolectric">
<CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/accessibility-test-framework-2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/ant-1.8.0.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/ant-launcher-1.8.0.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/asm-5.0.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/asm-commons-5.0.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/asm-tree-5.0.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/assertj-core-2.6.0.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/backport-util-concurrent-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/bcprov-jdk16-1.46.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/classworlds-1.1-alpha-2.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/guava-20.0.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/hamcrest-core-1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/hamcrest-library-1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/icu4j-53.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/maven-ant-tasks-2.1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/maven-artifact-2.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/maven-artifact-manager-2.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/maven-error-diagnostics-2.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/maven-model-2.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/maven-plugin-registry-2.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/maven-profile-2.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/maven-project-2.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/maven-repository-metadata-2.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/maven-settings-2.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/nekohtml-1.9.6.2.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/plexus-container-default-1.0-alpha-9-stable-1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/plexus-interpolation-1.11.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/plexus-utils-1.5.15.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/protobuf-java-2.6.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/robolectric-3.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/robolectric-annotations-3.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/robolectric-junit-3.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/robolectric-resources-3.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/robolectric-sandbox-3.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/robolectric-utils-3.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/shadow-api-3.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/shadows-core-3.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/sqlite4java-0.282.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/wagon-file-1.0-beta-6.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/wagon-http-lightweight-1.0-beta-6.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/wagon-http-shared-1.0-beta-6.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/wagon-provider-api-1.0-beta-6.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/xercesMinimal-1.9.6.2.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/xmlpull-1.1.3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/xpp3_min-1.1.4c.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/xstream-1.4.8.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/robolectric-3.3.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/robolectric-3.3.2-sources-source.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/robolectric/robolectric-3.3.2-sources.jar!/" />
</SOURCES>
</library>
</component>

17
.idea/libraries/testng_plugin.xml generated Normal file
View File

@@ -0,0 +1,17 @@
<component name="libraryTable">
<library name="testng-plugin">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/plugins/testng/lib/testng-plugin.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/plugins/testng/lib/testng.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/plugins/testng/lib/jcommander.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/plugins/testng/lib/resources_en.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES>
</library>
</component>

12
.idea/libraries/trove4j.xml generated Normal file
View File

@@ -0,0 +1,12 @@
<component name="libraryTable">
<library name="trove4j">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/lib/trove4j.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

15
.idea/libraries/uast_java.xml generated Normal file
View File

@@ -0,0 +1,15 @@
<component name="libraryTable">
<library name="uast-java">
<CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/uast-common.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/uast-java.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/uast-tests.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/uast-common-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/uast-java-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/uast-tests-sources.jar!/" />
</SOURCES>
</library>
</component>

94
.idea/misc.xml generated
View File

@@ -6,81 +6,54 @@
</properties>
</component>
<component name="EntryPointsManager">
<list size="3">
<entry_points version="2.0" />
<list size="1">
<item index="0" class="java.lang.String" itemvalue="javax.inject.Inject" />
<item index="1" class="java.lang.String" itemvalue="org.gradle.api.tasks.TaskAction" />
<item index="2" class="java.lang.String" itemvalue="org.gradle.api.tasks.options.Option" />
</list>
</component>
<component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$" />
<component name="FacetAutodetectingManager">
<autodetection-disabled>
<facet-type id="Python">
<modules>
<module name="Jet" />
</modules>
</facet-type>
</autodetection-disabled>
</component>
<component name="IdProvider" IDEtalkID="71A301FF1940049D6D82F12C40F1E1D5" />
<component name="JavadocGenerationManager">
<option name="OUTPUT_DIRECTORY" />
<option name="OPTION_SCOPE" value="protected" />
<option name="OPTION_HIERARCHY" value="true" />
<option name="OPTION_NAVIGATOR" value="true" />
<option name="OPTION_INDEX" value="true" />
<option name="OPTION_SEPARATE_INDEX" value="true" />
<option name="OPTION_DOCUMENT_TAG_USE" value="false" />
<option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
<option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
<option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
<option name="OPTION_DEPRECATED_LIST" value="true" />
<option name="OTHER_OPTIONS" value="" />
<option name="HEAP_SIZE" />
<option name="LOCALE" />
<option name="OPEN_IN_BROWSER" value="true" />
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
<option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
<option name="myNullables">
<value>
<list size="14">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
<item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
<item index="9" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
<item index="10" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
<item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
<item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
<item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="14">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="javax.validation.constraints.NotNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
<item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
<item index="9" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
<item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
<item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
<item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
<item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
</list>
</value>
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/confluence-highlighting/pom.xml" />
<option value="$PROJECT_DIR$/confluence/pom.xml" />
</list>
</option>
</component>
<component name="ProjectResources">
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="PsiViewerSettings">
<option name="splitDividerLocation" value="35" />
</component>
<component name="SuppressABINotification">
<option name="modulesWithSuppressedNotConfigured">
<set>
<option value="backend.src" />
<option value="kotlin-stdlib-common" />
<option value="kotlin-stdlib-js" />
<option value="kotlin-test-common" />
</set>
</option>
<option name="isSuppressed" value="true" />
</component>
<component name="WebServicesPlugin" addRequiredLibraries="true" />
<component name="com.sixrr.metrics.MetricsReloaded">
@@ -88,7 +61,4 @@
<option name="autoscroll" value="false" />
<option name="showOnlyWarnings" value="false" />
</component>
<component name="intellij-api-watcher-check-current-project">
<option name="shouldCheckCurrentProject" value="true" />
</component>
</project>

101
.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/Kotlin.iml" filepath="$PROJECT_DIR$/Kotlin.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/allopen/allopen-cli/allopen-cli.iml" filepath="$PROJECT_DIR$/plugins/allopen/allopen-cli/allopen-cli.iml" group="plugins/allopen" />
<module fileurl="file://$PROJECT_DIR$/plugins/allopen/allopen-ide/allopen-ide.iml" filepath="$PROJECT_DIR$/plugins/allopen/allopen-ide/allopen-ide.iml" group="plugins/allopen" />
<module fileurl="file://$PROJECT_DIR$/plugins/lint/android-annotations/android-annotations.iml" filepath="$PROJECT_DIR$/plugins/lint/android-annotations/android-annotations.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml" filepath="$PROJECT_DIR$/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml" group="plugins/android-extensions" />
<module fileurl="file://$PROJECT_DIR$/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml" filepath="$PROJECT_DIR$/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml" group="plugins/android-extensions" />
<module fileurl="file://$PROJECT_DIR$/plugins/android-extensions/android-extensions-runtime/android-extensions-runtime.iml" filepath="$PROJECT_DIR$/plugins/android-extensions/android-extensions-runtime/android-extensions-runtime.iml" group="plugins/android-extensions" />
<module fileurl="file://$PROJECT_DIR$/android-studio/android-studio.iml" filepath="$PROJECT_DIR$/android-studio/android-studio.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/compiler/android-tests/android-tests.iml" filepath="$PROJECT_DIR$/compiler/android-tests/android-tests.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/plugins/annotation-based-compiler-plugins-ide-support/annotation-based-compiler-plugins-ide-support.iml" filepath="$PROJECT_DIR$/plugins/annotation-based-compiler-plugins-ide-support/annotation-based-compiler-plugins-ide-support.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/plugins/annotation-collector/annotation-collector.iml" filepath="$PROJECT_DIR$/plugins/annotation-collector/annotation-collector.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/ant/ant.iml" filepath="$PROJECT_DIR$/ant/ant.iml" />
<module fileurl="file://$PROJECT_DIR$/compiler/backend/backend.iml" filepath="$PROJECT_DIR$/compiler/backend/backend.iml" group="compiler/java" />
<module fileurl="file://$PROJECT_DIR$/compiler/backend-common/backend-common.iml" filepath="$PROJECT_DIR$/compiler/backend-common/backend-common.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/compiler/ir/backend.common/backend.common.iml" filepath="$PROJECT_DIR$/compiler/ir/backend.common/backend.common.iml" group="compiler/ir" />
<module fileurl="file://$PROJECT_DIR$/compiler/ir/backend.jvm/backend.jvm.iml" filepath="$PROJECT_DIR$/compiler/ir/backend.jvm/backend.jvm.iml" group="compiler/ir" />
<module fileurl="file://$PROJECT_DIR$/build-common/build-common.iml" filepath="$PROJECT_DIR$/build-common/build-common.iml" />
<module fileurl="file://$PROJECT_DIR$/core/builtins/builtins.iml" filepath="$PROJECT_DIR$/core/builtins/builtins.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" filepath="$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" group="compiler/cli" />
<module fileurl="file://$PROJECT_DIR$/compiler/cli/cli.iml" filepath="$PROJECT_DIR$/compiler/cli/cli.iml" group="compiler/cli" />
<module fileurl="file://$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" filepath="$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" group="compiler/cli" />
<module fileurl="file://$PROJECT_DIR$/compiler/cli/cli-runner/cli-runner.iml" filepath="$PROJECT_DIR$/compiler/cli/cli-runner/cli-runner.iml" group="compiler/cli" />
<module fileurl="file://$PROJECT_DIR$/compiler/compiler-runner/compiler-runner.iml" filepath="$PROJECT_DIR$/compiler/compiler-runner/compiler-runner.iml" />
<module fileurl="file://$PROJECT_DIR$/compiler/tests/compiler-tests.iml" filepath="$PROJECT_DIR$/compiler/tests/compiler-tests.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/compiler/tests-java8/compiler-tests-java8.iml" filepath="$PROJECT_DIR$/compiler/tests-java8/compiler-tests-java8.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/compiler/conditional-preprocessor/conditional-preprocessor.iml" filepath="$PROJECT_DIR$/compiler/conditional-preprocessor/conditional-preprocessor.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/compiler/container/container.iml" filepath="$PROJECT_DIR$/compiler/container/container.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/compiler/daemon/daemon.iml" filepath="$PROJECT_DIR$/compiler/daemon/daemon.iml" group="compiler/daemon" />
<module fileurl="file://$PROJECT_DIR$/compiler/daemon/daemon-client/daemon-client.iml" filepath="$PROJECT_DIR$/compiler/daemon/daemon-client/daemon-client.iml" group="compiler/daemon" />
<module fileurl="file://$PROJECT_DIR$/compiler/daemon/daemon-common/daemon-common.iml" filepath="$PROJECT_DIR$/compiler/daemon/daemon-common/daemon-common.iml" group="compiler/daemon" />
<module fileurl="file://$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" filepath="$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/core/descriptors/descriptors.iml" filepath="$PROJECT_DIR$/core/descriptors/descriptors.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/core/descriptors.runtime/descriptors.runtime.iml" filepath="$PROJECT_DIR$/core/descriptors.runtime/descriptors.runtime.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/core/deserialization/deserialization.iml" filepath="$PROJECT_DIR$/core/deserialization/deserialization.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/eval4j/eval4j.iml" filepath="$PROJECT_DIR$/eval4j/eval4j.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/formatter/formatter.iml" filepath="$PROJECT_DIR$/idea/formatter/formatter.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/compiler/frontend/frontend.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" group="compiler/java" />
<module fileurl="file://$PROJECT_DIR$/compiler/frontend.script/frontend.script.iml" filepath="$PROJECT_DIR$/compiler/frontend.script/frontend.script.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/generators/generators.iml" filepath="$PROJECT_DIR$/generators/generators.iml" group="infrastructure" />
<module fileurl="file://$PROJECT_DIR$/grammar/grammar.iml" filepath="$PROJECT_DIR$/grammar/grammar.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/idea/ide-common/ide-common.iml" filepath="$PROJECT_DIR$/idea/ide-common/ide-common.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea.iml" filepath="$PROJECT_DIR$/idea/idea.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-analysis/idea-analysis.iml" filepath="$PROJECT_DIR$/idea/idea-analysis/idea-analysis.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-android/idea-android.iml" filepath="$PROJECT_DIR$/idea/idea-android/idea-android.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml" filepath="$PROJECT_DIR$/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-completion/idea-completion.iml" filepath="$PROJECT_DIR$/idea/idea-completion/idea-completion.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-core/idea-core.iml" filepath="$PROJECT_DIR$/idea/idea-core/idea-core.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" filepath="$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-live-templates/idea-live-templates.iml" filepath="$PROJECT_DIR$/idea/idea-live-templates/idea-live-templates.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" filepath="$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea-runner/idea-runner.iml" filepath="$PROJECT_DIR$/idea-runner/idea-runner.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" filepath="$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/compiler/incremental-compilation-impl/incremental-compilation-impl.iml" filepath="$PROJECT_DIR$/compiler/incremental-compilation-impl/incremental-compilation-impl.iml" />
<module fileurl="file://$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" filepath="$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" group="compiler/cli" />
<module fileurl="file://$PROJECT_DIR$/compiler/ir/ir.ir2cfg/ir.ir2cfg.iml" filepath="$PROJECT_DIR$/compiler/ir/ir.ir2cfg/ir.ir2cfg.iml" group="compiler/ir" />
<module fileurl="file://$PROJECT_DIR$/compiler/ir/ir.psi2ir/ir.psi2ir.iml" filepath="$PROJECT_DIR$/compiler/ir/ir.psi2ir/ir.psi2ir.iml" group="compiler/ir" />
<module fileurl="file://$PROJECT_DIR$/compiler/ir/ir.tree/ir.tree.iml" filepath="$PROJECT_DIR$/compiler/ir/ir.tree/ir.tree.iml" group="compiler/ir" />
<module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" group="j2k" />
<module fileurl="file://$PROJECT_DIR$/compiler/javac-wrapper/javac-wrapper.iml" filepath="$PROJECT_DIR$/compiler/javac-wrapper/javac-wrapper.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/js/js.ast/js.ast.iml" filepath="$PROJECT_DIR$/js/js.ast/js.ast.iml" group="compiler/js" />
<module fileurl="file://$PROJECT_DIR$/js/js.dce/js.dce.iml" filepath="$PROJECT_DIR$/js/js.dce/js.dce.iml" group="compiler/js" />
<module fileurl="file://$PROJECT_DIR$/js/js.frontend/js.frontend.iml" filepath="$PROJECT_DIR$/js/js.frontend/js.frontend.iml" group="compiler/js" />
<module fileurl="file://$PROJECT_DIR$/js/js.inliner/js.inliner.iml" filepath="$PROJECT_DIR$/js/js.inliner/js.inliner.iml" group="compiler/js" />
<module fileurl="file://$PROJECT_DIR$/js/js.parser/js.parser.iml" filepath="$PROJECT_DIR$/js/js.parser/js.parser.iml" group="compiler/js" />
<module fileurl="file://$PROJECT_DIR$/js/js.serializer/js.serializer.iml" filepath="$PROJECT_DIR$/js/js.serializer/js.serializer.iml" group="compiler/js" />
<module fileurl="file://$PROJECT_DIR$/js/js.tests/js.tests.iml" filepath="$PROJECT_DIR$/js/js.tests/js.tests.iml" group="compiler/js" />
<module fileurl="file://$PROJECT_DIR$/js/js.translator/js.translator.iml" filepath="$PROJECT_DIR$/js/js.translator/js.translator.iml" group="compiler/js" />
<module fileurl="file://$PROJECT_DIR$/plugins/kapt3/kapt3.iml" filepath="$PROJECT_DIR$/plugins/kapt3/kapt3.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/idea/kotlin-gradle-tooling/kotlin-gradle-tooling.iml" filepath="$PROJECT_DIR$/idea/kotlin-gradle-tooling/kotlin-gradle-tooling.iml" />
<module fileurl="file://$PROJECT_DIR$/compiler/light-classes/light-classes.iml" filepath="$PROJECT_DIR$/compiler/light-classes/light-classes.iml" group="compiler/java" />
<module fileurl="file://$PROJECT_DIR$/plugins/lint/lint-api/lint-api.iml" filepath="$PROJECT_DIR$/plugins/lint/lint-api/lint-api.iml" group="plugins/lint" />
<module fileurl="file://$PROJECT_DIR$/plugins/lint/lint-checks/lint-checks.iml" filepath="$PROJECT_DIR$/plugins/lint/lint-checks/lint-checks.iml" group="plugins/lint" />
<module fileurl="file://$PROJECT_DIR$/plugins/lint/lint-idea/lint-idea.iml" filepath="$PROJECT_DIR$/plugins/lint/lint-idea/lint-idea.iml" group="plugins/lint" />
<module fileurl="file://$PROJECT_DIR$/plugins/noarg/noarg-cli/noarg-cli.iml" filepath="$PROJECT_DIR$/plugins/noarg/noarg-cli/noarg-cli.iml" group="plugins/noarg" />
<module fileurl="file://$PROJECT_DIR$/plugins/noarg/noarg-ide/noarg-ide.iml" filepath="$PROJECT_DIR$/plugins/noarg/noarg-ide/noarg-ide.iml" group="plugins/noarg" />
<module fileurl="file://$PROJECT_DIR$/non-compiler-tests/non-compiler-tests.iml" filepath="$PROJECT_DIR$/non-compiler-tests/non-compiler-tests.iml" />
<module fileurl="file://$PROJECT_DIR$/compiler/plugin-api/plugin-api.iml" filepath="$PROJECT_DIR$/compiler/plugin-api/plugin-api.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/plugins/plugins-tests/plugins-tests.iml" filepath="$PROJECT_DIR$/plugins/plugins-tests/plugins-tests.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" />
<module fileurl="file://$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" filepath="$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/compiler/resolution/resolution.iml" filepath="$PROJECT_DIR$/compiler/resolution/resolution.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" filepath="$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml" filepath="$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml" group="plugins/sam-with-receiver" />
<module fileurl="file://$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-ide/sam-with-receiver-ide.iml" filepath="$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-ide/sam-with-receiver-ide.iml" group="plugins/sam-with-receiver" />
<module fileurl="file://$PROJECT_DIR$/core/script.runtime/script.runtime.iml" filepath="$PROJECT_DIR$/core/script.runtime/script.runtime.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/compiler/serialization/serialization.iml" filepath="$PROJECT_DIR$/compiler/serialization/serialization.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml" filepath="$PROJECT_DIR$/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/compiler/tests-common/tests-common.iml" filepath="$PROJECT_DIR$/compiler/tests-common/tests-common.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/compiler/tests-ir-jvm/tests-ir-jvm.iml" filepath="$PROJECT_DIR$/compiler/tests-ir-jvm/tests-ir-jvm.iml" group="compiler/ir" />
<module fileurl="file://$PROJECT_DIR$/plugins/uast-kotlin/uast-kotlin.iml" filepath="$PROJECT_DIR$/plugins/uast-kotlin/uast-kotlin.iml" group="plugins/lint" />
<module fileurl="file://$PROJECT_DIR$/plugins/uast-kotlin-idea/uast-kotlin-idea.iml" filepath="$PROJECT_DIR$/plugins/uast-kotlin-idea/uast-kotlin-idea.iml" />
<module fileurl="file://$PROJECT_DIR$/compiler/util/util.iml" filepath="$PROJECT_DIR$/compiler/util/util.iml" />
<module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" />
</modules>
</component>
</project>

171
.idea/projectCodeStyle.xml generated Normal file
View File

@@ -0,0 +1,171 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS">
<value>
<option name="LINE_SEPARATOR" value="&#10;" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="IF_BRACE_FORCE" value="1" />
<ADDITIONAL_INDENT_OPTIONS fileType="css">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="groovy">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="gsp">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="haml">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="js">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="jsp">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="php">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="py">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="sass">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="scala">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="sql">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="xml">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="yml">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<codeStyleSettings language="JAVA">
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
<indentOptions />
</codeStyleSettings>
<codeStyleSettings language="JavaScript">
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
</codeStyleSettings>
<codeStyleSettings language="PHP">
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
</codeStyleSettings>
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</component>
</project>

View File

@@ -0,0 +1,8 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="All Compiler Tests" type="CompoundRunConfigurationType" factoryName="Compound Run Configuration">
<toRun type="JUnit" name="Compiler Tests" />
<toRun type="JUnit" name="Java 8 Tests" />
<toRun type="JUnit" name="Js-backend tests" />
<method />
</configuration>
</component>

View File

@@ -0,0 +1,37 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="All IDEA Plugin Tests" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.jetbrains.kotlin.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="idea" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="org.jetbrains.kotlin" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="package" />
<option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1250m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Profile " />
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
</component>

View File

@@ -0,0 +1,37 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="All Jvm Backend Tests" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.jetbrains.kotlin.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="compiler-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="org.jetbrains.kotlin.codegen" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="package" />
<option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1024m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="moduleWithDependencies" />
</option>
<envs />
<patterns />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Profile " />
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
</component>

View File

@@ -0,0 +1,39 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="All Non Compiler Tests" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.jetbrains.kotlin.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="non-compiler-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="package" />
<option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx900m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true -Dkotlin.colors.enabled=false" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="moduleWithDependencies" />
</option>
<envs>
<env name="NO_FS_ROOTS_ACCESS_CHECK" value="true" />
</envs>
<patterns />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="53032" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Profile " />
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
</component>

7
.idea/runConfigurations/All_Tests.xml generated Normal file
View File

@@ -0,0 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="All Tests" type="CompoundRunConfigurationType" factoryName="Compound Run Configuration">
<toRun type="CompoundRunConfigurationType" name="All Compiler Tests" />
<toRun type="JUnit" name="All Non Compiler Tests" />
<method />
</configuration>
</component>

View File

@@ -0,0 +1,26 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="All in jps-tests" type="JUnit" factoryName="JUnit" nameIsGenerated="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="jps-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="package" />
<option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=128m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Djna.nosys=true" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<RunnerSettings RunnerId="Profile ">
<option name="myExternalizedOptions" />
</RunnerSettings>
<method />
</configuration>
</component>

View File

@@ -0,0 +1,30 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Android Studio" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
<option name="VM_PARAMETERS" value="-Didea.paths.selector=AndroidStudioPreview -Didea.platform.prefix=AndroidStudio -Xmx1250m -XX:ReservedCodeCacheSize=64m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin,$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android-studio/sdk/bin" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="android-studio" />
<envs />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method>
<option name="BuildArtifacts" enabled="true">
<artifact name="KotlinPlugin" />
</option>
<option name="BuildArtifacts" enabled="true" />
</method>
</configuration>
</component>

View File

@@ -0,0 +1,31 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Codegen Tests on Android" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="android-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="1.8" />
<option name="PACKAGE_NAME" value="org.jetbrains.kotlin.android.tests" />
<option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.android.tests.AndroidRunner" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx850m -XX:+UseCodeCacheFlushing -Djna.nosys=true" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="moduleWithDependencies" />
</option>
<envs />
<patterns />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
</component>

View File

@@ -0,0 +1,28 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Codegen Tests with JVM target 1.6 on JDK 1.6" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.jetbrains.kotlin.codegen.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="compiler-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="1.8" />
<option name="PACKAGE_NAME" value="org.jetbrains.kotlin.codegen" />
<option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.codegen.CodegenJdkCommonTestSuite" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-Dkotlin.test.default.jvm.target=1.6 -Dkotlin.test.box.in.separate.process.port=5100 -Dkotlin.test.java.compilation.target=1.6 -ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1024m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<method />
</configuration>
</component>

View File

@@ -0,0 +1,28 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Codegen Tests with JVM target 1.6 on JDK 9" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.jetbrains.kotlin.codegen.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="compiler-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="9-ea" />
<option name="PACKAGE_NAME" value="org.jetbrains.kotlin.codegen" />
<option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.codegen.CodegenJdkCommonTestSuite" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-Dkotlin.test.default.jvm.target=1.6 -ea -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<method />
</configuration>
</component>

View File

@@ -0,0 +1,28 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Codegen Tests with JVM target 1.8 on JDK 1.8" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.jetbrains.kotlin.codegen.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="compiler-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="1.8" />
<option name="PACKAGE_NAME" value="org.jetbrains.kotlin.codegen" />
<option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.codegen.CodegenJdkCommonTestSuite" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-Dkotlin.test.default.jvm.target=1.8 -ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1024m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<method />
</configuration>
</component>

View File

@@ -0,0 +1,28 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Codegen Tests with JVM target 1.8 on JDK 9" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.jetbrains.kotlin.codegen.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="compiler-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="9-ea" />
<option name="PACKAGE_NAME" value="org.jetbrains.kotlin.codegen" />
<option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.codegen.CodegenJdkCommonTestSuite" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-Dkotlin.test.default.jvm.target=1.8 -ea -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<method />
</configuration>
</component>

View File

@@ -0,0 +1,37 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Compiler Tests" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.jetbrains.kotlin.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="compiler-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="org.jetbrains.kotlin" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="package" />
<option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1024m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true -Dkotlin.colors.enabled=false" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="moduleWithDependencies" />
</option>
<envs />
<patterns />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Profile " />
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
</component>

31
.idea/runConfigurations/Eval4j_Tests.xml generated Normal file
View File

@@ -0,0 +1,31 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Eval4j Tests" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="eval4j" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="org.jetbrains.eval4j.test" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="package" />
<option name="VM_PARAMETERS" value="-ea -Djna.nosys=true" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
</component>

View File

@@ -1,20 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Generate All Tests" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="generateTests" />
</list>
</option>
<option name="vmOptions" value="" />
</ExternalSystemSettings>
<method />
</configuration>
</component>

View File

@@ -1,25 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Generate Compiler Tests" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/compiler" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":compiler:generateTests" />
<option value=":compiler:tests-java8:generateTests" />
<option value=":compiler:tests-against-klib:generateTests" />
<option value=":js:js.tests:generateTests" />
<option value=":core:descriptors.runtime:generateTests" />
</list>
</option>
<option name="vmOptions" value="" />
</ExternalSystemSettings>
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<method />
</configuration>
</component>

View File

@@ -0,0 +1,34 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Generate Tests" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.jetbrains.kotlin.generators.tests.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.generators.tests.GenerateTestsKt" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="generators" />
<envs />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Profile " />
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method>
<option name="Make" enabled="false" />
<option name="MakeNoErrorCheck" enabled="true" />
</method>
</configuration>
</component>

View File

@@ -1,20 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Generate standard library sources" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/libraries/tools/kotlin-stdlib-gen" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="--configure-on-demand" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="run" />
</list>
</option>
<option name="vmOptions" value="" />
</ExternalSystemSettings>
<method />
</configuration>
</component>

View File

@@ -1,20 +1,50 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="IDEA" type="GradleRunConfiguration" factoryName="Gradle" singleton="true">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
<configuration default="false" name="IDEA" type="Application" factoryName="Application" singleton="true">
<log_file path="$PROJECT_DIR$/ideaSDK/system-idea/log/idea.log" checked="true" skipped="true" show_all="false" alias="idea.log" />
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
<option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=128m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="idea-runner" />
<envs />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="JavaRebel">
<option name="bootstrapPath" />
<option name="jrebelArgs" value="" />
<option name="loggingEnabled" value="false" />
<option name="useBootstrapDefaults" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="JavaRebel Debug">
<option name="bootstrapPath" />
<option name="debugPort" value="" />
<option name="jrebelArgs" value="" />
<option name="loggingEnabled" value="false" />
<option name="transport" value="0" />
<option name="useBootstrapDefaults" value="true" />
<option name="DEBUG_PORT" value="" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Profile " />
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Profile " />
<ConfigurationWrapper RunnerId="Run" />
<method>
<option name="BuildArtifacts" enabled="true">
<artifact name="KotlinPlugin" />
</option>
<option name="taskNames">
<list>
<option value="runIde" />
</list>
</option>
<option name="vmOptions" value="" />
</ExternalSystemSettings>
<method />
<option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/idea-runner/runner.xml" target="force-enable-kotlin-plugin" />
</method>
</configuration>
</component>

View File

@@ -1,20 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="IDEA Ultimate" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-P intellijUltimateEnabled" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="runUltimate" />
</list>
</option>
<option name="vmOptions" value="" />
</ExternalSystemSettings>
<method />
</configuration>
</component>

View File

@@ -1,20 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="IDEA Ultimate (No ProcessCanceledException) " type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PnoPCE" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="runUltimate" />
</list>
</option>
<option name="vmOptions" value="" />
</ExternalSystemSettings>
<method />
</configuration>
</component>

View File

@@ -1,20 +1,32 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="IDEA (No ProcessCanceledException)" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PnoPCE" />
<option name="taskDescriptions">
<list />
<configuration default="false" name="IDEA (No ProcessCanceledException)" type="Application" factoryName="Application" singleton="true">
<log_file path="$PROJECT_DIR$/ideaSDK/system-idea/log/idea.log" checked="true" skipped="true" show_all="false" alias="idea.log" />
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
<option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=128m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Didea.ProcessCanceledException=disabled -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="idea-runner" />
<envs />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method>
<option name="BuildArtifacts" enabled="true">
<artifact name="KotlinPlugin" />
</option>
<option name="taskNames">
<list>
<option value="runIde" />
</list>
</option>
<option name="vmOptions" value="" />
</ExternalSystemSettings>
<method />
<option name="BuildArtifacts" enabled="true" />
<option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/idea-runner/runner.xml" target="force-enable-kotlin-plugin" />
</method>
</configuration>
</component>

View File

@@ -1,19 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="IDEA (Not Internal)" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-Pidea.is.internal=false" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="runIde" />
</list>
</option>
<option name="vmOptions" value="" />
</ExternalSystemSettings>
</configuration>
</component>

40
.idea/runConfigurations/J2K_Tests.xml generated Normal file
View File

@@ -0,0 +1,40 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="J2K Tests" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.jetbrains.kotlin.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="j2k" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="pattern" />
<option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx700m -Djna.nosys=true" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="moduleWithDependencies" />
</option>
<envs />
<patterns>
<pattern testClass="org.jetbrains.kotlin.idea.conversion.copy.*" />
<pattern testClass="org.jetbrains.kotlin.j2k.*" />
</patterns>
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Profile " />
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
</component>

28
.idea/runConfigurations/Java_8_Tests.xml generated Normal file
View File

@@ -0,0 +1,28 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Java 8 Tests" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.jetbrains.kotlin.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="compiler-tests-java8" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="1.8" />
<option name="PACKAGE_NAME" value="org.jetbrains.kotlin" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="package" />
<option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true -Dkotlin.colors.enabled=false" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<method />
</configuration>
</component>

View File

@@ -0,0 +1,28 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Java 8 Tests on JDK 9" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.jetbrains.kotlin.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="compiler-tests-java8" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="9-ea" />
<option name="PACKAGE_NAME" value="org.jetbrains.kotlin" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="package" />
<option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<method />
</configuration>
</component>

Some files were not shown because too many files have changed in this diff Show More