Refactor: Move TargetPlatform to frontend, make it expose platform dependant resolve services

AdditionalCheckerProvider -> PlatformConfigurator which operates directly on container

idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt

@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.resolve.lazy
 
-import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.analyzer.computeTypeInContext
 import org.jetbrains.kotlin.cfg.JetFlowInformationProvider
 import org.jetbrains.kotlin.container.get
@@ -26,20 +25,17 @@ import org.jetbrains.kotlin.context.withProject
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.frontend.di.createContainerForBodyResolve
-import org.jetbrains.kotlin.resolve.util.getScopeAndDataFlowForAnalyzeFragment
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 import org.jetbrains.kotlin.resolve.*
-import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
 import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor
 import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyPackageDescriptor
-import org.jetbrains.kotlin.resolve.scopes.ChainedScope
 import org.jetbrains.kotlin.resolve.scopes.JetScope
-import org.jetbrains.kotlin.types.DynamicTypesSettings
+import org.jetbrains.kotlin.resolve.util.getScopeAndDataFlowForAnalyzeFragment
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 
@@ -392,9 +388,10 @@ public abstract class ElementResolver protected constructor(
     ): BodyResolver {
         val globalContext = SimpleGlobalContext(resolveSession.getStorageManager(), resolveSession.getExceptionTracker())
         val module = resolveSession.getModuleDescriptor()
+        val targetPlatform = getTargetPlatform(file)
         return createContainerForBodyResolve(
                 globalContext.withProject(file.getProject()).withModule(module),
-                trace, createAdditionalCheckerProvider(file, module), statementFilter, getDynamicTypesSettings(file)
+                trace, targetPlatform.platformConfigurator, statementFilter, targetPlatform.dynamicTypesSettings
         ).get<BodyResolver>()
     }
 
@@ -466,9 +463,7 @@ public abstract class ElementResolver protected constructor(
         return null
     }
 
