Commit Graph

17128 Commits

Author SHA1 Message Date
Nicolay Mitropolsky 0f6df38211 as31: fixup: Kotlin Facet: Configure facet based on Android build variant (in AS) 2018-04-11 16:28:22 +03:00
Nicolay Mitropolsky a300682f04 as31: facetUtils.kt compilation fix (configureSdkIfPossible-nullability) 2018-04-11 16:28:21 +03:00
Vyacheslav Gerasimov e2578b6a17 as31: Add smali plugin required by android plugin to test runtime 2018-04-11 16:28:21 +03:00
Vyacheslav Gerasimov fd0045cf6b as31: Fix build scripts for AS 3.1 2018-04-11 16:28:21 +03:00
Vyacheslav Gerasimov 25fddaacfb as31: Fix compilation ResourceReferenceAnnotatorUtil 2018-04-11 16:28:20 +03:00
Vyacheslav Gerasimov ec460d88a7 as31: Fix compilation KotlinAndroidGradleLibraryDataService.kt for AS 3.1 2018-04-11 16:28:20 +03:00
Vyacheslav Gerasimov 06efb037fd as31: Fix test data for testAddArrayOfTypeForJavaAnnotation 2018-04-11 16:28:20 +03:00
Vyacheslav Gerasimov c78c82a366 as31: Fix GradleFacetImportTest for AS 2018-04-11 16:28:20 +03:00
Simon Ogorodnik d58b0798cc as31: Fix AbstractImportsTest, add missing project parameter
Settings by default taken from per-project settings manager
instead of app settings
2018-04-11 16:28:20 +03:00
Vyacheslav Gerasimov 9bb3bb2777 as31: Remove duplicate registration of KotlinUastBindingContextProviderService
from android-lint.xml, it is already registered in plugin.xml
2018-04-11 16:28:20 +03:00
Vyacheslav Gerasimov 4c498b004f as31: Fix test data for android lint based tests for AS 3.0 2018-04-11 16:28:19 +03:00
Vyacheslav Gerasimov e12e63572c as31: Fix TypeParameterFindViewByIdInspection for AS 3.0 2018-04-11 16:28:19 +03:00
Simon Ogorodnik 647ff74612 as31: Disable maven for AS30 2018-04-11 16:28:18 +03:00
Alexey Sedunov 6636c4376b as31: Kotlin Facet: Configure facet based on Android build variant (in AS)
#KT-19958 Fixed
2018-04-11 16:28:18 +03:00
Alexey Sedunov a9cdccc6de as31: Misc: Fix compilation 2018-04-11 16:28:18 +03:00
Dmitry Jemerov 8568bde4df as31: Fix compilation
(cherry picked from commit bc0bc0e)
2018-04-11 16:28:17 +03:00
Dmitry Jemerov abce7170be as31: Implement ConvertJavaToKotlinProvider
(cherry picked from commit 34dfa24)
2018-04-11 16:28:17 +03:00
Vyacheslav Gerasimov 38b38511a0 as31: Fix KotlinAndroidLineMarkerProvider for AS 3.0 2018-04-11 16:28:17 +03:00
Vyacheslav Gerasimov 13b192cd47 as31: Moved getRequiredVersion to KotlinAndroidQuickFixProvider 2018-04-11 16:28:16 +03:00
Vyacheslav Gerasimov 11ee744340 as31: Drop custom Kotlin Android lint, register quickfixes with extension point 2018-04-11 16:28:16 +03:00
Dmitry Jemerov 686d8a1756 as31: Compilation fixes for as24 2018-04-11 16:28:16 +03:00
Vyacheslav Gerasimov ab532732ed as31: Fix compilation AndroidResourceReferenceAnnotator 2018-04-11 16:28:15 +03:00
Vyacheslav Gerasimov 02f842f8b5 as31: Revert "Quickfix to enable language feature works for Maven project"
This reverts commit aabd560eef.
2018-04-11 16:28:15 +03:00
Vyacheslav Gerasimov 3dcca14a50 as31: Revert "Quickfix to enable coroutine support works in Maven projects"
This reverts commit 7346fee513.
2018-04-11 16:28:15 +03:00
Vyacheslav Gerasimov 78140fb304 as31: Fix compilation JavaRuntimePresentationProvider 2018-04-11 16:28:15 +03:00
Pavel V. Talanov 8eb80a8f4a as31: Add step to patch plugin xml so that it only works in Android Studio
(cherry picked from commit fcee4eb)

(cherry picked from commit 14f7731)

(cherry picked from commit b1f5df2)
2018-04-11 16:28:14 +03:00
Vyacheslav Gerasimov 7c30e80382 as31: Kotlin Facet: Configure facet on Gradle project sync in Android Studio 2.3
#KT-15909 Fixed

