Commit Graph

40257 Commits

Author SHA1 Message Date
Alexander Udalov 96bd8cb3c2 Minor, move PluginCliParser and PluginURLClassLoader to subpackage 2017-06-07 14:56:58 +03:00
Alexander Udalov 534e8a5c50 Do not pack useless files into the compiler jar
Do not pack META-INF/services to compiler-quick from out directories
because they're packed from sources anyway in the pack-compiler target.
Also do not pack the "META-INF/jb/$$size$$" and "META-INF/LICENSE" files
found in some IntelliJ libraries. Licenses are not required in binaries,
and previously only the first of them was packed anyway
2017-06-07 14:41:13 +03:00
Alexander Udalov a614419b43 Fix KotlinJpsBuildTest.testHelp on Windows 2017-06-07 14:17:35 +03:00
Alexander Udalov 4844d720cc Remove dependency of module 'java-model-wrappers' on 'annotation-processing'
This breaks the circular dependency between them
2017-06-07 14:06:01 +03:00
Nikolay Krasko 0e693c39a3 Don't remove else block if it participate in other expression (KT-18309)
#KT-18309 Fixed
2017-06-07 13:49:34 +03:00
Dmitry Jemerov 5c993ce83f Fix Slack link 2017-06-07 11:58:00 +02:00
Pavel V. Talanov 2b153d5c10 Improve search for facade light class by kotlin file
LightClassUtil#getWrappingClass works for clashing facade fq names

 #KT-17855 Fixed
2017-06-07 11:19:23 +03:00
Mikhail Glukhikh 417b430033 Test reproducing KT-17855 2017-06-07 11:19:23 +03:00
Alexey Andreev 59240a4bd9 Report errors in JS source maps as compiler warnings 2017-06-07 11:13:55 +03:00
Alexey Andreev bf21cfd6e0 Use source map remapper in JS inliner 2017-06-07 11:13:55 +03:00
Alexey Andreev 9c4ec902b0 Fix test broken by changes in JS source maps 2017-06-07 11:13:54 +03:00
Alexey Andreev e43cc65702 Fix location reported by JS parser in case of long lines 2017-06-07 11:13:54 +03:00
Alexey Andreev 1dae687e7d Fix support of - and + prefix operators in JS parser
Treat number literal that represents minimum integer as integer node in
JS AST.

Treat +<number_literal> JS AST as unary node (+) containing single
number literal
2017-06-07 11:13:53 +03:00
Alexey Andreev 590954e9a8 Add processor that removes location from ambiguous JS AST nodes
There are cases when it's impossible to distinguish which JS node
owns location denoted by source map. Consider example:

a + b

Both root JsBinaryNode and its arg1 point to the same start location.
Out translator provides full information, though parser can't
produce the same AST. The second AST will miss some of the locations
available on the first one. This processor gets AST node produced
by translator and removes locations from there so that both ASTs
become equal.
2017-06-07 11:13:53 +03:00
Alexey Andreev c5bf76578a Add test infrastructure for JS source map parser and generator 2017-06-07 11:13:52 +03:00
Alexey Andreev ca738a9536 Prevent JS source map builder from inserting overlapping mappings
Check if newly inserted mapping is in the same position within
JS line and in this case omit the mapping
2017-06-07 11:13:51 +03:00
Alexey Andreev 174068c462 Add JS source map parser and remapper
JS source map remapper takes parsed source maps
together with JS AST with correct JS positioning information
and converts the latter into Kotlin positioning information
2017-06-07 11:13:51 +03:00
Alexey Andreev e784d1846e Fix warning in BasicBoxTest (JS) 2017-06-07 11:13:50 +03:00
Alexey Andreev 93ec81d2eb Add source information to parsed JS AST 2017-06-07 11:13:50 +03:00
Alexey Andreev 1d1da326be Refactor JS parser 2017-06-07 11:13:49 +03:00
Alexey Andreev 3a3720db8d Reformat JS parser for conformance with project's style settings 2017-06-07 11:13:49 +03:00
Alexey Andreev 41ad637bad Fix warnings in JS parser 2017-06-07 11:13:48 +03:00
Alexey Andreev 9d186cfc66 Fix JS source maps for temporary variables 2017-06-07 11:13:47 +03:00
Alexey Andreev 27a44f3282 Fix JS source maps for complex enum entry 2017-06-07 11:13:47 +03:00
Alexey Andreev b70c52e41f Fix JS source maps for optional arguments
Also, when function has expression body, use expression instead
of function declaration to mark return statement.
2017-06-07 11:13:46 +03:00
Alexey Andreev 6f0e4c4deb Fix JS source maps for data class synthetic methods 2017-06-07 11:13:46 +03:00
Alexey Andreev 5bc6c07f9e Fix JS source maps for companion objects of enum 2017-06-07 11:13:45 +03:00
Alexey Andreev c9545f291a Fix JS source maps for properties without initializer 2017-06-07 11:13:44 +03:00
Vyacheslav Gerasimov fdf098d65c Add gutter icon with navigation to related files for Android components 2017-06-06 20:47:30 +03:00
Vyacheslav Gerasimov 3f03b05bd3 Fix Android gutterIcon test, use findGuttersAtCaret method 2017-06-06 20:47:21 +03:00
Vyacheslav Gerasimov 643e3587cc Kotlin UAST should visit property delegate expression
#KT-15164 Fixed
2017-06-06 20:47:01 +03:00
Vyacheslav Gerasimov 15bfd4439a Fix AddTargetVersionCheckQuickFix, generate else branch with TODO
when surrounded statement used as expression

