azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,199 Commits 1 Branch 0 Tags
cdc0f60fe81614f1726c8cbbf88f32b341db7932
Commit Graph

45199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 18198ee33c 172: Uast-revert: test-data-revert 2018-04-11 16:28:11 +03:00
Nicolay Mitropolsky a15d48c444 172: Uast-revert: reverting to previous rebase state 2018-04-11 16:28:11 +03:00
Nicolay Mitropolsky c6bb0ad712 172: Uast-revert: AbstractKotlinRenderLogTest 2018-04-11 16:28:11 +03:00
Nicolay Mitropolsky 302bdebd3a 172: AbstractSlicerTest.kt reverted to previous rebase 2018-04-11 16:28:11 +03:00
Nicolay Mitropolsky 8c7269ea9a 172: KotlinUCollectionLiteralExpression: remove override modifier 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 7dcbb909a6 172: Set intellijSdk to 172.4343.14 2018-04-11 16:28:10 +03:00
Vyacheslav Gerasimov e72007901a 172: Revert "UAST: override getFunctionalInterfaceType + test" 
This reverts commit 92c23aa
 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 9de5b83f6e 172: Revert "UAST: Properly handle annotations on local variables" 
This reverts commit 70de7cff5e23abf723009c8df8bc2df2f646a675.
 2018-04-11 16:28:08 +03:00
Nikolay Krasko 9db35f27d7 172: Revert "UAST: Add testConvertTypeInAnnotation" 
This reverts commit 7d1b28b2b6bc80411ef19bb7619181bee637cf20.
 2018-04-11 16:28:08 +03:00
Nikolay Krasko c106c6a5d2 172: Revert "UAST: Fix testPropertyWithAnnotation" 
This reverts commit 36a405cb55198592ee017c7eed9bd50fd6433f22.
 2018-04-11 16:28:07 +03:00
Nikolay Krasko 334ae82b04 172: Revert "UAST test data fixes: @null in render" 
This reverts commit 2f366b8209206b32792919f35f896fc63ad4b0e5.
 2018-04-11 16:28:07 +03:00
Nikolay Krasko 99f74af006 172: Revert "UAST test data fixes: LocalVariableWithAnnotationKt fix for variable type" 
This reverts commit ef61beb53ae1030afe11b3d15a2750959136ad65.
 2018-04-11 16:28:07 +03:00
Nikolay Krasko b02ec40a4c 172: Revert "UAST: support for JvmDeclarationUElement" 
This reverts commit db6a2390a22d4b35246cc4c6d246a5d7752f3506.
 2018-04-11 16:28:07 +03:00
Nikolay Krasko 17a5ce809f 172: Revert "UAST: SimpleKotlinRenderLogTest.testWhenAndDestructing testdata fix" 
This reverts commit c6c71dc5e82e5eec547fb6fe3fe6eb578e8183c9.
 2018-04-11 16:28:06 +03:00
Nikolay Krasko 5a072fffd2 172: Revert "UAST: StringTemplateComplex testdata fix" 
This reverts commit 2ef0be9b2af14438aa7d899f78e2da327e9a8a07.
 2018-04-11 16:28:06 +03:00
Nikolay Krasko 72b4b2b9bf 172: Revert "Uast: AbstractKotlinUClass compilation fix" 
This reverts commit 86ee036ae7d89f8acc885d54157d9b9ce5f2cb17.
 2018-04-11 16:28:06 +03:00
Nikolay Krasko bf27a16144 172: Revert "Uast: SuperCalls.render.txt testdata fix" 
This reverts commit 28a0267dc131ab37ede64f38de0dc2722aba1762.
 2018-04-11 16:28:06 +03:00
Nikolay Krasko fbf722e0bd 172: Revert "Uast: Constructors.kt testData fixes" 
This reverts commit 0d35e32b1ee7006b9c9febf1f8992fbbe3246230.
 2018-04-11 16:28:06 +03:00
Nikolay Krasko 633eafb902 172: Revert "Uast: WrappedUAnnotation as replacement for usage of JavaUAnnotation (KT-21025)" 
This reverts commit 9701403889fbed93d9ea1e8fa4df58c720b3be72.
 2018-04-11 16:28:06 +03:00
Nikolay Krasko 7b89b28015 172: Revert "Uast: AbstractKotlinUVariable annotations now are retrieved from Kotlin Psi, not from compiled (KT-21025)" 
This reverts commit ebbfc4a3845159ba8f0e3d94a5f70489c348c403.
 2018-04-11 16:28:05 +03:00
