From a5fdcf9fb19da8c68f551a7978b3834cbe9d8416 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 15 Jun 2011 18:54:41 +0200 Subject: [PATCH] moving stuff around --- examples/src/{collections => }/ColossalCave.jetl | 0 idea/src/META-INF/plugin.xml | 16 ++++++++-------- idea/src/org/jetbrains/jet/JetNodeType.java | 7 +------ idea/src/org/jetbrains/jet/JetNodeTypes.java | 2 +- .../jetbrains/jet/lang/psi/JetChangeUtil.java | 2 +- .../org/jetbrains/jet/lang/psi/JetElement.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetFile.java | 7 ++----- .../jet/lang/types/JetStandardLibrary.java | 2 +- idea/src/org/jetbrains/jet/lexer/JetToken.java | 4 +--- .../jet/{lang => plugin}/JetFileFactory.java | 2 +- .../jet/{lang => plugin}/JetFileType.java | 3 +-- .../jet/{lang => plugin}/JetHighlighter.java | 2 +- .../jet/{lang => plugin}/JetLanguage.java | 3 +-- .../jet/{lang => plugin}/JetPairMatcher.java | 3 +-- .../annotations/JetLineMarkerProvider.java | 2 +- .../annotations/JetPsiChecker.java | 4 ++-- .../annotations/LabelsAnnotator.java | 5 ++--- .../annotations/SoftKeywordsAnnotator.java | 4 ++-- .../jet/{ => plugin}/compiler/JetCompiler.java | 4 ++-- .../compiler/JetCompilerManager.java | 4 ++-- .../{ => plugin}/run/JetRunConfiguration.java | 2 +- .../run/JetRunConfigurationEditor.form | 2 +- .../run/JetRunConfigurationEditor.java | 2 +- .../run/JetRunConfigurationType.java | 4 ++-- .../jetbrains/jet/codegen/CodegenTestCase.java | 2 +- 25 files changed, 38 insertions(+), 52 deletions(-) rename examples/src/{collections => }/ColossalCave.jetl (100%) rename idea/src/org/jetbrains/jet/{lang => plugin}/JetFileFactory.java (91%) rename idea/src/org/jetbrains/jet/{lang => plugin}/JetFileType.java (91%) rename idea/src/org/jetbrains/jet/{lang => plugin}/JetHighlighter.java (99%) rename idea/src/org/jetbrains/jet/{lang => plugin}/JetLanguage.java (91%) rename idea/src/org/jetbrains/jet/{lang => plugin}/JetPairMatcher.java (94%) rename idea/src/org/jetbrains/jet/{lang => plugin}/annotations/JetLineMarkerProvider.java (99%) rename idea/src/org/jetbrains/jet/{lang => plugin}/annotations/JetPsiChecker.java (98%) rename idea/src/org/jetbrains/jet/{lang => plugin}/annotations/LabelsAnnotator.java (91%) rename idea/src/org/jetbrains/jet/{lang => plugin}/annotations/SoftKeywordsAnnotator.java (88%) rename idea/src/org/jetbrains/jet/{ => plugin}/compiler/JetCompiler.java (97%) rename idea/src/org/jetbrains/jet/{ => plugin}/compiler/JetCompilerManager.java (86%) rename idea/src/org/jetbrains/jet/{ => plugin}/run/JetRunConfiguration.java (98%) rename idea/src/org/jetbrains/jet/{ => plugin}/run/JetRunConfigurationEditor.form (96%) rename idea/src/org/jetbrains/jet/{ => plugin}/run/JetRunConfigurationEditor.java (97%) rename idea/src/org/jetbrains/jet/{ => plugin}/run/JetRunConfigurationType.java (90%) diff --git a/examples/src/collections/ColossalCave.jetl b/examples/src/ColossalCave.jetl similarity index 100% rename from examples/src/collections/ColossalCave.jetl rename to examples/src/ColossalCave.jetl diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 594bc409ffc..cdc1c7371ba 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -9,7 +9,7 @@ - org.jetbrains.jet.compiler.JetCompilerManager + org.jetbrains.jet.plugin.compiler.JetCompilerManager @@ -18,17 +18,17 @@ - - + + - - - + + + - - + + diff --git a/idea/src/org/jetbrains/jet/JetNodeType.java b/idea/src/org/jetbrains/jet/JetNodeType.java index 45efb206c69..23fe62b58f1 100644 --- a/idea/src/org/jetbrains/jet/JetNodeType.java +++ b/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 myPsiFactory; diff --git a/idea/src/org/jetbrains/jet/JetNodeTypes.java b/idea/src/org/jetbrains/jet/JetNodeTypes.java index 7db4be3cd48..0217134ef7d 100644 --- a/idea/src/org/jetbrains/jet/JetNodeTypes.java +++ b/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 { diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetChangeUtil.java b/idea/src/org/jetbrains/jet/lang/psi/JetChangeUtil.java index 7d2c6df9982..e280c821bba 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetChangeUtil.java +++ b/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; diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetElement.java b/idea/src/org/jetbrains/jet/lang/psi/JetElement.java index a2555ad655f..53c979e19ef 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetElement.java +++ b/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; diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetFile.java b/idea/src/org/jetbrains/jet/lang/psi/JetFile.java index 714fcdc8bb6..7d1e9d290a8 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetFile.java +++ b/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) { diff --git a/idea/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java b/idea/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java index 06925c0d5da..b6382721b88 100644 --- a/idea/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java +++ b/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; diff --git a/idea/src/org/jetbrains/jet/lexer/JetToken.java b/idea/src/org/jetbrains/jet/lexer/JetToken.java index a928a4d8818..233cabff628 100644 --- a/idea/src/org/jetbrains/jet/lexer/JetToken.java +++ b/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) { diff --git a/idea/src/org/jetbrains/jet/lang/JetFileFactory.java b/idea/src/org/jetbrains/jet/plugin/JetFileFactory.java similarity index 91% rename from idea/src/org/jetbrains/jet/lang/JetFileFactory.java rename to idea/src/org/jetbrains/jet/plugin/JetFileFactory.java index 2f162c1dcb2..4e621a10708 100644 --- a/idea/src/org/jetbrains/jet/lang/JetFileFactory.java +++ b/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; diff --git a/idea/src/org/jetbrains/jet/lang/JetFileType.java b/idea/src/org/jetbrains/jet/plugin/JetFileType.java similarity index 91% rename from idea/src/org/jetbrains/jet/lang/JetFileType.java rename to idea/src/org/jetbrains/jet/plugin/JetFileType.java index 2865a7fd09a..465804366ba 100644 --- a/idea/src/org/jetbrains/jet/lang/JetFileType.java +++ b/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; diff --git a/idea/src/org/jetbrains/jet/lang/JetHighlighter.java b/idea/src/org/jetbrains/jet/plugin/JetHighlighter.java similarity index 99% rename from idea/src/org/jetbrains/jet/lang/JetHighlighter.java rename to idea/src/org/jetbrains/jet/plugin/JetHighlighter.java index 74b9383970c..fc303c1f7ac 100644 --- a/idea/src/org/jetbrains/jet/lang/JetHighlighter.java +++ b/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; diff --git a/idea/src/org/jetbrains/jet/lang/JetLanguage.java b/idea/src/org/jetbrains/jet/plugin/JetLanguage.java similarity index 91% rename from idea/src/org/jetbrains/jet/lang/JetLanguage.java rename to idea/src/org/jetbrains/jet/plugin/JetLanguage.java index e91f287972f..cf8802b6fc0 100644 --- a/idea/src/org/jetbrains/jet/lang/JetLanguage.java +++ b/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 { diff --git a/idea/src/org/jetbrains/jet/lang/JetPairMatcher.java b/idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java similarity index 94% rename from idea/src/org/jetbrains/jet/lang/JetPairMatcher.java rename to idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java index 2171958b1d0..2624cd2ba36 100644 --- a/idea/src/org/jetbrains/jet/lang/JetPairMatcher.java +++ b/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 { diff --git a/idea/src/org/jetbrains/jet/lang/annotations/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/annotations/JetLineMarkerProvider.java similarity index 99% rename from idea/src/org/jetbrains/jet/lang/annotations/JetLineMarkerProvider.java rename to idea/src/org/jetbrains/jet/plugin/annotations/JetLineMarkerProvider.java index 054f879210c..21323616611 100644 --- a/idea/src/org/jetbrains/jet/lang/annotations/JetLineMarkerProvider.java +++ b/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; diff --git a/idea/src/org/jetbrains/jet/lang/annotations/JetPsiChecker.java b/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java similarity index 98% rename from idea/src/org/jetbrains/jet/lang/annotations/JetPsiChecker.java rename to idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java index 98cf1b16184..acffda1badf 100644 --- a/idea/src/org/jetbrains/jet/lang/annotations/JetPsiChecker.java +++ b/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; diff --git a/idea/src/org/jetbrains/jet/lang/annotations/LabelsAnnotator.java b/idea/src/org/jetbrains/jet/plugin/annotations/LabelsAnnotator.java similarity index 91% rename from idea/src/org/jetbrains/jet/lang/annotations/LabelsAnnotator.java rename to idea/src/org/jetbrains/jet/plugin/annotations/LabelsAnnotator.java index a8a6b04023b..10c218864eb 100644 --- a/idea/src/org/jetbrains/jet/lang/annotations/LabelsAnnotator.java +++ b/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; diff --git a/idea/src/org/jetbrains/jet/lang/annotations/SoftKeywordsAnnotator.java b/idea/src/org/jetbrains/jet/plugin/annotations/SoftKeywordsAnnotator.java similarity index 88% rename from idea/src/org/jetbrains/jet/lang/annotations/SoftKeywordsAnnotator.java rename to idea/src/org/jetbrains/jet/plugin/annotations/SoftKeywordsAnnotator.java index 18c4badc08e..ceddb4feff6 100644 --- a/idea/src/org/jetbrains/jet/lang/annotations/SoftKeywordsAnnotator.java +++ b/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 { diff --git a/idea/src/org/jetbrains/jet/compiler/JetCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java similarity index 97% rename from idea/src/org/jetbrains/jet/compiler/JetCompiler.java rename to idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java index f242113cd88..0fe9f5b3c27 100644 --- a/idea/src/org/jetbrains/jet/compiler/JetCompiler.java +++ b/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; diff --git a/idea/src/org/jetbrains/jet/compiler/JetCompilerManager.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java similarity index 86% rename from idea/src/org/jetbrains/jet/compiler/JetCompilerManager.java rename to idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java index 8461fde2d24..18fd3ca33b1 100644 --- a/idea/src/org/jetbrains/jet/compiler/JetCompilerManager.java +++ b/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; diff --git a/idea/src/org/jetbrains/jet/run/JetRunConfiguration.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java similarity index 98% rename from idea/src/org/jetbrains/jet/run/JetRunConfiguration.java rename to idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java index 6dbd0b88122..533277da3bb 100644 --- a/idea/src/org/jetbrains/jet/run/JetRunConfiguration.java +++ b/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; diff --git a/idea/src/org/jetbrains/jet/run/JetRunConfigurationEditor.form b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationEditor.form similarity index 96% rename from idea/src/org/jetbrains/jet/run/JetRunConfigurationEditor.form rename to idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationEditor.form index 8383144f077..f7f2de59d22 100644 --- a/idea/src/org/jetbrains/jet/run/JetRunConfigurationEditor.form +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationEditor.form @@ -1,5 +1,5 @@ -
+ diff --git a/idea/src/org/jetbrains/jet/run/JetRunConfigurationEditor.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationEditor.java similarity index 97% rename from idea/src/org/jetbrains/jet/run/JetRunConfigurationEditor.java rename to idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationEditor.java index e26437dd221..4f9a3030c6a 100644 --- a/idea/src/org/jetbrains/jet/run/JetRunConfigurationEditor.java +++ b/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; diff --git a/idea/src/org/jetbrains/jet/run/JetRunConfigurationType.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java similarity index 90% rename from idea/src/org/jetbrains/jet/run/JetRunConfigurationType.java rename to idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java index 52c8676155e..32a9fdea80a 100644 --- a/idea/src/org/jetbrains/jet/run/JetRunConfigurationType.java +++ b/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 diff --git a/idea/tests/org/jetbrains/jet/codegen/CodegenTestCase.java b/idea/tests/org/jetbrains/jet/codegen/CodegenTestCase.java index 9ee8a62f757..8e7f4f832a4 100644 --- a/idea/tests/org/jetbrains/jet/codegen/CodegenTestCase.java +++ b/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; -- GitLab