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

Move common idea and compiler parts of the scripting plugin to the new jar

Browse Source
This commit is contained in:
Ilya Chernikov
2019-03-20 19:29:18 +01:00
parent af63fcb3be
commit c56382a62b
54 changed files with 141 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt
+1 -1
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.idea.util.isInSourceContentWithoutInjected
import org.jetbrains.kotlin.idea.util.isKotlinBinary
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.scriptDefinitionByFileName
import org.jetbrains.kotlin.scripting.shared.definitions.scriptDefinitionByFileName
import org.jetbrains.kotlin.utils.addIfNotNull
import org.jetbrains.kotlin.utils.sure
import org.jetbrains.kotlin.utils.yieldIfNotNull
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java
+1 -1
View File
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.KtPsiFactoryKt;
import org.jetbrains.kotlin.resolve.TargetPlatform;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.script.KotlinScriptDefinition;
import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.DefinitionsKt;
import org.jetbrains.kotlin.scripting.shared.definitions.DefinitionsKt;
public class TargetPlatformDetector {
public static final TargetPlatformDetector INSTANCE = new TargetPlatformDetector();
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt
+1 -1
View File
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.idea.util.compat.psiSearchHelperInstance
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtNamedDeclaration
import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.findScriptDefinition
import org.jetbrains.kotlin.scripting.shared.definitions.findScriptDefinition
import org.jetbrains.kotlin.types.expressions.OperatorConventions
import java.util.*
idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager
import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType
import org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptMetaFileType
import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.findScriptDefinition
import org.jetbrains.kotlin.scripting.shared.definitions.findScriptDefinition
import kotlin.script.experimental.location.ScriptExpectedLocation
abstract class KotlinBinaryExtension(val fileType: FileType) {