From 59e688f9ff66a2d6d9765d0149ff3de7210e07e2 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Fri, 13 Jan 2012 14:23:48 +0400 Subject: [PATCH] Move module scripting out of jvm backend --- build.xml | 1 + compiler/cli/cli.iml | 1 + .../jet/compiler/CompileEnvironment.java | 1 - .../compiler/CompileEnvironmentException.java | 0 .../jet/compiler/CompileSession.java | 1 - .../jet/compiler/ErrorCollector.java | 0 .../jet/compiler}/JetCoreEnvironment.java | 10 ++++++- .../jet/CompileJavaAgainstKotlinTest.java | 1 + .../org/jetbrains/jet/JetLiteFixture.java | 1 + .../tests/org/jetbrains/jet/JetTestUtils.java | 1 + .../org/jetbrains/jet/ReadClassDataTest.java | 10 ++----- .../org/jetbrains/jet/WriteSignatureTest.java | 1 + .../org/jetbrains/jet/codegen/StdlibTest.java | 28 ------------------- .../jetbrains/jet/codegen/TestlibTest.java | 2 -- 14 files changed, 17 insertions(+), 41 deletions(-) rename compiler/{backend => cli}/src/org/jetbrains/jet/compiler/CompileEnvironment.java (99%) rename compiler/{backend => cli}/src/org/jetbrains/jet/compiler/CompileEnvironmentException.java (100%) rename compiler/{backend => cli}/src/org/jetbrains/jet/compiler/CompileSession.java (99%) rename compiler/{backend => cli}/src/org/jetbrains/jet/compiler/ErrorCollector.java (100%) rename compiler/{frontend/src/org/jetbrains/jet => cli/src/org/jetbrains/jet/compiler}/JetCoreEnvironment.java (71%) diff --git a/build.xml b/build.xml index 4084ccf2e94..dd13289ae3a 100644 --- a/build.xml +++ b/build.xml @@ -21,6 +21,7 @@ + diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml index ed2341d3d46..0b81faef09d 100644 --- a/compiler/cli/cli.iml +++ b/compiler/cli/cli.iml @@ -11,6 +11,7 @@ + diff --git a/compiler/backend/src/org/jetbrains/jet/compiler/CompileEnvironment.java b/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironment.java similarity index 99% rename from compiler/backend/src/org/jetbrains/jet/compiler/CompileEnvironment.java rename to compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironment.java index 66c129f3ef9..545a248242b 100644 --- a/compiler/backend/src/org/jetbrains/jet/compiler/CompileEnvironment.java +++ b/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironment.java @@ -11,7 +11,6 @@ import jet.ExtensionFunction0; import jet.modules.IModuleBuilder; import jet.modules.IModuleSetBuilder; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetCoreEnvironment; import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GeneratedClassLoader; import org.jetbrains.jet.lang.psi.JetFile; diff --git a/compiler/backend/src/org/jetbrains/jet/compiler/CompileEnvironmentException.java b/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironmentException.java similarity index 100% rename from compiler/backend/src/org/jetbrains/jet/compiler/CompileEnvironmentException.java rename to compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironmentException.java diff --git a/compiler/backend/src/org/jetbrains/jet/compiler/CompileSession.java b/compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java similarity index 99% rename from compiler/backend/src/org/jetbrains/jet/compiler/CompileSession.java rename to compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java index 724cac07e35..58d290c69c4 100644 --- a/compiler/backend/src/org/jetbrains/jet/compiler/CompileSession.java +++ b/compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java @@ -5,7 +5,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetCoreEnvironment; import org.jetbrains.jet.codegen.ClassBuilderFactory; import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GenerationState; diff --git a/compiler/backend/src/org/jetbrains/jet/compiler/ErrorCollector.java b/compiler/cli/src/org/jetbrains/jet/compiler/ErrorCollector.java similarity index 100% rename from compiler/backend/src/org/jetbrains/jet/compiler/ErrorCollector.java rename to compiler/cli/src/org/jetbrains/jet/compiler/ErrorCollector.java diff --git a/compiler/frontend/src/org/jetbrains/jet/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/compiler/JetCoreEnvironment.java similarity index 71% rename from compiler/frontend/src/org/jetbrains/jet/JetCoreEnvironment.java rename to compiler/cli/src/org/jetbrains/jet/compiler/JetCoreEnvironment.java index 1b2e2c12e66..32e0bdf4a10 100644 --- a/compiler/frontend/src/org/jetbrains/jet/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/jet/compiler/JetCoreEnvironment.java @@ -1,9 +1,12 @@ -package org.jetbrains.jet; +package org.jetbrains.jet.compiler; import com.intellij.core.JavaCoreEnvironment; import com.intellij.lang.java.JavaParserDefinition; import com.intellij.mock.MockApplication; import com.intellij.openapi.Disposable; +import com.intellij.openapi.extensions.Extensions; +import com.intellij.psi.PsiElementFinder; +import org.jetbrains.jet.asJava.JavaElementFinder; import org.jetbrains.jet.lang.parsing.JetParserDefinition; import org.jetbrains.jet.plugin.JetFileType; @@ -19,6 +22,11 @@ public class JetCoreEnvironment extends JavaCoreEnvironment { registerFileType(JetFileType.INSTANCE, "jet"); registerParserDefinition(new JavaParserDefinition()); registerParserDefinition(new JetParserDefinition()); + + Extensions.getArea(myProject) + .getExtensionPoint(PsiElementFinder.EP_NAME) + .registerExtension(new JavaElementFinder(myProject)); + } public MockApplication getApplication() { diff --git a/compiler/tests/org/jetbrains/jet/CompileJavaAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/CompileJavaAgainstKotlinTest.java index c2596d2eea5..6d75ca56e6b 100644 --- a/compiler/tests/org/jetbrains/jet/CompileJavaAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/jet/CompileJavaAgainstKotlinTest.java @@ -12,6 +12,7 @@ import org.jetbrains.jet.codegen.ClassBuilderFactory; import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GenerationState; import org.jetbrains.jet.compiler.CompileEnvironment; +import org.jetbrains.jet.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.plugin.JetLanguage; diff --git a/compiler/tests/org/jetbrains/jet/JetLiteFixture.java b/compiler/tests/org/jetbrains/jet/JetLiteFixture.java index 9ff4e21f148..a1a18765434 100644 --- a/compiler/tests/org/jetbrains/jet/JetLiteFixture.java +++ b/compiler/tests/org/jetbrains/jet/JetLiteFixture.java @@ -15,6 +15,7 @@ import com.intellij.testFramework.TestDataFile; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NonNls; import org.jetbrains.jet.compiler.CompileEnvironment; +import org.jetbrains.jet.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.plugin.JetLanguage; diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 468862c1852..6a4d44b65bd 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -4,6 +4,7 @@ import com.google.common.collect.Lists; import com.intellij.openapi.Disposable; import junit.framework.TestCase; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Severity; diff --git a/compiler/tests/org/jetbrains/jet/ReadClassDataTest.java b/compiler/tests/org/jetbrains/jet/ReadClassDataTest.java index 247c4a68796..22af0adfb4f 100644 --- a/compiler/tests/org/jetbrains/jet/ReadClassDataTest.java +++ b/compiler/tests/org/jetbrains/jet/ReadClassDataTest.java @@ -7,13 +7,13 @@ import com.intellij.psi.PsiFileFactory; import com.intellij.psi.impl.PsiFileFactoryImpl; import com.intellij.testFramework.LightVirtualFile; import junit.framework.Test; -import org.codehaus.groovy.ast.expr.DeclarationExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.codegen.ClassBuilderFactory; import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GenerationState; import org.jetbrains.jet.codegen.PropertyCodegen; import org.jetbrains.jet.compiler.CompileEnvironment; +import org.jetbrains.jet.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.JetSemanticServices; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.JetFile; @@ -22,7 +22,6 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver; import org.jetbrains.jet.lang.types.JetType; @@ -33,12 +32,7 @@ import org.junit.Assert; import java.io.File; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; /** * @author Stepan Koltsov diff --git a/compiler/tests/org/jetbrains/jet/WriteSignatureTest.java b/compiler/tests/org/jetbrains/jet/WriteSignatureTest.java index f648e4dc260..c019cfa67ed 100644 --- a/compiler/tests/org/jetbrains/jet/WriteSignatureTest.java +++ b/compiler/tests/org/jetbrains/jet/WriteSignatureTest.java @@ -15,6 +15,7 @@ import org.jetbrains.jet.codegen.ClassBuilderFactory; import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GenerationState; import org.jetbrains.jet.compiler.CompileEnvironment; +import org.jetbrains.jet.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; diff --git a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java index 9c050d478aa..c9cad2d4bc3 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java @@ -1,36 +1,8 @@ package org.jetbrains.jet.codegen; -import com.intellij.openapi.util.ClassLoaderUtil; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.openapi.vfs.local.CoreLocalFileSystem; -import com.intellij.testFramework.TestRunnerUtil; -import gnu.trove.THashSet; -import junit.framework.TestCase; -import junit.framework.TestResult; -import junit.framework.TestSuite; -import junit.textui.TestRunner; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.compiler.CompileEnvironment; import org.jetbrains.jet.compiler.CompileSession; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetPsiUtil; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.parsing.JetParsingTest; - -import java.beans.beancontext.BeanContext; -import java.io.File; -import java.lang.reflect.Constructor; -import java.lang.reflect.Modifier; -import java.net.URL; -import java.net.URLClassLoader; -import java.net.URLDecoder; -import java.util.Set; /** * @author alex.tkachman diff --git a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java index 025227b1e6d..67bb0336481 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java @@ -1,12 +1,10 @@ package org.jetbrains.jet.codegen; -import com.intellij.openapi.Disposable; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.local.CoreLocalFileSystem; import gnu.trove.THashSet; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.jetbrains.jet.JetCoreEnvironment; import org.jetbrains.jet.compiler.CompileEnvironment; import org.jetbrains.jet.compiler.CompileSession; import org.jetbrains.jet.lang.descriptors.ClassDescriptor;