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

Minor: isScriptDependenciesUpdaterDisabled -> isScriptChangesNotifierDisabled

Browse Source
This commit is contained in:
Sergey Rostov
2019-11-04 18:24:41 +03:00
committed by Natalia Selezneva
parent 61b17de625
commit 789ad23e8d
8 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/listener/ScriptChangesNotifier.kt
+2 -3
View File
@@ -17,8 +17,7 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.PsiManager import com.intellij.psi.PsiManager
import com.intellij.util.Alarm import com.intellij.util.Alarm
import org.jetbrains.kotlin.idea.core.script.configuration.DefaultScriptConfigurationManager import org.jetbrains.kotlin.idea.core.script.isScriptChangesNotifierDisabled
import org.jetbrains.kotlin.idea.core.script.isScriptDependenciesUpdaterDisabled
import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.scripting.definitions.isNonScript import org.jetbrains.kotlin.scripting.definitions.isNonScript
@@ -76,7 +75,7 @@ internal class ScriptChangesNotifier(
if ( if (
ApplicationManager.getApplication().isUnitTestMode && ApplicationManager.getApplication().isUnitTestMode &&
ApplicationManager.getApplication().isScriptDependenciesUpdaterDisabled == true ApplicationManager.getApplication().isScriptChangesNotifierDisabled == true
) { ) {
return null return null
} }
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/scriptUtils.kt
+2 -2
View File
@@ -13,8 +13,8 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.NotNullableUserDataProperty import org.jetbrains.kotlin.psi.NotNullableUserDataProperty
@set: org.jetbrains.annotations.TestOnly @set: org.jetbrains.annotations.TestOnly
var Application.isScriptDependenciesUpdaterDisabled by NotNullableUserDataProperty( var Application.isScriptChangesNotifierDisabled by NotNullableUserDataProperty(
Key.create("SCRIPT_DEPENDENCIES_UPDATER_DISABLED"), Key.create("SCRIPT_CHANGES_NOTIFIER_DISABLED"),
false false
) )
idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt
+3 -3
View File
@@ -22,7 +22,7 @@ import junit.framework.TestCase
import org.jetbrains.kotlin.formatter.FormatSettingsUtil import org.jetbrains.kotlin.formatter.FormatSettingsUtil
import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinDeclarationMover import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinDeclarationMover
import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinExpressionMover import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinExpressionMover
import org.jetbrains.kotlin.idea.core.script.isScriptDependenciesUpdaterDisabled import org.jetbrains.kotlin.idea.core.script.isScriptChangesNotifierDisabled
import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestUtils
import java.io.File import java.io.File
@@ -59,11 +59,11 @@ abstract class AbstractMoveLeftRightTest : AbstractCodeMoverTest() {
abstract class AbstractCodeMoverTest : LightCodeInsightTestCase() { abstract class AbstractCodeMoverTest : LightCodeInsightTestCase() {
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
ApplicationManager.getApplication().isScriptDependenciesUpdaterDisabled = true ApplicationManager.getApplication().isScriptChangesNotifierDisabled = true
} }
override fun tearDown() { override fun tearDown() {
ApplicationManager.getApplication().isScriptDependenciesUpdaterDisabled = false ApplicationManager.getApplication().isScriptChangesNotifierDisabled = false
super.tearDown() super.tearDown()
} }
idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt.191
+3 -3
View File
@@ -22,7 +22,7 @@ import junit.framework.TestCase
import org.jetbrains.kotlin.formatter.FormatSettingsUtil import org.jetbrains.kotlin.formatter.FormatSettingsUtil
import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinDeclarationMover import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinDeclarationMover
import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinExpressionMover import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinExpressionMover
import org.jetbrains.kotlin.idea.core.script.isScriptDependenciesUpdaterDisabled import org.jetbrains.kotlin.idea.core.script.isScriptChangesNotifierDisabled
import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestUtils
import java.io.File import java.io.File
@@ -59,11 +59,11 @@ abstract class AbstractMoveLeftRightTest : AbstractCodeMoverTest() {
abstract class AbstractCodeMoverTest : LightCodeInsightTestCase() { abstract class AbstractCodeMoverTest : LightCodeInsightTestCase() {
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
ApplicationManager.getApplication().isScriptDependenciesUpdaterDisabled = true ApplicationManager.getApplication().isScriptChangesNotifierDisabled = true
} }
override fun tearDown() { override fun tearDown() {
ApplicationManager.getApplication().isScriptDependenciesUpdaterDisabled = false ApplicationManager.getApplication().isScriptChangesNotifierDisabled = false
super.tearDown() super.tearDown()
} }
idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt.193
+3 -3
View File
@@ -22,7 +22,7 @@ import junit.framework.TestCase
import org.jetbrains.kotlin.formatter.FormatSettingsUtil import org.jetbrains.kotlin.formatter.FormatSettingsUtil
import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinDeclarationMover import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinDeclarationMover
import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinExpressionMover import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinExpressionMover
import org.jetbrains.kotlin.idea.core.script.isScriptDependenciesUpdaterDisabled import org.jetbrains.kotlin.idea.core.script.isScriptChangesNotifierDisabled
import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestUtils
import java.io.File import java.io.File
@@ -59,11 +59,11 @@ abstract class AbstractMoveLeftRightTest : AbstractCodeMoverTest() {
abstract class AbstractCodeMoverTest : LightCodeInsightTestCase() { abstract class AbstractCodeMoverTest : LightCodeInsightTestCase() {
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
ApplicationManager.getApplication().isScriptDependenciesUpdaterDisabled = true ApplicationManager.getApplication().isScriptChangesNotifierDisabled = true
} }
override fun tearDown() { override fun tearDown() {
ApplicationManager.getApplication().isScriptDependenciesUpdaterDisabled = false ApplicationManager.getApplication().isScriptChangesNotifierDisabled = false
super.tearDown() super.tearDown()
} }
idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java
+2 -2
View File
@@ -42,12 +42,12 @@ public abstract class AbstractConfigureProjectByChangingFileTest<C extends Kotli
ApplicationManager.getApplication().runWriteAction( ApplicationManager.getApplication().runWriteAction(
() -> FileTypeManager.getInstance().associateExtension(GroovyFileType.GROOVY_FILE_TYPE, "gradle") () -> FileTypeManager.getInstance().associateExtension(GroovyFileType.GROOVY_FILE_TYPE, "gradle")
); );
ScriptUtilsKt.setScriptDependenciesUpdaterDisabled(ApplicationManager.getApplication(), true); ScriptUtilsKt.setScriptChangesNotifierDisabled(ApplicationManager.getApplication(), true);
} }
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
ScriptUtilsKt.setScriptDependenciesUpdaterDisabled(ApplicationManager.getApplication(), false); ScriptUtilsKt.setScriptChangesNotifierDisabled(ApplicationManager.getApplication(), false);
moduleInfoFile = null; moduleInfoFile = null;
super.tearDown(); super.tearDown();
} }
idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java.193
+2 -2
View File
@@ -41,12 +41,12 @@ public abstract class AbstractConfigureProjectByChangingFileTest<C extends Kotli
ApplicationManager.getApplication().runWriteAction( ApplicationManager.getApplication().runWriteAction(
() -> FileTypeManager.getInstance().associateExtension(GroovyFileType.GROOVY_FILE_TYPE, "gradle") () -> FileTypeManager.getInstance().associateExtension(GroovyFileType.GROOVY_FILE_TYPE, "gradle")
); );
ScriptUtilsKt.setScriptDependenciesUpdaterDisabled(ApplicationManager.getApplication(), true); ScriptUtilsKt.setScriptChangesNotifierDisabled(ApplicationManager.getApplication(), true);
} }
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
ScriptUtilsKt.setScriptDependenciesUpdaterDisabled(ApplicationManager.getApplication(), false); ScriptUtilsKt.setScriptChangesNotifierDisabled(ApplicationManager.getApplication(), false);
moduleInfoFile = null; moduleInfoFile = null;
super.tearDown(); super.tearDown();
} }
idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
+3 -5
View File
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.idea.script package org.jetbrains.kotlin.idea.script
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.extensions.Extensions
import com.intellij.openapi.module.JavaModuleType import com.intellij.openapi.module.JavaModuleType
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.projectRoots.ProjectJdkTable import com.intellij.openapi.projectRoots.ProjectJdkTable
@@ -18,7 +17,6 @@ import com.intellij.openapi.vfs.LocalFileSystem
import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VfsUtil
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import com.intellij.testFramework.PlatformTestCase import com.intellij.testFramework.PlatformTestCase
import com.intellij.testFramework.PlatformTestUtil
import com.intellij.testFramework.PsiTestUtil import com.intellij.testFramework.PsiTestUtil
import com.intellij.util.ui.UIUtil import com.intellij.util.ui.UIUtil
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
@@ -27,7 +25,7 @@ import org.jetbrains.kotlin.idea.core.script.IdeScriptReportSink
import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager.Companion.updateScriptDependenciesSynchronously import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager.Companion.updateScriptDependenciesSynchronously
import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionContributor import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionContributor
import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionsManager import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionsManager
import org.jetbrains.kotlin.idea.core.script.isScriptDependenciesUpdaterDisabled import org.jetbrains.kotlin.idea.core.script.isScriptChangesNotifierDisabled
import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingUtil import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingUtil
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.idea.util.application.runWriteAction
@@ -140,11 +138,11 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() {
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
ApplicationManager.getApplication().isScriptDependenciesUpdaterDisabled = true ApplicationManager.getApplication().isScriptChangesNotifierDisabled = true
} }
override fun tearDown() { override fun tearDown() {
ApplicationManager.getApplication().isScriptDependenciesUpdaterDisabled = false ApplicationManager.getApplication().isScriptChangesNotifierDisabled = false
System.setProperty("kotlin.script.classpath", oldScripClasspath ?: "") System.setProperty("kotlin.script.classpath", oldScripClasspath ?: "")