Nikolay Krasko 50419db87d 172: Revert "Uast: removing java-uast usage from KotlinUastLanguagePlugin and KotlinEnumConstantClassReference" 
This reverts commit dfab8a6888a44d41253477eefb5db75368bb0803.
 2018-04-11 16:28:05 +03:00
Nikolay Krasko 57789b8c3d 172: Revert "Uast: making AbstractKotlinUClass not inherit from AbstractJavaUClass" 
This reverts commit d35f79963c810365451f09e98c148f9ce7fc3263.
 2018-04-11 16:28:05 +03:00
Nikolay Krasko f9af79c6d9 172: Revert "Uast: no more need to exclude UIdentifier from JvmDeclarationUElement check" 
This reverts commit a92791a1f3cdec9ece602c5778eb04d5ffbd7505.
 2018-04-11 16:28:05 +03:00
Nikolay Krasko d402412208 172: Revert "Uast: uastParent made final in KotlinAbstractUElement" 
This reverts commit 9b006787581cca8167714d07ad36aea195ff9c02.
 2018-04-11 16:28:04 +03:00
Nikolay Krasko affa1e232f 172: Revert "Uast: Constructors.kt testdata fixes" 
This reverts commit a725f43588a6d2f2d1c79649f46849f8cbabbc8f.
 2018-04-11 16:28:04 +03:00
Nikolay Krasko b3a534431d 172: Revert "Uast: handling @receiver annotations" 
This reverts commit 2f3b1485a30442db016e7f529d273483315067cf.
 2018-04-11 16:28:04 +03:00
Nikolay Krasko 6881559ec3 172: Revert "Uast: KotlinAccessorCallExpression made implement JvmDeclarationUElement" 
This reverts commit f75a5d8372ab3041d8a1a8073beaa96a79a50b03.
 2018-04-11 16:28:04 +03:00
Nikolay Krasko c6b888678f 172: [Spring] Revert "Fixes for 173 after 28.08.17 changes in IDEA (#1271)" 
This reverts commit 3a37d18e5d65043fc99a28772303d948e0f89f6c.
 2018-04-11 16:28:04 +03:00
Nikolay Krasko 060ed5db88 172: [Spring] Revert "Spring-Kotlin: Gutter repaired (KT-20550, KT-20566)" 
This reverts commit 37752694df794cc07492d21a3924ee735e6d3b9d.
 2018-04-11 16:28:03 +03:00
Nikolay Krasko a4d5a93454 172: [Srping] Revert "Spring gutter icons SpringApiIcons -> SpringApiIcons.Gutter fix." 
This reverts commit 2323e9dc75dbdf109564f1a0d28494e6b5e41075.
 2018-04-11 16:28:03 +03:00
Nikolay Krasko f6e829d7f7 172: [Spring?] Revert "SpringKotlinAutowiringInspection: getting rid of SpringJavaInjectionPointsAutowiringInspection" 
This reverts commit d0446b0aed0707ef616484c9fda04915c08598b0.
 2018-04-11 16:28:03 +03:00
Nikolay Krasko 1a8b58cd14 172: [Spring?] Revert "SpringTestFixtureExtension: option to forbid facet autoconfigure added" 
This reverts commit 0c90753c5bd9ac3fa492a61589d2c8aad3b96cc1.
 2018-04-11 16:28:03 +03:00
Nikolay Krasko 92a9ed62a2 172: [Spring] Revert "KotlinSpringComponentScanInspection made to support platform JamReferenceContributor" 
This reverts commit f6a3b2eae4b0c49359bb477b320bc433988bec37.
 2018-04-11 16:28:03 +03:00
Nikolay Krasko 1421895aa6 172: [Spring] Revert "Spring: removing needless EP-s because they ported to UAST in platform" 
This reverts commit 9355f79c6b06fdcd365f23b40e93ea841b372b27.
 2018-04-11 16:28:02 +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 3b434eeb13 172: Restore KotlinCoreEnvironment for 172 branch 
Revert "`KotlinCoreEnvironment`: set `ideaCompatibleBuildNumber = "173.1"`"
This reverts commit d3321cc77a6b55d8b8ff3c3a16473f2f3b378533.

Revert "`JvmFacade`-related tests repair"
This reverts commit faeacdd17d37a4d733b686f3a1d5e8fc6ea54d79.

Revert "Register new service and EPs added in 173"
This reverts commit 5d227c0e714c1b4316e7b8daca1f208ee423f448.
 2018-04-11 16:28:02 +03:00