From 74b189fa5438d8b67b1fd6649b31b164c345ee50 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Mon, 25 May 2020 11:13:21 +0300 Subject: [PATCH] idea.core.script.ucache: remove cyrilic "c" in package name --- .../configuration/CompositeScriptConfigurationManager.kt | 4 ++-- .../idea/core/script/configuration/DefaultScriptingSupport.kt | 2 +- .../kotlin/idea/core/script/configuration/ScriptingSupport.kt | 4 ++-- .../core/script/{uсache => ucache}/ScriptClassRootsBuilder.kt | 2 +- .../core/script/{uсache => ucache}/ScriptClassRootsCache.kt | 2 +- .../core/script/{uсache => ucache}/ScriptClassRootsUpdater.kt | 2 +- .../kotlin/idea/core/script/{uсache => ucache}/ScriptSdks.kt | 2 +- .../idea/core/script/{uсache => ucache}/ScriptSdksBuilder.kt | 2 +- .../kotlin/idea/scripting/gradle/roots/GradleBuildRoot.kt | 2 +- .../idea/scripting/gradle/roots/GradleBuildRootsManager.kt | 2 +- .../kotlin/idea/scripting/gradle/roots/GradleScriptInfo.kt | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/{uсache => ucache}/ScriptClassRootsBuilder.kt (98%) rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/{uсache => ucache}/ScriptClassRootsCache.kt (99%) rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/{uсache => ucache}/ScriptClassRootsUpdater.kt (99%) rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/{uсache => ucache}/ScriptSdks.kt (97%) rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/{uсache => ucache}/ScriptSdksBuilder.kt (98%) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/CompositeScriptConfigurationManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/CompositeScriptConfigurationManager.kt index dc675da879e..1e37203afe8 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/CompositeScriptConfigurationManager.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/CompositeScriptConfigurationManager.kt @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesModificationTracker import org.jetbrains.kotlin.idea.core.script.configuration.listener.ScriptChangesNotifier import org.jetbrains.kotlin.idea.core.script.configuration.utils.getKtFile -import org.jetbrains.kotlin.idea.core.script.uсache.ScriptClassRootsCache -import org.jetbrains.kotlin.idea.core.script.uсache.ScriptClassRootsUpdater +import org.jetbrains.kotlin.idea.core.script.ucache.ScriptClassRootsCache +import org.jetbrains.kotlin.idea.core.script.ucache.ScriptClassRootsUpdater import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptingSupport.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptingSupport.kt index a76c41fbe3a..a400e249b9c 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptingSupport.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptingSupport.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.core.script.configuration.loader.DefaultScriptC import org.jetbrains.kotlin.idea.core.script.configuration.loader.ScriptConfigurationLoader import org.jetbrains.kotlin.idea.core.script.configuration.loader.ScriptConfigurationLoadingContext import org.jetbrains.kotlin.idea.core.script.configuration.loader.ScriptOutsiderFileConfigurationLoader -import org.jetbrains.kotlin.idea.core.script.uсache.ScriptClassRootsBuilder +import org.jetbrains.kotlin.idea.core.script.ucache.ScriptClassRootsBuilder import org.jetbrains.kotlin.idea.core.script.configuration.utils.ScriptClassRootsStorage import org.jetbrains.kotlin.idea.core.script.configuration.utils.* import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/ScriptingSupport.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/ScriptingSupport.kt index 1992983e9a2..ef3f31a0956 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/ScriptingSupport.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/ScriptingSupport.kt @@ -7,9 +7,9 @@ package org.jetbrains.kotlin.idea.core.script.configuration import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.kotlin.idea.core.script.uсache.ScriptClassRootsCache +import org.jetbrains.kotlin.idea.core.script.ucache.ScriptClassRootsCache import org.jetbrains.kotlin.idea.core.script.configuration.listener.ScriptChangeListener -import org.jetbrains.kotlin.idea.core.script.uсache.ScriptClassRootsBuilder +import org.jetbrains.kotlin.idea.core.script.ucache.ScriptClassRootsBuilder import org.jetbrains.kotlin.psi.KtFile /** diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptClassRootsBuilder.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsBuilder.kt similarity index 98% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptClassRootsBuilder.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsBuilder.kt index d2fe2aba871..370898d6c25 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptClassRootsBuilder.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsBuilder.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.core.script.uсache +package org.jetbrains.kotlin.idea.core.script.ucache import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptClassRootsCache.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsCache.kt similarity index 99% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptClassRootsCache.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsCache.kt index 7853782d33c..5af7e4b3974 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptClassRootsCache.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsCache.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.core.script.uсache +package org.jetbrains.kotlin.idea.core.script.ucache import com.intellij.openapi.project.Project import com.intellij.openapi.projectRoots.Sdk diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptClassRootsUpdater.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt similarity index 99% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptClassRootsUpdater.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt index 7c4470857cc..0813cab8cce 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptClassRootsUpdater.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.core.script.uсache +package org.jetbrains.kotlin.idea.core.script.ucache import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer import com.intellij.openapi.application.ApplicationManager diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptSdks.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptSdks.kt similarity index 97% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptSdks.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptSdks.kt index 6c88c91ec01..53ea347e076 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptSdks.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptSdks.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.core.script.uсache +package org.jetbrains.kotlin.idea.core.script.ucache import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.project.Project diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptSdksBuilder.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptSdksBuilder.kt similarity index 98% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptSdksBuilder.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptSdksBuilder.kt index 81dab96223e..ab3fb3bbf47 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/uсache/ScriptSdksBuilder.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptSdksBuilder.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.core.script.uсache +package org.jetbrains.kotlin.idea.core.script.ucache import com.intellij.openapi.project.Project import com.intellij.openapi.projectRoots.JavaSdkType diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRoot.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRoot.kt index 16ad04b45c6..d6dfa80232a 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRoot.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRoot.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.scripting.gradle.roots import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.kotlin.idea.core.script.uсache.ScriptClassRootsBuilder +import org.jetbrains.kotlin.idea.core.script.ucache.ScriptClassRootsBuilder import org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptDefinitionsContributor import org.jetbrains.kotlin.idea.scripting.gradle.LastModifiedFiles import org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslScriptModel diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt index b6ae1cd11f5..e63bf8c67ca 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt @@ -20,7 +20,7 @@ import kotlinx.coroutines.launch import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.core.script.configuration.CompositeScriptConfigurationManager import org.jetbrains.kotlin.idea.core.script.configuration.ScriptingSupport -import org.jetbrains.kotlin.idea.core.script.uсache.ScriptClassRootsBuilder +import org.jetbrains.kotlin.idea.core.script.ucache.ScriptClassRootsBuilder import org.jetbrains.kotlin.idea.core.util.EDT import org.jetbrains.kotlin.idea.scripting.gradle.* import org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslGradleBuildSync diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleScriptInfo.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleScriptInfo.kt index 257d807d895..5e830fd424b 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleScriptInfo.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleScriptInfo.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.idea.scripting.gradle.roots import com.intellij.openapi.vfs.VfsUtil -import org.jetbrains.kotlin.idea.core.script.uсache.ScriptClassRootsCache +import org.jetbrains.kotlin.idea.core.script.ucache.ScriptClassRootsCache import org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslScriptModel import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper