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

16057 Commits

Author SHA1 Message Date
Denis Zharkov c884cffeea Prohibit return type mismatch for delegation members 
#KT-13952 Fixed
 #KT-13005 Fixed
 2016-09-28 11:40:20 +03:00
Denis Zharkov ddb7a6aa13 Minor. Extract subinterface for specific strategy 
It contains only methods related to explicitly declared overrides
 2016-09-28 11:40:20 +03:00
Alexey Sedunov 22271f0af0 Pull Up/Push Down/Extract Super: Show member dependencies in the refactoring dialog 2016-09-27 21:26:29 +03:00
Alexey Sedunov 8a5628cde5 Pull Up/Extract Super: Support members declared in the companion object of the original class 2016-09-27 21:26:28 +03:00
Alexey Sedunov 982d4d4ead Pull Up/Extract Super: Support properties declared in the primary constructor 2016-09-27 21:26:27 +03:00
Mikhail Glukhikh 025d063b27 UNNECESSARY_LATEINIT: do not report if property is not initialized at use-site #KT-13806 Fixed 
(cherry picked from commit 09c0865)
 2016-09-27 18:49:02 +03:00
Mikhail Glukhikh 4da9a101cf UNNECESSARY_LATEINIT warning introduced #KT-13295 Fixed 
(cherry picked from commit 88f9938)
 2016-09-27 18:48:50 +03:00
Pavel V. Talanov b275dacad8 Light classes: getOwnInnerClasses() filters out inner classes with null names 
#KT-13927 Fixed
 2016-09-26 19:51:57 +03:00
Pavel V. Talanov 32daf048c2 PlatformConfigurator: create container for each platform (it contains static services, mostly checkers) ahead of time 2016-09-26 14:42:57 +03:00
Pavel V. Talanov be00a6ec49 StorageComponentContainer: allow to specify parent container which can be reused to provide components to several child containers 2016-09-26 14:35:37 +03:00
Alexander Udalov 33d33ab144 Exclude additional tests from Android codegen test runner 2016-09-24 11:31:59 +03:00
Alexander Udalov 9bc6d6ae92 Remove recursion workaround from DeprecatedClassifierUsageChecker 2016-09-24 11:26:57 +03:00
Alexander Udalov dca99c3fd2 Move ClassifierUsageChecker invocation lower in LazyTopDownAnalyzer 
Invoking checkers right after resolution of qualified expressions is too early:
DeprecatedClassifierUsageChecker tries to load the annotations of a referenced
classifier to report deprecation, and that may result in building light classes
for not yet analyzed declarations

 #KT-13954 Fixed
 2016-09-24 11:26:56 +03:00
Nikolay Krasko 0abf94c2f4 Allow to avoid rebuilding application in debugger tests on local machine 
(cherry picked from commit 8b899a7)
 2016-09-24 01:44:40 +03:00
Nikolay Krasko 520e187e46 Clean application after test in compiler tests 
It's disposed after Disposer.dispose(myTestRootDisposable) in tearDown and mixing compiler tests
with non-compiler tests may ruin classes initialization with

"com.intellij.util.IncorrectOperationException: Sorry but parent: com.intellij.mock.MockApplicationEx@52439591 has already been disposed"

(cherry picked from commit f3badb6)
 2016-09-24 01:44:38 +03:00
Denis Zharkov 217f033552 Prevent generation of delegations to interfaces private methods 
#KT-13381 Fixed
 #KT-13996 Fixed
 2016-09-23 14:51:14 +03:00
Pavel V. Talanov 8f5725345f ModuleDescriptor: invert "friends" relation 
Fixes memory leak caused by modules storing their friends (which can be potentially recreated many times)
 2016-09-22 18:20:43 +03:00
Nikolay Krasko 293d3b4320 Remove toString() test for StorageManager 
Storing place of creating was removed in cb32bc97dd
 2016-09-22 16:28:46 +03:00
Denis Zharkov 5381c06936 Improve 1.0-compatibility mode for JDK dependent members 
Just reporting error by call checker may be too restrictive
in case there are some extensions that can be used successfully

Solution is to annotate additional members with
@Deprecated(level=Error) + @kotlin.internal.LowPriorityInOverloadResolution
 2016-09-22 15:40:37 +03:00
Denis Zharkov a7dedfab70 Move JvmBuiltIns initialization after container setup 
It will be used in the further commits to initilize built-ins instance
with components as arguments
 2016-09-22 15:40:37 +03:00
