Update to 201.5259.13-EAP-SNAPSHOT
- No UIUtil.removeLeakingAppleListeners anymore - getParameterHints nullability - versions of lz4-java and guava were changed
This commit is contained in:
committed by
Nikolay Krasko
parent
6c968859ad
commit
2340a86d8d
@@ -26,7 +26,7 @@ dependencies {
|
||||
testCompile(intellijDep()) { includeJars("log4j", "jdom") }
|
||||
|
||||
if (Platform.P192.orHigher()) {
|
||||
testRuntime(intellijDep()) { includeJars("lz4-java-1.6.0") }
|
||||
testRuntime(intellijDep()) { includeJars("lz4-java", rootProject = rootProject) }
|
||||
} else {
|
||||
testRuntime(intellijDep()) { includeJars("lz4-1.3.0") }
|
||||
}
|
||||
|
||||
+6
@@ -107,11 +107,13 @@ public abstract class KtUsefulTestCase extends TestCase {
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
// -- KOTLIN ADDITIONAL START --
|
||||
application = ApplicationManager.getApplication();
|
||||
|
||||
if (application != null && application.isDisposed()) {
|
||||
MockComponentManagerCreationTracer.diagnoseDisposedButNotClearedApplication(application);
|
||||
}
|
||||
// -- KOTLIN ADDITIONAL END --
|
||||
|
||||
super.setUp();
|
||||
|
||||
@@ -122,11 +124,13 @@ public abstract class KtUsefulTestCase extends TestCase {
|
||||
myTempDir = FileUtil.createTempDirectory(TEMP_DIR_MARKER, testName, false);
|
||||
FileUtil.resetCanonicalTempPathCache(myTempDir.getPath());
|
||||
}
|
||||
|
||||
boolean isStressTest = isStressTest();
|
||||
ApplicationInfoImpl.setInStressTest(isStressTest);
|
||||
if (isPerformanceTest()) {
|
||||
Timings.getStatistics();
|
||||
}
|
||||
|
||||
// turn off Disposer debugging for performance tests
|
||||
Disposer.setDebugMode(!isStressTest);
|
||||
}
|
||||
@@ -164,8 +168,10 @@ public abstract class KtUsefulTestCase extends TestCase {
|
||||
}
|
||||
finally {
|
||||
super.tearDown();
|
||||
// -- KOTLIN ADDITIONAL START --
|
||||
TestApplicationUtilKt.resetApplicationToNull(application);
|
||||
application = null;
|
||||
// -- KOTLIN ADDITIONAL END --
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1181
File diff suppressed because it is too large
Load Diff
@@ -12,6 +12,7 @@ versions.jar.gson=2.8.5
|
||||
versions.jar.oro=2.0.8
|
||||
versions.jar.picocontainer=1.2
|
||||
versions.jar.serviceMessages=2019.1.4
|
||||
versions.jar.lz4-java=1.6.0
|
||||
ignore.jar.snappy-in-java=true
|
||||
versions.gradle-api=4.5.1
|
||||
versions.shadow=5.2.0
|
||||
@@ -11,6 +11,7 @@ versions.jar.streamex=0.6.8
|
||||
versions.jar.gson=2.8.5
|
||||
versions.jar.oro=2.0.8
|
||||
versions.jar.picocontainer=1.2
|
||||
versions.jar.lz4-java=1.6.0
|
||||
ignore.jar.snappy-in-java=true
|
||||
versions.gradle-api=4.5.1
|
||||
versions.shadow=5.2.0
|
||||
@@ -1,8 +1,8 @@
|
||||
versions.intellijSdk=201.4515.24-EAP-SNAPSHOT
|
||||
versions.intellijSdk=201.5259.13-EAP-SNAPSHOT
|
||||
versions.androidBuildTools=r23.0.1
|
||||
versions.idea.NodeJS=181.3494.12
|
||||
versions.jar.asm-all=7.0.1
|
||||
versions.jar.guava=27.1-jre
|
||||
versions.jar.guava=28.2-jre
|
||||
versions.jar.groovy-all=2.4.17
|
||||
versions.jar.lombok-ast=0.2.3
|
||||
versions.jar.swingx-core=1.6.2-2
|
||||
@@ -12,6 +12,7 @@ versions.jar.gson=2.8.6
|
||||
versions.jar.oro=2.0.8
|
||||
versions.jar.picocontainer=1.2
|
||||
versions.jar.serviceMessages=2019.1.4
|
||||
versions.jar.lz4-java=1.7.1
|
||||
ignore.jar.snappy-in-java=true
|
||||
versions.gradle-api=4.5.1
|
||||
versions.shadow=5.2.0
|
||||
@@ -13,6 +13,7 @@ versions.jar.streamex=0.6.8
|
||||
versions.jar.gson=2.8.5
|
||||
versions.jar.oro=2.0.8
|
||||
versions.jar.picocontainer=1.2
|
||||
versions.jar.lz4-java=1.6.0
|
||||
ignore.jar.snappy-in-java=true
|
||||
ignore.jar.common=true
|
||||
ignore.jar.lombok-ast=true
|
||||
|
||||
@@ -14,6 +14,7 @@ versions.jar.gson=2.8.5
|
||||
versions.jar.oro=2.0.8
|
||||
versions.jar.picocontainer=1.2
|
||||
versions.jar.serviceMessages=2019.1.4
|
||||
versions.jar.lz4-java=1.6.0
|
||||
ignore.jar.snappy-in-java=true
|
||||
versions.gradle-api=4.5.1
|
||||
versions.shadow=5.2.0
|
||||
|
||||
+2
-2
@@ -162,9 +162,9 @@ class KotlinInlayParameterHintsProvider : InlayParameterHintsProvider {
|
||||
}
|
||||
}
|
||||
|
||||
override fun getParameterHints(element: PsiElement?): List<InlayInfo> {
|
||||
override fun getParameterHints(element: PsiElement): List<InlayInfo> {
|
||||
val resolveToEnabled = HintType.resolveToEnabled(element) ?: return emptyList()
|
||||
return resolveToEnabled.provideHints(element!!)
|
||||
return resolveToEnabled.provideHints(element)
|
||||
}
|
||||
|
||||
override fun getBlackListDependencyLanguage(): Language = JavaLanguage.INSTANCE
|
||||
|
||||
@@ -200,7 +200,7 @@ dependencies {
|
||||
fatJarContents(intellijDep()) { includeJars("jna-platform") }
|
||||
|
||||
if (Platform.P192.orHigher()) {
|
||||
fatJarContents(intellijDep()) { includeJars("lz4-java-1.6.0") }
|
||||
fatJarContents(intellijDep()) { includeJars("lz4-java", rootProject = rootProject) }
|
||||
} else {
|
||||
fatJarContents(intellijDep()) { includeJars("lz4-1.3.0") }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user