moving stuff around

idea/src/META-INF/plugin.xml

@@ -9,7 +9,7 @@
 
   <project-components>
       <component>
-          <implementation-class>org.jetbrains.jet.compiler.JetCompilerManager</implementation-class>
+          <implementation-class>org.jetbrains.jet.plugin.compiler.JetCompilerManager</implementation-class>
       </component>
   </project-components>
 
@@ -18,17 +18,17 @@
   </actions>
 
   <extensions defaultExtensionNs="com.intellij">
-      <fileTypeFactory implementation="org.jetbrains.jet.lang.JetFileFactory"/>
-      <lang.braceMatcher language="jet" implementationClass="org.jetbrains.jet.lang.JetPairMatcher"/>
+      <fileTypeFactory implementation="org.jetbrains.jet.plugin.JetFileFactory"/>
+      <lang.braceMatcher language="jet" implementationClass="org.jetbrains.jet.plugin.JetPairMatcher"/>
       <lang.parserDefinition language="jet" implementationClass="org.jetbrains.jet.lang.parsing.JetParserDefinition"/>
       <lang.commenter language="jet" implementationClass="org.jetbrains.jet.plugin.JetCommenter"/>
       <lang.psiStructureViewFactory language="jet" implementationClass="org.jetbrains.jet.plugin.structureView.JetStructureViewFactory"/>
-      <annotator language="jet" implementationClass="org.jetbrains.jet.lang.annotations.SoftKeywordsAnnotator"/>
-      <annotator language="jet" implementationClass="org.jetbrains.jet.lang.annotations.LabelsAnnotator"/>
-      <annotator language="jet" implementationClass="org.jetbrains.jet.lang.annotations.JetPsiChecker"/>
+      <annotator language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.SoftKeywordsAnnotator"/>
+      <annotator language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.LabelsAnnotator"/>
+      <annotator language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.JetPsiChecker"/>
       <documentationProvider implementation="org.jetbrains.jet.plugin.JetQuickDocumentationProvider"/>
-      <configurationType implementation="org.jetbrains.jet.run.JetRunConfigurationType"/>
-      <codeInsight.lineMarkerProvider language="jet" implementationClass="org.jetbrains.jet.lang.annotations.JetLineMarkerProvider"/>
+      <configurationType implementation="org.jetbrains.jet.plugin.run.JetRunConfigurationType"/>
+      <codeInsight.lineMarkerProvider language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.JetLineMarkerProvider"/>
       <iconProvider implementation="org.jetbrains.jet.plugin.JetIconProvider"/>
   </extensions>
 </idea-plugin>

idea/src/org/jetbrains/jet/JetNodeType.java

@@ -3,19 +3,14 @@
  */
 package org.jetbrains.jet;
 