Mikhail Glukhikh 68f0953b02 Random-order variable sets are no more in use in CFG #KT-13990 Fixed 
(cherry picked from commit fc89385)
 2016-09-22 13:32:01 +03:00
Alexander Udalov b3803d6fe7 Exclude some codegen tests on Android 
These tests rely on the fact that sources are located in the default package,
whereas Android tests alter the package name of each test
 2016-09-22 13:03:26 +03:00
Dmitry Petrov 07198cf86d SAM constructors for type aliases. 2016-09-22 10:38:34 +03:00
Denis Zharkov 6663054f4d Fix false positive "Cannot capture" error reporting 
There is no need to report an error in case of non-top-level
capture conversion, just don't add relevant capture type in the system instead

If system can be solved successfully without captured type, then it's just fine
(see KT-13950)
In case of contradiction TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR is reported

 #KT-13950 Fixed
 2016-09-21 18:05:26 +03:00
Denis Zharkov 4431c6ad02 Fix inference when captured type is used as a lambda parameter type 
Use lower approximation bound to obtain acceptable types for lambda parameters
those types depend on captured type

 #KT-12238 Fixed
 #KT-10627 Fixed
 2016-09-21 18:05:26 +03:00
Alexander Udalov 621c6691d0 Support equals, hashCode, toString for annotations instantiated with reflection 
#KT-13106 Fixed
 2016-09-20 21:36:30 +03:00
Alexander Udalov 525937252d Support Java annotation constructors in reflection 
#KT-13106 In Progress
 2016-09-20 21:36:30 +03:00
Alexander Udalov aeba124bdb Support Kotlin annotation constructors in reflection 
#KT-13106 In Progress
 2016-09-20 21:36:29 +03:00
Alexander Udalov fb18e4bf4c Sort parameters of Java annotation constructors by name for stability 2016-09-20 21:36:29 +03:00
Pavel V. Talanov 92b62f879b JavaClassImpl: add assertion on querying members of light classes 
Hopefully this assertion happens before deadlock KT-12966
 2016-09-20 19:09:05 +03:00
Pavel V. Talanov 631603c015 J2K JavaClassImpl: rename file 2016-09-20 19:09:04 +03:00
Pavel V. Talanov 724b0322c0 J2K JavaClassImpl: convert code 2016-09-20 19:09:03 +03:00
Mikhail Zarechenskiy 2fc8f5d5e2 Move util function closer to its usage and remove empty file 2016-09-20 16:23:43 +03:00
Mikhail Zarechenskiy 8a0107ea5f Move property with template to script definition interface 2016-09-20 16:23:42 +03:00
Mikhail Zarechenskiy 7739677a06 Adapt ScriptCodegenTests to last changes 
Get rid of possibility to configure script definition without template
class, therefore all tests now are using default script argument
 2016-09-20 16:23:41 +03:00
Mikhail Zarechenskiy f8774be8c3 Adapt ScriptGenTest to last changes 
- Use script definitions created by script templates
 - Configure classpath before files were loaded
 2016-09-20 16:23:40 +03:00
Mikhail Zarechenskiy aa1368f4f3 J2K ScriptGenTest: convert and prettify 2016-09-20 16:23:39 +03:00
Mikhail Zarechenskiy 49e1603470 J2K ScriptGenTest: rename 2016-09-20 16:23:38 +03:00
Mikhail Zarechenskiy b18cbc37c6 Do not generate properties from script constructor 
From now all script parameter properties are generated by template class
 2016-09-20 16:22:42 +03:00
Mikhail Zarechenskiy 0ba2d374bc Create standard script definition from standard template 
Now each script without specified template has a StandardSriptTemplate
class as a base one. This allows to generalize script codegen and
resolve.
 2016-09-20 15:44:44 +03:00
Nikolay Krasko 4b9b3b07e7 Update to 162.1447.7 2016-09-20 15:26:53 +03:00
Denis Zharkov 10c840327d Temporary move annotation to methods' modifier list 
Java resolver ignores return type annotations if there are ones on modifier list

Related to this commit https://github.com/JetBrains/intellij-community/commit/a2497edceec614cdb5b76ba552f8a035f9e159f8
 2016-09-20 15:26:50 +03:00
Nikolay Krasko a471d8907a Register TypeAnnotationModifier as extension point 2016-09-20 15:26:34 +03:00
Nikolay Krasko 99a75021e1 Problem: manually shutdown AppScheduledExecutorService to allow compiler stop properly 
Without such shutdown console program that gets PSI file will hang forever.

