azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: rename setIsEnabled->setIsEnabledForJvm

Browse Source
This commit is contained in:
Alexey Tsvetkov
2018-07-19 23:23:48 +03:00
parent 8f002fdb43
commit 3227300f18
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
+2 -2
View File
@@ -88,13 +88,13 @@ object EmptyICReporter : ICReporter {
inline fun <R> withIC(enabled: Boolean = true, fn: ()->R): R { inline fun <R> withIC(enabled: Boolean = true, fn: ()->R): R {
val isEnabledBackup = IncrementalCompilation.isEnabledForJvm() val isEnabledBackup = IncrementalCompilation.isEnabledForJvm()
IncrementalCompilation.setIsEnabled(enabled) IncrementalCompilation.setIsEnabledForJvm(enabled)
try { try {
return fn() return fn()
} }
finally { finally {
IncrementalCompilation.setIsEnabled(isEnabledBackup) IncrementalCompilation.setIsEnabledForJvm(isEnabledBackup)
} }
} }
compiler/util/src/org/jetbrains/kotlin/config/IncrementalCompilation.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class IncrementalCompilation {
} }
@TestOnly @TestOnly
public static void setIsEnabled(boolean value) { public static void setIsEnabledForJvm(boolean value) {
System.setProperty(INCREMENTAL_COMPILATION_JVM_PROPERTY, String.valueOf(value)); System.setProperty(INCREMENTAL_COMPILATION_JVM_PROPERTY, String.valueOf(value));
} }
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+2 -2
View File
@@ -115,7 +115,7 @@ abstract class AbstractIncrementalJpsTest(
super.setUp() super.setUp()
lookupsDuringTest = hashSetOf() lookupsDuringTest = hashSetOf()
isICEnabledBackup = IncrementalCompilation.isEnabledForJvm() isICEnabledBackup = IncrementalCompilation.isEnabledForJvm()
IncrementalCompilation.setIsEnabled(true) IncrementalCompilation.setIsEnabledForJvm(true)
if (DEBUG_LOGGING_ENABLED) { if (DEBUG_LOGGING_ENABLED) {
enableDebugLogging() enableDebugLogging()
@@ -128,7 +128,7 @@ abstract class AbstractIncrementalJpsTest(
(AbstractIncrementalJpsTest::projectDescriptor).javaField!![this] = null (AbstractIncrementalJpsTest::projectDescriptor).javaField!![this] = null
(AbstractIncrementalJpsTest::systemPropertiesBackup).javaField!![this] = null (AbstractIncrementalJpsTest::systemPropertiesBackup).javaField!![this] = null
lookupsDuringTest.clear() lookupsDuringTest.clear()
IncrementalCompilation.setIsEnabled(isICEnabledBackup) IncrementalCompilation.setIsEnabledForJvm(isICEnabledBackup)
super.tearDown() super.tearDown()
} }
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.173
+3 -3
View File
@@ -114,8 +114,8 @@ abstract class AbstractIncrementalJpsTest(
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
lookupsDuringTest = hashSetOf() lookupsDuringTest = hashSetOf()
isICEnabledBackup = IncrementalCompilation.isEnabled() isICEnabledBackup = IncrementalCompilation.isEnabledForJvm()
IncrementalCompilation.setIsEnabled(true) IncrementalCompilation.setIsEnabledForJvm(true)
if (DEBUG_LOGGING_ENABLED) { if (DEBUG_LOGGING_ENABLED) {
enableDebugLogging() enableDebugLogging()
@@ -128,7 +128,7 @@ abstract class AbstractIncrementalJpsTest(
(AbstractIncrementalJpsTest::projectDescriptor).javaField!![this] = null (AbstractIncrementalJpsTest::projectDescriptor).javaField!![this] = null
(AbstractIncrementalJpsTest::systemPropertiesBackup).javaField!![this] = null (AbstractIncrementalJpsTest::systemPropertiesBackup).javaField!![this] = null
lookupsDuringTest.clear() lookupsDuringTest.clear()
IncrementalCompilation.setIsEnabled(isICEnabledBackup) IncrementalCompilation.setIsEnabledForJvm(isICEnabledBackup)
super.tearDown() super.tearDown()
} }
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt
+3 -3
View File
@@ -41,11 +41,11 @@ abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest()
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
isICEnabledBackup = IncrementalCompilation.isEnabledForJvm() isICEnabledBackup = IncrementalCompilation.isEnabledForJvm()
IncrementalCompilation.setIsEnabled(true) IncrementalCompilation.setIsEnabledForJvm(true)
} }
override fun tearDown() { override fun tearDown() {
IncrementalCompilation.setIsEnabled(isICEnabledBackup) IncrementalCompilation.setIsEnabledForJvm(isICEnabledBackup)
super.tearDown() super.tearDown()
} }
@@ -67,7 +67,7 @@ abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest()
when { when {
name.endsWith("incremental-compilation") -> { name.endsWith("incremental-compilation") -> {
IncrementalCompilation.setIsEnabled(modification.dataFile.readAsBool()) IncrementalCompilation.setIsEnabledForJvm(modification.dataFile.readAsBool())
} }
} }
} }
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
+2 -2
View File
@@ -164,11 +164,11 @@ abstract class AbstractLookupTrackerTest : TestWithWorkingDir() {
srcDir = File(workingDir, "src").apply { mkdirs() } srcDir = File(workingDir, "src").apply { mkdirs() }
outDir = File(workingDir, "out") outDir = File(workingDir, "out")
isICEnabledBackup = IncrementalCompilation.isEnabledForJvm() isICEnabledBackup = IncrementalCompilation.isEnabledForJvm()
IncrementalCompilation.setIsEnabled(true) IncrementalCompilation.setIsEnabledForJvm(true)
} }
override fun tearDown() { override fun tearDown() {
IncrementalCompilation.setIsEnabled(isICEnabledBackup) IncrementalCompilation.setIsEnabledForJvm(isICEnabledBackup)
super.tearDown() super.tearDown()
} }
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestIncremental.kt
+2 -2
View File
@@ -36,11 +36,11 @@ class KotlinJpsBuildTestIncremental : KotlinJpsBuildTest() {
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
isICEnabledBackup = IncrementalCompilation.isEnabledForJvm() isICEnabledBackup = IncrementalCompilation.isEnabledForJvm()
IncrementalCompilation.setIsEnabled(true) IncrementalCompilation.setIsEnabledForJvm(true)
} }
override fun tearDown() { override fun tearDown() {
IncrementalCompilation.setIsEnabled(isICEnabledBackup) IncrementalCompilation.setIsEnabledForJvm(isICEnabledBackup)
super.tearDown() super.tearDown()
} }