Codebase update

compiler/backend/src/org/jetbrains/jet/codegen/extensions/ExpressionCodegenExtension.kt

@@ -17,14 +17,13 @@
 package org.jetbrains.jet.codegen.extensions
 
 import org.jetbrains.jet.extensions.ProjectExtensionDescriptor
-import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall
-import org.jetbrains.jet.codegen.StackValue
-import org.jetbrains.jet.codegen.state.JetTypeMapper
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
-import org.jetbrains.jet.codegen.ClassBodyCodegen
-import org.jetbrains.jet.codegen.ClassBuilder
-import org.jetbrains.jet.lang.psi.JetClassOrObject
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.codegen.StackValue
+import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
+import org.jetbrains.kotlin.codegen.ClassBuilder
+import org.jetbrains.kotlin.psi.JetClassOrObject
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 
 public trait ExpressionCodegenExtension {
     class object : ProjectExtensionDescriptor<ExpressionCodegenExtension>("org.jetbrains.kotlin.expressionCodegenExtension", javaClass<ExpressionCodegenExtension>())

compiler/cli/src/org/jetbrains/jet/cli/jvm/PluginCliParser.kt

@@ -17,19 +17,13 @@
 package org.jetbrains.jet.cli.jvm
 
 import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
-import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments
 import kotlin.platform.*
 import java.util.jar.JarFile
 import java.util.jar.Attributes
 import org.jetbrains.kotlin.compiler.plugin.CliOptionProcessingException
 import java.util.regex.Pattern
-import org.jetbrains.jet.utils.valuesToMap
-import org.jetbrains.jet.config.CompilerConfiguration
 import com.intellij.util.containers.MultiMap
 import org.jetbrains.kotlin.compiler.plugin.CliOption
-import org.jetbrains.jet.cli.common.messages.MessageCollector
-import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity
-import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation
 import java.net.URLClassLoader
 import java.net.URL
 import java.io.File
@@ -39,6 +33,9 @@ import java.io.IOException
 import java.util.Enumeration
 import org.jetbrains.kotlin.compiler.plugin.parsePluginOption
 import org.jetbrains.kotlin.compiler.plugin.CliOptionValue
+import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
+import org.jetbrains.kotlin.utils.valuesToMap
+import org.jetbrains.kotlin.config.CompilerConfiguration
 
 
 public object PluginCliParser {

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt

@@ -34,11 +34,11 @@ import org.jetbrains.kotlin.analyzer.ModuleContent
 import org.jetbrains.kotlin.di.InjectorForLazyResolveWithJava
 import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer
 import com.intellij.psi.search.GlobalSearchScope
-import org.jetbrains.jet.lang.psi.JetFile
 import java.util.ArrayList
 import org.jetbrains.jet.extensions.ExternalDeclarationsProvider
 import kotlin.platform.platformStatic
 import com.intellij.openapi.module.Module
+import org.jetbrains.kotlin.psi.JetFile
 
 public class JvmResolverForModule(
         override val lazyResolveSession: ResolveSession,

compiler/frontend/src/org/jetbrains/jet/extensions/ExternalDeclarationsProvider.kt

@@ -16,8 +16,8 @@
 
 package org.jetbrains.jet.extensions
 
-import org.jetbrains.jet.lang.psi.JetFile
-import org.jetbrains.jet.analyzer.ModuleInfo
+import org.jetbrains.kotlin.analyzer.ModuleInfo
+import org.jetbrains.kotlin.psi.JetFile
 
 public trait ExternalDeclarationsProvider {
     class object : ProjectExtensionDescriptor<ExternalDeclarationsProvider>(

compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt

@@ -32,7 +32,7 @@ import java.io.StringWriter
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.psi.PsiComment
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.jet.analyzer.ModuleInfo
+import org.jetbrains.kotlin.analyzer.ModuleInfo
 
 public fun JetPsiFactory(project: Project?): JetPsiFactory = JetPsiFactory(project!!)
 public fun JetPsiFactory(contextElement: JetElement): JetPsiFactory = JetPsiFactory(contextElement.getProject())

compiler/plugin-api/plugin-api.iml

@@ -9,6 +9,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="intellij-core" level="project" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="module" module-name="frontend" />
   </component>
-</module>
-
+</module>

compiler/plugin-api/src/org/jetbrains/jet/config/CompilerConfiguration.java

@@ -1,129 +0,0 @@
-/*
- * Copyright 2010-2013 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.jet.config;
-
-import com.intellij.openapi.util.Key;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.*;
-
-@SuppressWarnings("unchecked")
-public class CompilerConfiguration {
-    private final Map<Key, Object> map = new HashMap<Key, Object>();
-    private boolean readOnly = false;
-
-    @Nullable
-    public <T> T get(@NotNull CompilerConfigurationKey<T> key) {
-        T data = (T) map.get(key.ideaKey);
-        return data == null ? null : unmodifiable(data);
-    }
-
-    @NotNull
-    public <T> T get(@NotNull CompilerConfigurationKey<T> key, @NotNull T defaultValue) {
-        T data = (T) map.get(key.ideaKey);
-        return data == null ? defaultValue : unmodifiable(data);
-    }
-
-    @NotNull
-    public <T> List<T> getList(@NotNull CompilerConfigurationKey<List<T>> key) {
-        List<T> data = (List<T>) map.get(key.ideaKey);
-        if (data == null) {
-            return Collections.emptyList();
-        }
-        else {
-            return Collections.unmodifiableList(data);
-        }
-    }
-
-    public <T> void put(@NotNull CompilerConfigurationKey<T> key, @Nullable T value) {
-        checkReadOnly();
-        map.put(key.ideaKey, value);
-    }
-
-    public <T> void add(@NotNull CompilerConfigurationKey<List<T>> key, @NotNull T value) {
-        checkReadOnly();
-        Key<List<T>> ideaKey = key.ideaKey;
-        if (map.get(ideaKey) == null) {
-            map.put(ideaKey, new ArrayList<T>());
-        }
-        List<T> list = (List<T>) map.get(ideaKey);
-        list.add(value);
-    }
-
-    public <T> void addAll(@NotNull CompilerConfigurationKey<List<T>> key, @NotNull Collection<T> values) {
-        checkReadOnly();
-        checkForNullElements(values);
-        Key<List<T>> ideaKey = key.ideaKey;
-        if (map.get(ideaKey) == null) {
-            map.put(ideaKey, new ArrayList<T>());
-        }
-        List<T> list = (List<T>) map.get(ideaKey);
-        list.addAll(values);
-    }
-
-    public CompilerConfiguration copy() {
-        CompilerConfiguration copy = new CompilerConfiguration();
-        copy.map.putAll(map);
-        return copy;
-    }
-
-    private void checkReadOnly() {
-        if (readOnly) {
-            throw new IllegalStateException("CompilerConfiguration is read-only");
-        }
-    }
-
-    public void setReadOnly(boolean readOnly) {
-        if (readOnly != this.readOnly) {
-            checkReadOnly();
-            this.readOnly = readOnly;
-        }
-    }
-
-    @NotNull
-    private static <T> T unmodifiable(@NotNull T object) {
-        if (object instanceof List) {
-            return (T) Collections.unmodifiableList((List) object);
-        }
-        else if (object instanceof Map) {
-            return (T) Collections.unmodifiableMap((Map) object);
-        }
-        else if (object instanceof Collection) {
-            return (T) Collections.unmodifiableCollection((Collection) object);
-        }
-        else {
-            return object;
-        }
-    }
-
-    @Override
-    public String toString() {
-        return map.toString();
-    }
-
-    private static <T> void checkForNullElements(Collection<T> values) {
-        int index = 0;
-        for (T value : values) {
-            if (value == null) {
-                throw new IllegalArgumentException("Element " + index
-                                                   + " is null, while null values in compiler configuration are not allowed");
-            }
-            index++;
-        }
-    }
-}

compiler/plugin-api/src/org/jetbrains/jet/config/CompilerConfigurationKey.java

@@ -1,34 +0,0 @@
-/*
- * Copyright 2010-2013 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.jet.config;
-
-import com.intellij.openapi.util.Key;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-
-public class CompilerConfigurationKey<T> {
-    Key<T> ideaKey;
-
-    private CompilerConfigurationKey(@NotNull @NonNls String name) {
-        ideaKey = Key.create(name);
-    }
-
-    @NotNull
-    public static <T> CompilerConfigurationKey<T> create(@NotNull @NonNls String name) {
-        return new CompilerConfigurationKey<T>(name);
-    }
-}

compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor.kt

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.compiler.plugin
 
-import org.jetbrains.jet.config.CompilerConfiguration
+import org.jetbrains.kotlin.config.CompilerConfiguration
 
 public trait CommandLineProcessor {
     public val pluginId: String

compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt

@@ -16,9 +16,9 @@
 
 package org.jetbrains.kotlin.compiler.plugin
 
-import org.jetbrains.jet.config.CompilerConfigurationKey
-import org.jetbrains.jet.config.CompilerConfiguration
 import com.intellij.mock.MockProject
+import org.jetbrains.kotlin.config.CompilerConfigurationKey
+import org.jetbrains.kotlin.config.CompilerConfiguration
 
 public trait ComponentRegistrar {
     class object {