Introduced in https://github.com/JetBrains/intellij-community/commit/446b80077aed71e2384301ae993cf44416bf9a83

Stack example:

 java.lang.Thread.State: RUNNABLE
	  at com.intellij.util.concurrency.AppDelayQueue.<init>(AppDelayQueue.java:37)
	  at com.intellij.util.concurrency.AppScheduledExecutorService.<init>(AppScheduledExecutorService.java:50)
	  at com.intellij.util.concurrency.AppScheduledExecutorService$Holder.<clinit>(AppScheduledExecutorService.java:41)
	  at com.intellij.util.concurrency.AppScheduledExecutorService.getInstance(AppScheduledExecutorService.java:46)
	  at com.intellij.util.concurrency.AppExecutorUtil.getAppScheduledExecutorService(AppExecutorUtil.java:39)
	  at com.intellij.concurrency.JobScheduler.getScheduler(JobScheduler.java:43)
	  at com.intellij.psi.impl.source.AstPathPsiMap.<clinit>(AstPathPsiMap.java:45)
	  at com.intellij.psi.impl.source.PsiFileImpl.<init>(PsiFileImpl.java:76)
	  at com.intellij.extapi.psi.PsiFileBase.<init>(PsiFileBase.java:39)
	  at org.jetbrains.kotlin.psi.KtFile.<init>(KtFile.java:48)
	  at org.jetbrains.kotlin.parsing.KotlinParserDefinition.createFile(KotlinParserDefinition.kt:73)
	  at com.intellij.psi.SingleRootFileViewProvider.createFile(SingleRootFileViewProvider.java:407)
	  at com.intellij.psi.SingleRootFileViewProvider.createFile(SingleRootFileViewProvider.java:348)
	  at com.intellij.psi.SingleRootFileViewProvider.createFile(SingleRootFileViewProvider.java:326)
	  at com.intellij.psi.SingleRootFileViewProvider.getPsiInner(SingleRootFileViewProvider.java:171)
	  at com.intellij.psi.SingleRootFileViewProvider.getPsi(SingleRootFileViewProvider.java:155)
	  at com.intellij.psi.impl.PsiFileFactoryImpl.trySetupPsiForFile(PsiFileFactoryImpl.java:121)
	  at com.intellij.psi.impl.PsiFileFactoryImpl.createFileFromText(PsiFileFactoryImpl.java:100)
	  at com.intellij.psi.impl.PsiFileFactoryImpl.createFileFromText(PsiFileFactoryImpl.java:56)
	  at org.jetbrains.kotlin.psi.KtPsiFactory.doCreateFile(KtPsiFactory.kt:174)
	  at org.jetbrains.kotlin.psi.KtPsiFactory.createFile(KtPsiFactory.kt:178)
	  at org.jetbrains.kotlin.preprocessor.Preprocessor.processFileSingleEvaluator(Preprocessor.kt:82)
	  at org.jetbrains.kotlin.preprocessor.Preprocessor.processDirectorySingleEvaluator(Preprocessor.kt:105)
	  at org.jetbrains.kotlin.preprocessor.Preprocessor.processDirectorySingleEvaluator(Preprocessor.kt:135)
	  at org.jetbrains.kotlin.preprocessor.Preprocessor.processSources(Preprocessor.kt:74)
	  at org.jetbrains.kotlin.preprocessor.PreprocessorCLI.main(PreprocessorCLI.kt:35)
 2016-09-20 15:25:37 +03:00
Nikolay Krasko ff9f3694f1 Problem: remove static import (temp workaround) 
See KT-13954 for details
 2016-09-20 15:24:55 +03:00
Nikolay Krasko d5ae37d33a Problem: remove static import (temp workaround) 2016-09-20 15:10:57 +03:00
Nikolay Krasko bfef8726bb Mock implementation for ExternalAnnotationsManager and InferredAnnotationsManager services 2016-09-20 15:10:56 +03:00
Nikolay Krasko 7d1a5f1d2b Tests only: add new method in MockPsiManager.java 2016-09-20 15:10:51 +03:00
Nikolay Krasko b05105e849 Problem: define idea.plugins.compatible.build setting explicitly to avoid exception about bad idea home path 2016-09-20 15:10:49 +03:00
Nikolay Krasko c7ac8e1650 Tests only: implement new method 2016-09-20 15:10:42 +03:00