(cherry picked from commit 6a490bc681f968ee209580f683804b1ee3baee96)
2018-04-11 16:28:14 +03:00
Vyacheslav Gerasimov 6bca651848 as31: Fix compilation for Android Studio 2.4 2018-04-11 16:28:14 +03:00
Vyacheslav Gerasimov a4699add8e as31: Fix gotoResourceHelper: MyReferredResourceFieldInfo now requires module 2018-04-11 16:28:14 +03:00
Vyacheslav Gerasimov b6abe84357 as31: Fix ResourceFoldingBuilder for AS 2.4 2018-04-11 16:28:14 +03:00
Natalia Selezneva 5ba337e998 172: Replace missing property from GradleConstants 2018-04-11 16:28:13 +03:00
Nicolay Mitropolsky 9af4f8c66b 172: psiModificationUtils.kt: compilation fixes 2018-04-11 16:28:13 +03:00
Nikolay Krasko e2fb63729d 172: Revert "Data Inflow: Support grouping by leaf expressions"
This reverts commit d5af2db2f259c7d55d38be73b9a5136e3aefd580.
2018-04-11 16:28:12 +03:00
Nikolay Krasko cdc0f60fe8 172: Restore KotlinCommonCodeStyleSettings behaviour for 172 Idea
There are no soft margins in CommonCodeStyleSettings.
2018-04-11 16:28:12 +03:00
Nikolay Krasko ca7f25d52f 172: Fix compilation in 172 after AbstractApplicationUsagesCollector rename
See c299f7d10a93a055cc868a9d9d20d68cc47c35e3 to intellij_community
2018-04-11 16:28:12 +03:00
Nicolay Mitropolsky 302bdebd3a 172: AbstractSlicerTest.kt reverted to previous rebase 2018-04-11 16:28:11 +03:00
Nicolay Mitropolsky fb0b9221f9 172: IDEA-172-related compilation fix PluginTestCaseBase.addJdk(myFixture.projectDisposable 2018-04-11 16:28:10 +03:00
Natalia Selezneva 39d9ac1250 172: Remove textAttributes parameter from EditorCustomElementRenderer:paint 2018-04-11 16:28:10 +03:00
Nikolay Krasko 934f2d6e2c 172: Restore usage of PathUtil.getLocalFile in 172 idea
There's no VfsUtil.getLocalFile
2018-04-11 16:28:10 +03:00
Vyacheslav Gerasimov 8d3f71a04f 172: Revert "Quick Fixes: Support cross-language "Create from Usage" with Kotlin target"
This reverts commit 908bf71
2018-04-11 16:28:09 +03:00
Vyacheslav Gerasimov 747f397f40 172: Revert "Quick Fixes: Drop deprecated KotlinCommonIntentionActionsFactory"
This reverts commit ba0a91d
2018-04-11 16:28:09 +03:00
Vyacheslav Gerasimov deb2ffb49f 172: Revert "Refactoring: Use modifier list in CallableInfo where possible"
This reverts commit 99be75c
2018-04-11 16:28:09 +03:00
Nikolay Krasko 577e6e5206 172: Try to remove unneeded commits in 172 branch
Revert "[Unneeded?] Revert "ExpressionOfTypeProcessor: get member name in read action""
This reverts commit 7ec59fc

Revert "[Unneeded] Revert "AbstractNavigateToLibraryTest: fix for invalid files""
This reverts commit 9e80c60

Revert "[Unneeded?] Revert "AbstractExtractionTest: fix for invalid files""
This reverts commit 0b2113b

Revert "[Unneeded] Revert "AbstractIntentionTest: `isApplicableOnPooled` made run under ProgressIndicator""
This reverts commit a41c247
2018-04-11 16:28:09 +03:00
Nikolay Krasko 9c38454c2e 172: [Unneeded?] Revert "ExpressionOfTypeProcessor: get member name in read action"
This reverts commit 32d8e0c72b877f0c0123bb56e0d92beaab410daa.
2018-04-11 16:28:09 +03:00
Nikolay Krasko 0df179de3b 172: [Unneeded] Revert "AbstractNavigateToLibraryTest: fix for invalid files"
This reverts commit e71b1757be6ca4b9ef49d65c6250a94f5f724f53.
2018-04-11 16:28:08 +03:00
Nikolay Krasko 8eb40466ee 172: [Unneeded?] Revert "AbstractExtractionTest: fix for invalid files"
This reverts commit b3b71ac53bb5150457ff228ecccb15060dd2de1f.
2018-04-11 16:28:08 +03:00
Nikolay Krasko 2cc2ea0ce1 172: [Unneeded] Revert "AbstractIntentionTest: isApplicableOnPooled made run under ProgressIndicator"
This reverts commit d1ad207fdbed6698ec352bd8b759f9ae62baebb3.
2018-04-11 16:28:08 +03:00
Nikolay Krasko 368dd193ac 172: Revert "Fix compilation after moving to idea 173"
This reverts commit fe121cc6aeadf63ca2c2819c9c7df59cc81caf5d.
2018-04-11 16:28:02 +03:00
Nikolay Krasko fbed7f9c08 172: Restore compilation against Idea 172
Revert "Fix proguard settings for 173"
4dadae2e9c8419bfda9d77f56797e68edbd8ecd7.

Revert "Fix compilation in 173"
0633aa925c8e862519ae699e5e3fe81a2bd227c2.

Revert "Fix compilation (MockParameterInfoUIContext.java)"
01a7fbfb60d786c56c54f4fd77d9f1233f599ede.

Revert "Fix compilation"
043a5dac796f6bf92bbe6c9573c1af07fadcfe4e.

Revert "Fix compatibility with BuildScriptDataBuilder API changes"
c7df054d0e90a86fbe67f23802e9be49b2117ded.
2018-04-11 16:28:02 +03:00
Nikolay Krasko 49cc4fe3b6 172: Revert 173 specific changes in language injection
Revert "`KotlinLanguageInjector` using Registry to enable annotation injections"
This reverts commit c16a1d598c2bacc849dd16fed974ccdbf8b80754.

Revert "`KotlinLanguageInjector#injectInAnnotationCall` optimization: using `PsiClassNamePatternCondition` to avoid calling `getResolvedCall`"
This reverts commit f9eaaeab61b1dd50de9341846e129b58eb47f247.

Revert "`KotlinLanguageInjector` can inject into files modified for autocompletion"
This reverts commit 7212b22b083023201700696d775355051321b120.

Revert "`KotlinLanguageInjector` understands patterns-injections into Java annotations"
This reverts commit 45847b515bdfd27cfa5d23ff8b9147054ffa6f60.
2018-04-11 16:28:01 +03:00