-    protected abstract fun createAdditionalCheckerProvider(file: JetFile, module: ModuleDescriptor): AdditionalCheckerProvider
-
-    protected abstract fun getDynamicTypesSettings(file: JetFile): DynamicTypesSettings
+    protected abstract fun getTargetPlatform(file: JetFile): TargetPlatform
 
     private class BodyResolveContextForLazy(
             private val topDownAnalysisMode: TopDownAnalysisMode,

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt

@@ -19,17 +19,18 @@ package org.jetbrains.kotlin.idea.caches.resolve
 import com.intellij.openapi.project.Project
 import com.intellij.psi.*
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.idea.project.TargetPlatform
 import org.jetbrains.kotlin.load.java.sources.JavaSourceElement
 import org.jetbrains.kotlin.load.java.structure.*
 import org.jetbrains.kotlin.load.java.structure.impl.*
 import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.TargetPlatform
 import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver
 import org.jetbrains.kotlin.resolve.jvm.JvmResolverForModule
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 import org.jetbrains.kotlin.resolve.scopes.JetScope
 
 public object JavaResolveExtension : CacheExtension<(PsiElement) -> Pair<JavaDescriptorResolver, BindingContext>> {
-    override val platform: TargetPlatform = TargetPlatform.JVM
+    override val platform: TargetPlatform = JvmPlatform
 
     override fun getData(resolverProvider: ModuleResolverProvider): (PsiElement) -> Pair<JavaDescriptorResolver, BindingContext> {
         return {

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt

@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.frontend.di.createLazyResolveSession
 import org.jetbrains.kotlin.idea.framework.KotlinJavaScriptLibraryDetectionUtil
 import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS
-import org.jetbrains.kotlin.js.resolve.KotlinJsCheckerProvider
+import org.jetbrains.kotlin.js.resolve.JsPlatformConfigurator
 import org.jetbrains.kotlin.resolve.BindingTraceContext
 import org.jetbrains.kotlin.resolve.lazy.ResolveSession
 import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService
@@ -57,7 +57,7 @@ public object JsAnalyzerFacade : AnalyzerFacade<JsResolverForModule, PlatformAna
         )
 
         val resolveSession = createLazyResolveSession(
-                moduleContext, declarationProviderFactory, BindingTraceContext(), KotlinJsCheckerProvider, DynamicTypesAllowed()
+                moduleContext, declarationProviderFactory, BindingTraceContext(), JsPlatformConfigurator, DynamicTypesAllowed()
         )
         var packageFragmentProvider = resolveSession.getPackageFragmentProvider()
 

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt

@@ -29,17 +29,13 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.idea.project.AnalyzerFacadeProvider
 import org.jetbrains.kotlin.idea.project.ResolveSessionForBodies
-import org.jetbrains.kotlin.idea.project.TargetPlatform
-import org.jetbrains.kotlin.idea.project.TargetPlatform.JS
-import org.jetbrains.kotlin.idea.project.TargetPlatform.JVM
 import org.jetbrains.kotlin.idea.project.TargetPlatformDetector
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
+import org.jetbrains.kotlin.js.resolve.JsPlatform
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.resolve.BindingTraceContext
-import org.jetbrains.kotlin.resolve.ImportPath
-import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver
+import org.jetbrains.kotlin.resolve.*
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.scopes.JetScope
 import org.jetbrains.kotlin.utils.keysToMap
@@ -80,7 +76,7 @@ public class KotlinCacheService(val project: Project) {
         CachedValueProvider.Result.create(moduleResolverProvider, allDependencies)
     }
 
-    private val globalCachesPerPlatform = listOf(JVM, JS).keysToMap { platform -> GlobalCache(platform) }
+    private val globalCachesPerPlatform = listOf(JvmPlatform, JsPlatform).keysToMap { platform -> GlobalCache(platform) }
 
     private inner class GlobalCache(platform: TargetPlatform) {
         val librariesCache = KotlinResolveCache(

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt

@@ -37,7 +37,6 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.diagnostics.DiagnosticUtils
 import org.jetbrains.kotlin.frontend.di.createContainerForLazyBodyResolve
 import org.jetbrains.kotlin.idea.project.ResolveSessionForBodies
-import org.jetbrains.kotlin.idea.project.TargetPlatform
 import org.jetbrains.kotlin.idea.project.TargetPlatformDetector
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.*
@@ -233,8 +232,8 @@ private object KotlinResolveDataProvider {
                     moduleContext,
                     resolveSession,
                     trace,
-                    targetPlatform.createAdditionalCheckerProvider(module),
-                    targetPlatform.getDynamicTypesSettings(),
+                    targetPlatform.platformConfigurator,
+                    targetPlatform.dynamicTypesSettings,
                     resolveSession.getBodyResolveCache()
             ).get<LazyTopDownAnalyzerForTopLevel>()
 

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java

@@ -57,9 +57,9 @@ import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.platform.JavaToKotlinClassMap;
 import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider;
 import org.jetbrains.kotlin.resolve.BindingTraceContext;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName;
 import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM;
 import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer;
@@ -254,8 +254,9 @@ public class JetSourceNavigationHelper {
                 newModuleContext,
                 providerFactory,
                 new BindingTraceContext(),
-                AdditionalCheckerProvider.DefaultProvider.INSTANCE$,
-                new DynamicTypesSettings());
+                TargetPlatform.Default.platformConfigurator,
+                new DynamicTypesSettings()
+        );
 
         newModuleContext.initializeModuleContents(resolveSession.getPackageFragmentProvider());
         return resolveSession;

idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java

@@ -24,13 +24,13 @@ import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.asJava.AsJavaPackage;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
-import org.jetbrains.kotlin.idea.project.TargetPlatform;
 import org.jetbrains.kotlin.idea.project.TargetPlatformDetector;
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil;
 import org.jetbrains.kotlin.psi.JetDeclaration;
 import org.jetbrains.kotlin.psi.JetElement;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics;
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 
 import static org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage.getModuleInfo;
 
@@ -41,12 +41,12 @@ public class DuplicateJvmSignatureAnnotator implements Annotator {
         if (!ProjectRootsUtil.isInProjectSource(element)) return;
 
         PsiFile file = element.getContainingFile();
-        if (!(file instanceof JetFile) || TargetPlatformDetector.getPlatform((JetFile) file) != TargetPlatform.JVM) return;
+        if (!(file instanceof JetFile) || TargetPlatformDetector.getPlatform((JetFile) file) != JvmPlatform.INSTANCE$) return;
 
         Diagnostics otherDiagnostics = ResolvePackage.analyzeFully((JetElement) element).getDiagnostics();
         GlobalSearchScope moduleScope = getModuleInfo(element).contentScope();
         Diagnostics diagnostics = AsJavaPackage.getJvmSignatureDiagnostics(element, otherDiagnostics, moduleScope);
-        
+
         if (diagnostics == null) return;
         new JetPsiChecker().annotateElement(element, holder, diagnostics);
     }

idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/AnalyzerFacadeProvider.kt

@@ -17,19 +17,22 @@
 package org.jetbrains.kotlin.idea.project
 
 import org.jetbrains.kotlin.analyzer.AnalyzerFacade
-import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters
 import org.jetbrains.kotlin.analyzer.ResolverForModule
-import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade
 import org.jetbrains.kotlin.idea.caches.resolve.JsAnalyzerFacade
+import org.jetbrains.kotlin.js.resolve.JsPlatform
+import org.jetbrains.kotlin.resolve.TargetPlatform
+import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade
+import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 
 public object AnalyzerFacadeProvider {
     //NOTE: it's convenient that JS backend doesn't have platform parameters (for now)
     // otherwise we would be forced to add casts on the call site of setupResolverForProject
     public fun getAnalyzerFacade(targetPlatform: TargetPlatform): AnalyzerFacade<out ResolverForModule, JvmPlatformParameters> {
         return when (targetPlatform) {
-            TargetPlatform.JVM -> JvmAnalyzerFacade
-            TargetPlatform.JS -> JsAnalyzerFacade
-            else -> throw IllegalArgumentException("Unsupported platfrom: $targetPlatform")
+            JvmPlatform -> JvmAnalyzerFacade
+            JsPlatform -> JsAnalyzerFacade
+            else -> throw IllegalArgumentException("Unsupported platform: $targetPlatform")
         }
     }
 }

idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt

@@ -22,15 +22,14 @@ import com.intellij.psi.util.CachedValueProvider
 import com.intellij.psi.util.CachedValuesManager
 import com.intellij.psi.util.PsiModificationTracker
 import com.intellij.util.containers.ContainerUtil
-import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.idea.stubindex.JetProbablyNothingFunctionShortNameIndex
 import org.jetbrains.kotlin.idea.stubindex.JetProbablyNothingPropertyShortNameIndex
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.BodyResolveCache
 import org.jetbrains.kotlin.resolve.StatementFilter
+import org.jetbrains.kotlin.resolve.TargetPlatform
 import org.jetbrains.kotlin.resolve.lazy.*
-import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull
 
 public class ResolveElementCache(resolveSession: ResolveSession, private val project: Project) : ElementResolver(resolveSession), BodyResolveCache {
     // Recreate internal cache after change of modification count
@@ -76,7 +75,8 @@ public class ResolveElementCache(resolveSession: ResolveSession, private val pro
 
                 val (bindingContext, statementFilter) = performElementAdditionalResolve(resolveElement, contextElement, BodyResolveMode.PARTIAL)
 
-                if (statementFilter == StatementFilter.NONE) { // partial resolve is not supported for the given declaration - full resolve performed instead
+                if (statementFilter == StatementFilter.NONE) {
+                    // partial resolve is not supported for the given declaration - full resolve performed instead
                     fullResolveMap[resolveElement] = bindingContext
                     return bindingContext
                 }
@@ -102,11 +102,7 @@ public class ResolveElementCache(resolveSession: ResolveSession, private val pro
         }
     }
 
-    override fun createAdditionalCheckerProvider(file: JetFile, module: ModuleDescriptor)
-            = TargetPlatformDetector.getPlatform(file).createAdditionalCheckerProvider(module)
-
-    override fun getDynamicTypesSettings(file: JetFile)
-            = TargetPlatformDetector.getPlatform(file).getDynamicTypesSettings()
+    override fun getTargetPlatform(file: JetFile): TargetPlatform = TargetPlatformDetector.getPlatform(file)
 
     override fun probablyNothingCallableNames(): ProbablyNothingCallableNames {
         return object : ProbablyNothingCallableNames {

idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatform.java

@@ -1,49 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.idea.project;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.descriptors.ModuleDescriptor;
-import org.jetbrains.kotlin.js.resolve.KotlinJsCheckerProvider;
-import org.jetbrains.kotlin.load.kotlin.KotlinJvmCheckerProvider;
-import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider;
-import org.jetbrains.kotlin.types.DynamicTypesAllowed;
-import org.jetbrains.kotlin.types.DynamicTypesSettings;
-
-public interface TargetPlatform {
-    @NotNull
-    AdditionalCheckerProvider createAdditionalCheckerProvider(@NotNull ModuleDescriptor module);
-
-    @NotNull
-    DynamicTypesSettings getDynamicTypesSettings();
-
-    TargetPlatform JVM = new TargetPlatformImpl("JVM", new DynamicTypesSettings()) {
-        @NotNull
-        @Override
-        public AdditionalCheckerProvider createAdditionalCheckerProvider(@NotNull ModuleDescriptor module) {
-            return new KotlinJvmCheckerProvider(module);
-        }
-    };
-
-    TargetPlatform JS = new TargetPlatformImpl("JS", new DynamicTypesAllowed()) {
-        @NotNull
-        @Override
-        public AdditionalCheckerProvider createAdditionalCheckerProvider(@NotNull ModuleDescriptor module) {
-            return KotlinJsCheckerProvider.INSTANCE$;
-        }
-    };
-}

idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java

@@ -21,7 +21,10 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.js.resolve.JsPlatform;
 import org.jetbrains.kotlin.psi.JetFile;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 
 public class TargetPlatformDetector {
     public static final TargetPlatformDetector INSTANCE = new TargetPlatformDetector();
@@ -47,14 +50,14 @@ public class TargetPlatformDetector {
     @NotNull
     public static TargetPlatform getPlatform(@NotNull Module module) {
         if (ProjectStructureUtil.isJsKotlinModule(module)) {
-            return TargetPlatform.JS;
+            return JsPlatform.INSTANCE$;
         }
-        return TargetPlatform.JVM;
+        return JvmPlatform.INSTANCE$;
     }
 
     @NotNull
     public static TargetPlatform getDefaultPlatform() {
         LOG.info("Using default platform");
-        return TargetPlatform.JVM;
+        return JvmPlatform.INSTANCE$;
     }
 }

idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformImpl.java

@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.idea.project;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.types.DynamicTypesSettings;
-
-public abstract class TargetPlatformImpl implements TargetPlatform {
-    private final String platformName;
-    private final DynamicTypesSettings dynamicTypesSettings;
-
-    public TargetPlatformImpl(@NotNull String platformName, @NotNull DynamicTypesSettings dynamicTypesSettings) {
-        this.platformName = platformName;
-        this.dynamicTypesSettings = dynamicTypesSettings;
-    }
-
-    @NotNull
-    @Override
-    public DynamicTypesSettings getDynamicTypesSettings() {
-        return dynamicTypesSettings;
-    }
-
-    @Override
-    public String toString() {
-        return platformName;
-    }
-}

idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.java

@@ -44,10 +44,10 @@ import org.jetbrains.kotlin.frontend.di.DiPackage;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;
-import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider;
 import org.jetbrains.kotlin.resolve.BindingTraceContext;
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
 import org.jetbrains.kotlin.resolve.lazy.ResolveSession;
 import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory;
 import org.jetbrains.kotlin.resolve.scopes.JetScope;
@@ -111,7 +111,7 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent {
                         DiPackage.createLazyResolveSession(
                                 newModuleContext,
                                 declarationFactory, new BindingTraceContext(),
-                                AdditionalCheckerProvider.DefaultProvider.INSTANCE$,
+                                TargetPlatform.Default.INSTANCE$.getPlatformConfigurator(),
                                 new DynamicTypesSettings()
                         );
 

idea/idea-completion/idea-completion.iml

@@ -22,5 +22,6 @@
     <orderEntry type="module" module-name="idea" scope="RUNTIME" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="idea-js" scope="TEST" />
+    <orderEntry type="module" module-name="js.frontend" />
   </component>
 </module>

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompiledKotlinInJavaCompletionTest.kt

@@ -17,14 +17,11 @@
 package org.jetbrains.kotlin.idea.completion.test
 
 import com.intellij.codeInsight.completion.CompletionType
-import com.intellij.codeInsight.lookup.LookupElement
-import com.intellij.testFramework.LightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor
-import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
-import org.jetbrains.kotlin.idea.project.TargetPlatform
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 
 public abstract class AbstractCompiledKotlinInJavaCompletionTest : JetFixtureCompletionBaseTestCase() {
-    override fun getPlatform() = TargetPlatform.JVM
+    override fun getPlatform() = JvmPlatform
 
     override fun getProjectDescriptor() = JdkAndMockLibraryProjectDescriptor(COMPLETION_TEST_DATA_BASE_PATH + "/injava/mockLib", false)
 

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJSBasicCompletionTest.java

@@ -21,8 +21,9 @@ import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager;
-import org.jetbrains.kotlin.idea.project.TargetPlatform;
 import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor;
+import org.jetbrains.kotlin.js.resolve.JsPlatform;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
 
 public abstract class AbstractJSBasicCompletionTest extends JetFixtureCompletionBaseTestCase {
     @NotNull
@@ -31,9 +32,10 @@ public abstract class AbstractJSBasicCompletionTest extends JetFixtureCompletion
         return KotlinStdJSProjectDescriptor.Companion.getInstance();
     }
 
+    @NotNull
     @Override
     public TargetPlatform getPlatform() {
-        return TargetPlatform.JS;
+        return JsPlatform.INSTANCE$;
     }
 
     @Override

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmBasicCompletionTest.java

@@ -21,7 +21,8 @@ import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor;
-import org.jetbrains.kotlin.idea.project.TargetPlatform;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 
 public abstract class AbstractJvmBasicCompletionTest extends JetFixtureCompletionBaseTestCase {
     @NotNull
@@ -30,9 +31,10 @@ public abstract class AbstractJvmBasicCompletionTest extends JetFixtureCompletio
         return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
     }
 
+    @NotNull
     @Override
     public TargetPlatform getPlatform() {
-        return TargetPlatform.JVM;
+        return JvmPlatform.INSTANCE$;
     }
 
     @Override

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmSmartCompletionTest.java

@@ -21,7 +21,8 @@ import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor;
-import org.jetbrains.kotlin.idea.project.TargetPlatform;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 
 public abstract class AbstractJvmSmartCompletionTest extends JetFixtureCompletionBaseTestCase {
     @NotNull
@@ -30,9 +31,10 @@ public abstract class AbstractJvmSmartCompletionTest extends JetFixtureCompletio
         return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
     }
 
+    @NotNull
     @Override
     public TargetPlatform getPlatform() {
-        return TargetPlatform.JVM;
+        return JvmPlatform.INSTANCE$;
     }
 
     @Override

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt

@@ -17,11 +17,10 @@
 package org.jetbrains.kotlin.idea.completion.test
 
 import com.intellij.codeInsight.completion.CompletionType
-import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.testFramework.LightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
-import org.jetbrains.kotlin.idea.project.TargetPlatform
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 
 public abstract class AbstractJvmWithLibBasicCompletionTest : JetFixtureCompletionBaseTestCase() {
     private val TEST_PATH = COMPLETION_TEST_DATA_BASE_PATH + "/basic/custom"
@@ -33,7 +32,7 @@ public abstract class AbstractJvmWithLibBasicCompletionTest : JetFixtureCompleti
         return JdkAndMockLibraryProjectDescriptor(TEST_PATH + "/" + getTestName(false) + "Src", false)
     }
 
-    override fun getPlatform() = TargetPlatform.JVM
+    override fun getPlatform() = JvmPlatform
 
     override fun complete(invocationCount: Int) = myFixture.complete(CompletionType.BASIC, invocationCount)
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKeywordCompletionTest.kt

@@ -19,11 +19,11 @@ package org.jetbrains.kotlin.idea.completion.test
 import com.intellij.codeInsight.completion.CompletionType
 import com.intellij.codeInsight.lookup.LookupElement
 import org.jetbrains.kotlin.idea.completion.KeywordLookupObject
-import org.jetbrains.kotlin.idea.project.TargetPlatform
 import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 
 public abstract class AbstractKeywordCompletionTest : JetFixtureCompletionBaseTestCase() {
-    override fun getPlatform() = TargetPlatform.JVM
+    override fun getPlatform() = JvmPlatform
 
     override fun complete(invocationCount: Int): Array<LookupElement>? {
         val items = myFixture.complete(CompletionType.BASIC) ?: return null

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt

@@ -17,20 +17,17 @@
 package org.jetbrains.kotlin.idea.completion.test
 
 import com.intellij.codeInsight.completion.CompletionType
-import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.openapi.util.io.FileUtil
-import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import com.intellij.util.ArrayUtil
 import com.intellij.util.Function
 import com.intellij.util.containers.ContainerUtil
 import junit.framework.TestCase
-import org.jetbrains.kotlin.idea.project.TargetPlatform
-import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 import java.io.File
 
 public abstract class AbstractKotlinSourceInJavaCompletionTest : JetFixtureCompletionBaseTestCase() {
-    override fun getPlatform() = TargetPlatform.JVM
+    override fun getPlatform() = JvmPlatform
 
     override fun doTest(testPath: String) {
         val mockLibDir = File(COMPLETION_TEST_DATA_BASE_PATH + "/injava/mockLib")

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractMultiFileJvmBasicCompletionTest.kt

@@ -16,16 +16,15 @@
 
 package org.jetbrains.kotlin.idea.completion.test
 
-import org.jetbrains.kotlin.idea.project.TargetPlatform
 import org.jetbrains.kotlin.idea.test.AstAccessControl
-import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 
 public abstract class AbstractMultiFileJvmBasicCompletionTest : KotlinCompletionTestCase() {
     protected fun doTest(testPath: String) {
         configureByFile(getTestName(false) + ".kt", "")
         val shouldFail = testPath.contains("NoSpecifiedType")
         AstAccessControl.testWithControlledAccessToAst(shouldFail, getFile().getVirtualFile(), getProject(), getTestRootDisposable(), {
-            testCompletion(getFile().getText(), TargetPlatform.JVM, { invocationCount ->
+            testCompletion(getFile().getText(), JvmPlatform, { invocationCount ->
                 complete(invocationCount)
                 myItems
             }, 0)

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractMultiFileSmartCompletionTest.kt

@@ -17,9 +17,8 @@
 package org.jetbrains.kotlin.idea.completion.test
 
 import com.intellij.codeInsight.completion.CompletionType
-import org.jetbrains.kotlin.idea.project.TargetPlatform
 import org.jetbrains.kotlin.idea.test.AstAccessControl
-import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 
 public abstract class AbstractMultiFileSmartCompletionTest : KotlinCompletionTestCase() {
     override fun setUp() {
@@ -30,7 +29,7 @@ public abstract class AbstractMultiFileSmartCompletionTest : KotlinCompletionTes
     protected fun doTest(testPath: String) {
         configureByFile(getTestName(false) + ".kt", "")
         AstAccessControl.testWithControlledAccessToAst(false, getFile().getVirtualFile(), getProject(), getTestRootDisposable(), {
-            testCompletion(getFile().getText(), TargetPlatform.JVM, { invocationCount ->
+            testCompletion(getFile().getText(), JvmPlatform, { invocationCount ->
                 complete(invocationCount)
                 myItems
             }, 1)

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompletionTestUtil.kt

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test
 
 import com.intellij.codeInsight.CodeInsightSettings
 import com.intellij.codeInsight.lookup.LookupElement
-import org.jetbrains.kotlin.idea.project.TargetPlatform
+import org.jetbrains.kotlin.resolve.TargetPlatform
 import org.jetbrains.kotlin.test.JetTestUtils
 import org.junit.Assert
 

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.java

@@ -31,8 +31,10 @@ import com.intellij.ui.JBColor;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.project.TargetPlatform;
 import org.jetbrains.kotlin.idea.test.AstAccessControl;
+import org.jetbrains.kotlin.js.resolve.JsPlatform;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.junit.Assert;
 
@@ -108,7 +110,7 @@ public class ExpectedCompletionUtils {
         }
     }
 
-    private static final String UNSUPPORTED_PLATFORM_MESSAGE = String.format("Only %s and %s platforms are supported", TargetPlatform.JVM, TargetPlatform.JS);
+    private static final String UNSUPPORTED_PLATFORM_MESSAGE = String.format("Only %s and %s platforms are supported", JvmPlatform.INSTANCE$, JsPlatform.INSTANCE$);
     
     private static final String EXIST_LINE_PREFIX = "EXIST:";
 
@@ -153,10 +155,10 @@ public class ExpectedCompletionUtils {
         if (platform == null) {
             return processProposalAssertions(fileText, EXIST_LINE_PREFIX);
         }
-        else if (platform == TargetPlatform.JVM) {
+        else if (platform == JvmPlatform.INSTANCE$) {
             return processProposalAssertions(fileText, EXIST_LINE_PREFIX, EXIST_JAVA_ONLY_LINE_PREFIX);
         }
-        else if (platform == TargetPlatform.JS) {
+        else if (platform == JsPlatform.INSTANCE$) {
             return processProposalAssertions(fileText, EXIST_LINE_PREFIX, EXIST_JS_ONLY_LINE_PREFIX);
         }
         else {
@@ -169,10 +171,10 @@ public class ExpectedCompletionUtils {
         if (platform == null) {
             return processProposalAssertions(fileText, ABSENT_LINE_PREFIX);
         }
-        else if (platform == TargetPlatform.JVM) {
+        else if (platform == JvmPlatform.INSTANCE$) {
             return processProposalAssertions(fileText, ABSENT_LINE_PREFIX, ABSENT_JAVA_LINE_PREFIX, EXIST_JS_ONLY_LINE_PREFIX);
         }
-        else if (platform == TargetPlatform.JS) {
+        else if (platform == JsPlatform.INSTANCE$) {
             return processProposalAssertions(fileText, ABSENT_LINE_PREFIX, ABSENT_JS_LINE_PREFIX, EXIST_JAVA_ONLY_LINE_PREFIX);
         }
         else {
@@ -206,10 +208,10 @@ public class ExpectedCompletionUtils {
         if (platform == null) {
             return InTextDirectivesUtils.getPrefixedInt(fileText, NUMBER_LINE_PREFIX);
         }
-        else if (platform == TargetPlatform.JVM) {
+        else if (platform == JvmPlatform.INSTANCE$) {
             return getPlatformExpectedNumber(fileText, NUMBER_JAVA_LINE_PREFIX);
         }
-        else if (platform == TargetPlatform.JS) {
+        else if (platform == JsPlatform.INSTANCE$) {
             return getPlatformExpectedNumber(fileText, NUMBER_JS_LINE_PREFIX);
         }
         else {

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JetFixtureCompletionBaseTestCase.kt

@@ -19,8 +19,8 @@ package org.jetbrains.kotlin.idea.completion.test
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.openapi.util.io.FileUtil
 import org.jetbrains.kotlin.idea.caches.resolve.LibraryModificationTracker
-import org.jetbrains.kotlin.idea.project.TargetPlatform
 import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.resolve.TargetPlatform
 import java.io.File
 
 public abstract class JetFixtureCompletionBaseTestCase : JetLightCodeInsightFixtureTestCase() {

idea/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.kt

@@ -19,11 +19,12 @@ package org.jetbrains.kotlin.idea.actions
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import com.intellij.openapi.ui.Messages
 import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator
+import com.intellij.openapi.ui.Messages
 import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils
-import org.jetbrains.kotlin.idea.project.TargetPlatform
+import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator
+import org.jetbrains.kotlin.js.resolve.JsPlatform
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 
 public abstract class ConfigureKotlinInProjectAction : AnAction() {
 
@@ -53,12 +54,12 @@ public abstract class ConfigureKotlinInProjectAction : AnAction() {
 
 public class ConfigureKotlinJsInProjectAction: ConfigureKotlinInProjectAction() {
     override fun getAbleToRunConfigurators(project: Project) = ConfigureKotlinInProjectUtils.getAbleToRunConfigurators(project).filter {
-        it.getTargetPlatform() == TargetPlatform.JS
+        it.getTargetPlatform() == JsPlatform
     }
 }
 
 public class ConfigureKotlinJavaInProjectAction: ConfigureKotlinInProjectAction() {
     override fun getAbleToRunConfigurators(project: Project) = ConfigureKotlinInProjectUtils.getAbleToRunConfigurators(project).filter {
-        it.getTargetPlatform() == TargetPlatform.JVM
+        it.getTargetPlatform() == JvmPlatform
     }
 }

idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java

@@ -19,7 +19,8 @@ package org.jetbrains.kotlin.idea.configuration;
 import com.intellij.openapi.module.Module;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.JetPluginUtil;
-import org.jetbrains.kotlin.idea.project.TargetPlatform;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock;
 
@@ -37,7 +38,7 @@ public class KotlinAndroidGradleModuleConfigurator extends KotlinWithGradleConfi
     @NotNull
     @Override
     public TargetPlatform getTargetPlatform() {
-        return TargetPlatform.JVM;
+        return JvmPlatform.INSTANCE$;
     }
 
     @NotNull

idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java

@@ -19,7 +19,8 @@ package org.jetbrains.kotlin.idea.configuration;
 import com.intellij.openapi.module.Module;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.JetPluginUtil;
-import org.jetbrains.kotlin.idea.project.TargetPlatform;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock;
 
@@ -37,7 +38,7 @@ public class KotlinGradleModuleConfigurator extends KotlinWithGradleConfigurator
     @NotNull
     @Override
     public TargetPlatform getTargetPlatform() {
-        return TargetPlatform.JVM;
+        return JvmPlatform.INSTANCE$;
     }
 
     @NotNull

idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java

@@ -21,7 +21,8 @@ import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.maven.dom.model.MavenDomPlugin;
 import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
-import org.jetbrains.kotlin.idea.project.TargetPlatform;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 
 public class KotlinJavaMavenConfigurator extends KotlinMavenConfigurator {
     private static final String NAME = "maven";
@@ -46,6 +47,6 @@ public class KotlinJavaMavenConfigurator extends KotlinMavenConfigurator {
     @NotNull
     @Override
     public TargetPlatform getTargetPlatform() {
-        return TargetPlatform.JVM;
+        return JvmPlatform.INSTANCE$;
     }
 }

idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java

@@ -26,8 +26,9 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.framework.JavaRuntimeLibraryDescription;
 import org.jetbrains.kotlin.idea.framework.JavaRuntimePresentationProvider;
 import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
-import org.jetbrains.kotlin.idea.project.TargetPlatform;
 import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryCoreUtil;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 import org.jetbrains.kotlin.utils.KotlinPaths;
 import org.jetbrains.kotlin.utils.PathUtil;
 
@@ -78,7 +79,7 @@ public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator
     @NotNull
     @Override
     public TargetPlatform getTargetPlatform() {
-        return TargetPlatform.JVM;
+        return JvmPlatform.INSTANCE$;
     }
 
     @NotNull

idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java

@@ -21,7 +21,8 @@ import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.maven.dom.model.MavenDomPlugin;
 import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
-import org.jetbrains.kotlin.idea.project.TargetPlatform;
+import org.jetbrains.kotlin.js.resolve.JsPlatform;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
 
 public class KotlinJavascriptMavenConfigurator extends KotlinMavenConfigurator {
     private static final String NAME = "js maven";
@@ -61,6 +62,6 @@ public class KotlinJavascriptMavenConfigurator extends KotlinMavenConfigurator {
     @NotNull
     @Override
     public TargetPlatform getTargetPlatform() {
-        return TargetPlatform.JS;
+        return JsPlatform.INSTANCE$;
     }
 }

idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java

@@ -24,8 +24,9 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.framework.JSLibraryStdDescription;
 import org.jetbrains.kotlin.idea.framework.JSLibraryStdPresentationProvider;
 import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
-import org.jetbrains.kotlin.idea.project.TargetPlatform;
 import org.jetbrains.kotlin.js.JavaScript;
+import org.jetbrains.kotlin.js.resolve.JsPlatform;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
 import org.jetbrains.kotlin.utils.KotlinPaths;
 import org.jetbrains.kotlin.utils.PathUtil;
 
@@ -41,7 +42,7 @@ public class KotlinJsModuleConfigurator extends KotlinWithLibraryConfigurator {
     @NotNull
     @Override
     public TargetPlatform getTargetPlatform() {
-        return TargetPlatform.JS;
+        return JsPlatform.INSTANCE$;
     }
 
     @NotNull

idea/src/org/jetbrains/kotlin/idea/configuration/KotlinProjectConfigurator.java

@@ -20,7 +20,7 @@ import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.project.TargetPlatform;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
 
 public interface KotlinProjectConfigurator {
     ExtensionPointName<KotlinProjectConfigurator> EP_NAME = ExtensionPointName.create("org.jetbrains.kotlin.projectConfigurator");

idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt

@@ -19,10 +19,10 @@ package org.jetbrains.kotlin.idea.framework
 import com.intellij.ide.util.projectWizard.JavaModuleBuilder
 import com.intellij.ide.util.projectWizard.ModuleWizardStep
 import com.intellij.ide.util.projectWizard.SettingsStep
-import org.jetbrains.kotlin.idea.JetIcons
-import org.jetbrains.kotlin.idea.project.TargetPlatform
-import com.intellij.openapi.roots.ui.configuration.ModulesProvider
 import com.intellij.ide.util.projectWizard.WizardContext
+import com.intellij.openapi.roots.ui.configuration.ModulesProvider
+import org.jetbrains.kotlin.idea.JetIcons
+import org.jetbrains.kotlin.resolve.TargetPlatform
 
 public class KotlinModuleBuilder(
         val targetPlatform: TargetPlatform, val builderName: String, val builderDescription: String) : JavaModuleBuilder() {

idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleSettingStep.java

@@ -35,7 +35,9 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.project.TargetPlatform;
+import org.jetbrains.kotlin.js.resolve.JsPlatform;
+import org.jetbrains.kotlin.resolve.TargetPlatform;
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 
 import javax.swing.*;
 import java.util.ArrayList;
@@ -98,15 +100,15 @@ public class KotlinModuleSettingStep extends ModuleWizardStep {
 
     @NotNull
     protected String getLibraryLabelText() {
-        if (targetPlatform == TargetPlatform.JVM) return "\u001BKotlin runtime:";
-        if (targetPlatform == TargetPlatform.JS) return "\u001BKotlin JS library:";
+        if (targetPlatform == JvmPlatform.INSTANCE$) return "\u001BKotlin runtime:";
+        if (targetPlatform == JsPlatform.INSTANCE$) return "\u001BKotlin JS library:";
         throw new IllegalStateException("Only JS and JVM target are supported");
     }
 
     @NotNull
     protected CustomLibraryDescription getCustomLibraryDescription(@Nullable Project project) {
-        if (targetPlatform == TargetPlatform.JVM) return new JavaRuntimeLibraryDescription(project);
-        if (targetPlatform == TargetPlatform.JS) return new JSLibraryStdDescription(project);
+        if (targetPlatform == JvmPlatform.INSTANCE$) return new JavaRuntimeLibraryDescription(project);
+        if (targetPlatform == JsPlatform.INSTANCE$) return new JSLibraryStdDescription(project);
         throw new IllegalStateException("Only JS and JVM target are supported");
     }
 

idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt

@@ -20,7 +20,8 @@ import com.intellij.ide.util.projectWizard.WizardContext
 import com.intellij.platform.ProjectTemplatesFactory
 import com.intellij.platform.templates.BuilderBasedTemplate
 import org.jetbrains.kotlin.idea.JetIcons
-import org.jetbrains.kotlin.idea.project.TargetPlatform
+import org.jetbrains.kotlin.js.resolve.JsPlatform
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 
 public class KotlinTemplatesFactory : ProjectTemplatesFactory() {
     companion object {
@@ -31,8 +32,8 @@ public class KotlinTemplatesFactory : ProjectTemplatesFactory() {
     override fun getGroupIcon(group: String) = JetIcons.SMALL_LOGO
 
     override fun createTemplates(group: String?, context: WizardContext?) =
-        arrayOf(
-                BuilderBasedTemplate(KotlinModuleBuilder(TargetPlatform.JVM, "Kotlin - JVM", "Kotlin module for JVM target")),
-                BuilderBasedTemplate(KotlinModuleBuilder(TargetPlatform.JS, "Kotlin - JavaScript", "Kotlin module for JavaScript target"))
-        )
+            arrayOf(
+                    BuilderBasedTemplate(KotlinModuleBuilder(JvmPlatform, "Kotlin - JVM", "Kotlin module for JVM target")),
+                    BuilderBasedTemplate(KotlinModuleBuilder(JsPlatform, "Kotlin - JavaScript", "Kotlin module for JavaScript target"))
+            )
 }

idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt

@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.debugger.evaluate
 
 import com.intellij.codeInsight.completion.CompletionType
 import com.intellij.openapi.module.Module
-import com.intellij.openapi.roots.ContentEntry
 import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.openapi.roots.OrderRootType
 import com.intellij.openapi.vfs.LocalFileSystem
@@ -26,11 +25,11 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiManager
 import org.jetbrains.kotlin.idea.completion.test.AbstractJvmBasicCompletionTest
 import org.jetbrains.kotlin.idea.completion.test.testCompletion
-import org.jetbrains.kotlin.idea.project.TargetPlatform
 import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.psi.JetFunction
 import org.jetbrains.kotlin.psi.JetPsiFactory
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 import org.jetbrains.kotlin.test.JetTestUtils
 import java.io.File
 
@@ -69,7 +68,7 @@ public class CodeFragmentCompletionInLibraryTest : AbstractJvmBasicCompletionTes
     private fun testCompletionInLibraryCodeFragment(fragmentText: String, vararg completionDirectives: String) {
         setupFixtureByCodeFragment(fragmentText)
         val directives = completionDirectives.map { "//$it" }.joinToString(separator = "\n")
-        testCompletion(directives, TargetPlatform.JVM, {
+        testCompletion(directives, JvmPlatform, {
             myFixture.complete(CompletionType.BASIC)
         })
     }