-import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.Language;
-import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.JetLanguage;
+import org.jetbrains.jet.plugin.JetLanguage;
 import org.jetbrains.jet.lang.psi.JetElement;
 
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 
 public class JetNodeType extends IElementType {
     private Constructor<? extends JetElement> myPsiFactory;

idea/src/org/jetbrains/jet/JetNodeTypes.java

@@ -4,7 +4,7 @@
 package org.jetbrains.jet;
 
 import com.intellij.psi.tree.IFileElementType;
-import org.jetbrains.jet.lang.JetLanguage;
+import org.jetbrains.jet.plugin.JetLanguage;
 import org.jetbrains.jet.lang.psi.*;
 
 public interface JetNodeTypes {

idea/src/org/jetbrains/jet/lang/psi/JetChangeUtil.java

@@ -5,7 +5,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFileFactory;
 import com.intellij.util.LocalTimeCounter;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.JetFileType;
+import org.jetbrains.jet.plugin.JetFileType;
 
 import java.util.List;
 

idea/src/org/jetbrains/jet/lang/psi/JetElement.java

@@ -5,7 +5,7 @@ import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
 import com.intellij.psi.PsiElementVisitor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.JetLanguage;
+import org.jetbrains.jet.plugin.JetLanguage;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

idea/src/org/jetbrains/jet/lang/psi/JetFile.java

@@ -4,16 +4,13 @@
 package org.jetbrains.jet.lang.psi;
 
 import com.intellij.extapi.psi.PsiFileBase;
-import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.impl.source.PsiFileImpl;
-import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetNodeTypes;
-import org.jetbrains.jet.lang.JetFileType;
-import org.jetbrains.jet.lang.JetLanguage;
+import org.jetbrains.jet.plugin.JetFileType;
+import org.jetbrains.jet.plugin.JetLanguage;
 
 public class JetFile extends PsiFileBase {
     public JetFile(FileViewProvider viewProvider) {

idea/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java

@@ -5,7 +5,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.psi.PsiFileFactory;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.ErrorHandler;
-import org.jetbrains.jet.lang.JetFileType;
+import org.jetbrains.jet.plugin.JetFileType;
 import org.jetbrains.jet.lang.JetSemanticServices;
 import org.jetbrains.jet.lang.descriptors.Annotation;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;

idea/src/org/jetbrains/jet/lexer/JetToken.java

@@ -3,12 +3,10 @@
  */
 package org.jetbrains.jet.lexer;
 
-import com.intellij.lang.Language;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.JetLanguage;
+import org.jetbrains.jet.plugin.JetLanguage;
 
 public class JetToken extends IElementType {
     public JetToken(@NotNull @NonNls String debugName) {

idea/src/org/jetbrains/jet/plugin/JetFileFactory.java

@@ -1,7 +1,7 @@
 /*
  * @author max
  */
-package org.jetbrains.jet.lang;
+package org.jetbrains.jet.plugin;
 
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
 import com.intellij.openapi.fileTypes.FileTypeFactory;

idea/src/org/jetbrains/jet/plugin/JetFileType.java

@@ -1,9 +1,8 @@
 /*
  * @author max
  */
-package org.jetbrains.jet.lang;
+package org.jetbrains.jet.plugin;
 
-import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.util.Icons;
 import org.jetbrains.annotations.NotNull;

idea/src/org/jetbrains/jet/plugin/JetHighlighter.java

@@ -1,7 +1,7 @@
 /*
  * @author max
  */
-package org.jetbrains.jet.lang;
+package org.jetbrains.jet.plugin;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.editor.HighlighterColors;

idea/src/org/jetbrains/jet/plugin/JetLanguage.java

@@ -1,13 +1,12 @@
 /*
  * @author max
  */
-package org.jetbrains.jet.lang;
+package org.jetbrains.jet.plugin;
 
 import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.SingleLazyInstanceSyntaxHighlighterFactory;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
 public class JetLanguage extends Language {

idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java

@@ -1,7 +1,7 @@
 /*
  * @author max
  */
-package org.jetbrains.jet.lang;
+package org.jetbrains.jet.plugin;
 
 import com.intellij.lang.BracePair;
 import com.intellij.lang.PairedBraceMatcher;
@@ -9,7 +9,6 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lexer.JetToken;
 import org.jetbrains.jet.lexer.JetTokens;
 
 public class JetPairMatcher implements PairedBraceMatcher {

idea/src/org/jetbrains/jet/plugin/annotations/JetLineMarkerProvider.java

@@ -1,4 +1,4 @@
-package org.jetbrains.jet.lang.annotations;
+package org.jetbrains.jet.plugin.annotations;
 
 import com.google.common.collect.Lists;
 import com.intellij.codeHighlighting.Pass;

idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java

@@ -1,4 +1,4 @@
-package org.jetbrains.jet.lang.annotations;
+package org.jetbrains.jet.plugin.annotations;
 
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.lang.ASTNode;
@@ -11,7 +11,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.ErrorHandler;
-import org.jetbrains.jet.lang.JetHighlighter;
+import org.jetbrains.jet.plugin.JetHighlighter;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
 import org.jetbrains.jet.lang.resolve.BindingContext;

idea/src/org/jetbrains/jet/plugin/annotations/LabelsAnnotator.java

@@ -1,14 +1,13 @@
 /*
  * @author max
  */
-package org.jetbrains.jet.lang.annotations;
+package org.jetbrains.jet.plugin.annotations;
 
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.Annotator;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.JetHighlighter;
+import org.jetbrains.jet.plugin.JetHighlighter;
 import org.jetbrains.jet.lang.psi.JetLabelQualifiedExpression;
 import org.jetbrains.jet.lang.psi.JetPrefixExpression;
 import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;

idea/src/org/jetbrains/jet/plugin/annotations/SoftKeywordsAnnotator.java

@@ -1,14 +1,14 @@
 /*
  * @author max
  */
-package org.jetbrains.jet.lang.annotations;
+package org.jetbrains.jet.plugin.annotations;
 
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.Annotator;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.impl.source.tree.LeafPsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.JetHighlighter;
+import org.jetbrains.jet.plugin.JetHighlighter;
 import org.jetbrains.jet.lexer.JetTokens;
 
 public class SoftKeywordsAnnotator implements Annotator {

idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java

@@ -1,4 +1,4 @@
-package org.jetbrains.jet.compiler;
+package org.jetbrains.jet.plugin.compiler;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.compiler.CompileContext;
@@ -14,7 +14,7 @@ import com.intellij.util.Chunk;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.codegen.Codegens;
 import org.jetbrains.jet.codegen.NamespaceCodegen;
-import org.jetbrains.jet.lang.JetFileType;
+import org.jetbrains.jet.plugin.JetFileType;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetNamespace;
 

idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java

@@ -1,9 +1,9 @@
-package org.jetbrains.jet.compiler;
+package org.jetbrains.jet.plugin.compiler;
 
 import com.intellij.openapi.compiler.CompilerManager;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.StdFileTypes;
-import org.jetbrains.jet.lang.JetFileType;
+import org.jetbrains.jet.plugin.JetFileType;
 
 import java.util.Collections;
 

idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java

@@ -1,4 +1,4 @@
-package org.jetbrains.jet.run;
+package org.jetbrains.jet.plugin.run;
 
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.Executor;

idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationEditor.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.jet.run.JetRunConfigurationEditor">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.jet.plugin.run.JetRunConfigurationEditor">
   <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>

idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationEditor.java

@@ -1,4 +1,4 @@
-package org.jetbrains.jet.run;
+package org.jetbrains.jet.plugin.run;
 
 import com.intellij.execution.ui.ConfigurationModuleSelector;
 import com.intellij.openapi.options.ConfigurationException;

idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java

@@ -1,9 +1,9 @@
-package org.jetbrains.jet.run;
+package org.jetbrains.jet.plugin.run;
 
 import com.intellij.execution.configurations.*;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.JetFileType;
+import org.jetbrains.jet.plugin.JetFileType;
 
 /**
  * @author yole

idea/tests/org/jetbrains/jet/codegen/CodegenTestCase.java

@@ -6,7 +6,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetLightProjectDescriptor;
-import org.jetbrains.jet.lang.JetFileType;
+import org.jetbrains.jet.plugin.JetFileType;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetNamespace;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;