#KT-17786 Fixed
#KT-17788 Fixed
2017-06-06 20:46:53 +03:00
Vyacheslav Gerasimov 33c3ba815f Fix Android SuppressLint and Api quickfixes: proper annotation placing
#KT-17783 Fixed
 #KT-17787 Fixed
2017-06-06 20:46:40 +03:00
Alexander Udalov e6001f57fa Remove dependency of module 'backend' on 'backend.jvm' and 'ir.tree'
This breaks the circular dependency between 'backend' and 'backend.jvm'
2017-06-06 19:55:06 +03:00
Alexander Udalov cf04157ec8 Ignore gradle build directories in the root module 2017-06-06 19:52:43 +03:00
Alexander Udalov 5e6db3d4a6 Fix broken source and class roots of project libraries 2017-06-06 19:52:42 +03:00
Alexander Udalov fb520e3040 Maven: do not set JVM target to null
After a236400, it's expected that the value of jvmTarget should not be
null. Otherwise ArgumentUtils.convertArgumentsToStringList fails with
NPE
2017-06-06 19:52:04 +03:00
Alexander Udalov a802e7fb71 CLI: fix non-XML rendering of argument parse error, simplify code
If the compiler is invoked through JPS, an instance of
XmlMessageRenderer is used and the output should be a valid XML.
Previously, we reported the argument parse error (and the note to try
"-help") before calling messageRenderer.renderPreamble, which resulted
in invalid XML. The same was happening for the usage printed on "-help".
Both of these problems are fixed

 #KT-14848 Fixed
2017-06-06 19:52:04 +03:00
Alexander Udalov a67382fdec Daemon: do not exit with internal error on invalid arguments
Invalid compiler arguments should lead to a compilation error, not
internal error. This has been fixed by splitting the
"parseArguments(...)" call (which does parsing + validation) in
CompileServiceImpl into two calls of parseCommandLineArguments +
validateArguments, and returning with a compilation error if the latter
did not succeed

 #KT-16057 Fixed
 #KT-14848 In Progress
2017-06-06 19:52:02 +03:00
Sergey Igushkin 2cad64881d (minor) Improve exception message in case no Android plugin was found 2017-06-06 17:21:20 +03:00
Sergey Igushkin 21b88995ab Add tests for the introduced fixes
Add a test for applying kotlin-android plugin with com.android.feature

Add a test for Databinding (not passing yet with 3.0.0+, until
3.0.0-alpha4 is released, which contains the fix from the Android side).

Add missing test project android-databinding.

Refactor and improve the tests

* Remove redundant files from test project 'android-databinding'
* Refactoring and minor improvements in the tests
2017-06-06 17:21:20 +03:00
Sergey Igushkin 483218e491 Fix for the Databinding issue where the kapt task started to early, not
letting the Databinding pre-process the project.
2017-06-06 17:21:20 +03:00
Sergey Igushkin f053d79994 Add support for com.android.feature plugin. 2017-06-06 17:21:20 +03:00
Pavel V. Talanov bdf76f23c4 Jvm Codegen: do not throw on malformed delegation to a type parameter
Fix exception on light class building

See KT-15931
2017-06-06 17:11:19 +03:00
Pavel V. Talanov 19db4304bd Use clsDelegate to calculate hasModifierProperty("final") for light psi
AllOpen plugin can make some changes and we don't have the tools to make
    correct decision based on psi

 #KT-17857 Fixed
2017-06-06 17:11:18 +03:00
Pavel V. Talanov f3f2379e5a KtLightMemberModifierList:hasExplicitModifier("default") returns false
#KT-18070 Fixed
2017-06-06 17:11:17 +03:00
Mikhail Glukhikh f54267eab4 Revert 'configureSilently' removal 2017-06-06 16:14:50 +03:00
Nikolay Krasko 0980446836 Fix running Android tests locally on windows 2017-06-06 14:56:22 +03:00
Nikolay Krasko 45958e630d Refactoring: move method 2017-06-06 14:56:21 +03:00
Nikolay Krasko cb4c840d3b Remote old tasks for fetching continuous branches 2017-06-06 14:56:21 +03:00