mirror of
https://github.com/enso-org/enso.git
synced 2024-08-16 16:30:33 +03:00
Towards simplifying runtime-compiler
dependencies (#8894)
This commit is contained in:
parent
a786ad2d0a
commit
931baa4276
16
build.sbt
16
build.sbt
@ -1228,6 +1228,21 @@ val testLogProviderOptions = Seq(
|
||||
"-Dconfig.resource=application-test.conf"
|
||||
)
|
||||
|
||||
lazy val `engine-common` = project
|
||||
.in(file("engine/common"))
|
||||
.settings(
|
||||
frgaalJavaCompilerSetting,
|
||||
Test / fork := true,
|
||||
commands += WithDebugCommand.withDebug,
|
||||
Test / envVars ++= distributionEnvironmentOverrides,
|
||||
Test / javaOptions ++= Seq(
|
||||
),
|
||||
libraryDependencies ++= Seq(
|
||||
"org.graalvm.polyglot" % "polyglot" % graalMavenPackagesVersion % "provided"
|
||||
)
|
||||
)
|
||||
.dependsOn(testkit % Test)
|
||||
|
||||
lazy val `polyglot-api` = project
|
||||
.in(file("engine/polyglot-api"))
|
||||
.settings(
|
||||
@ -1255,6 +1270,7 @@ lazy val `polyglot-api` = project
|
||||
GenerateFlatbuffers.flatcVersion := flatbuffersVersion,
|
||||
Compile / sourceGenerators += GenerateFlatbuffers.task
|
||||
)
|
||||
.dependsOn(`engine-common`)
|
||||
.dependsOn(pkg)
|
||||
.dependsOn(`text-buffer`)
|
||||
.dependsOn(`logging-utils`)
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.enso.polyglot;
|
||||
package org.enso.common;
|
||||
|
||||
/** Defines a stage of compilation of the module. */
|
||||
public enum CompilationStage {
|
@ -1,4 +1,4 @@
|
||||
package org.enso.polyglot;
|
||||
package org.enso.common;
|
||||
|
||||
import org.graalvm.polyglot.HostAccess;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.enso.polyglot;
|
||||
package org.enso.common;
|
||||
|
||||
import org.graalvm.polyglot.PolyglotException;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.enso.polyglot;
|
||||
package org.enso.common;
|
||||
|
||||
/** Constainer for language-level constants */
|
||||
public class LanguageInfo {
|
@ -1,4 +1,4 @@
|
||||
package org.enso.polyglot;
|
||||
package org.enso.common;
|
||||
|
||||
/** Container for polyglot method names */
|
||||
public class MethodNames {
|
@ -9,14 +9,14 @@ import java.nio.file.Paths;
|
||||
import java.util.List;
|
||||
import java.util.function.Supplier;
|
||||
import java.util.logging.Level;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames.TopScope;
|
||||
import org.enso.interpreter.EnsoLanguage;
|
||||
import org.enso.interpreter.runtime.EnsoContext;
|
||||
import org.enso.interpreter.runtime.callable.function.Function;
|
||||
import org.enso.interpreter.runtime.data.text.Text;
|
||||
import org.enso.interpreter.runtime.error.DataflowError;
|
||||
import org.enso.interpreter.runtime.error.PanicException;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames.TopScope;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.io.IOAccess;
|
||||
|
@ -2,8 +2,8 @@ package org.enso.languageserver.boot.resource;
|
||||
|
||||
import akka.event.EventStream;
|
||||
import java.util.concurrent.Executor;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.languageserver.event.InitializedEvent;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
@ -49,7 +49,8 @@ import org.enso.logger.Converter
|
||||
import org.enso.logger.masking.Masking
|
||||
import org.enso.logger.JulHandler
|
||||
import org.enso.logger.akka.AkkaConverter
|
||||
import org.enso.polyglot.{HostAccessFactory, RuntimeOptions, RuntimeServerInfo}
|
||||
import org.enso.common.HostAccessFactory
|
||||
import org.enso.polyglot.{RuntimeOptions, RuntimeServerInfo}
|
||||
import org.enso.profiling.events.NoopEventsMonitor
|
||||
import org.enso.searcher.memory.InMemorySuggestionsRepo
|
||||
import org.enso.text.{ContentBasedVersioning, Sha3_224VersionCalculator}
|
||||
|
@ -7,7 +7,8 @@ import org.enso.logger.Converter
|
||||
import org.enso.logger.JulHandler
|
||||
import org.enso.pkg.Package
|
||||
import org.enso.pkg.SourceFile
|
||||
import org.enso.polyglot.{HostAccessFactory, PolyglotContext, RuntimeOptions}
|
||||
import org.enso.common.HostAccessFactory
|
||||
import org.enso.polyglot.{PolyglotContext, RuntimeOptions}
|
||||
import org.graalvm.polyglot.Context
|
||||
import org.slf4j.event.Level
|
||||
|
||||
|
@ -2,7 +2,11 @@ package org.enso.polyglot;
|
||||
|
||||
import com.oracle.truffle.api.Option;
|
||||
import java.util.Arrays;
|
||||
import org.graalvm.options.*;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.graalvm.options.OptionCategory;
|
||||
import org.graalvm.options.OptionDescriptor;
|
||||
import org.graalvm.options.OptionDescriptors;
|
||||
import org.graalvm.options.OptionKey;
|
||||
|
||||
/** Class representing runtime options supported by the Enso engine. */
|
||||
public class RuntimeOptions {
|
||||
|
@ -1,6 +1,7 @@
|
||||
package org.enso.polyglot
|
||||
|
||||
import org.graalvm.polyglot.Value
|
||||
import org.enso.common.MethodNames
|
||||
|
||||
/** Represents an Enso function.
|
||||
*
|
||||
|
@ -7,7 +7,7 @@ import org.graalvm.polyglot.Value
|
||||
* @param value the polyglot value of this scope
|
||||
*/
|
||||
class Module(private val value: Value) {
|
||||
import MethodNames.Module._
|
||||
import org.enso.common.MethodNames.Module._
|
||||
|
||||
/** @return the name of the module
|
||||
*/
|
||||
|
@ -1,5 +1,6 @@
|
||||
package org.enso.polyglot
|
||||
import java.io.File
|
||||
import org.enso.common.LanguageInfo
|
||||
|
||||
import org.graalvm.polyglot.{Context, Source}
|
||||
|
||||
|
@ -7,7 +7,7 @@ import org.graalvm.polyglot.Value
|
||||
* @param value the polyglot value of this scope
|
||||
*/
|
||||
class TopScope(private val value: Value) {
|
||||
import MethodNames.TopScope._
|
||||
import org.enso.common.MethodNames.TopScope._
|
||||
|
||||
/** Gets a module by name.
|
||||
*
|
||||
|
@ -7,7 +7,7 @@ import org.scalatest.matchers.should.Matchers
|
||||
import java.nio.file.Paths
|
||||
|
||||
class ApiTest extends AnyFlatSpec with Matchers {
|
||||
import LanguageInfo._
|
||||
import org.enso.common.LanguageInfo._
|
||||
val executionContext = new PolyglotContext(
|
||||
Context
|
||||
.newBuilder(ID)
|
||||
|
@ -28,7 +28,7 @@ class ModuleManagementTest
|
||||
)
|
||||
val executionContext = new PolyglotContext(
|
||||
Context
|
||||
.newBuilder(LanguageInfo.ID)
|
||||
.newBuilder(org.enso.common.LanguageInfo.ID)
|
||||
.allowExperimentalOptions(true)
|
||||
.allowAllAccess(true)
|
||||
.option(RuntimeOptions.PROJECT_ROOT, pkg.root.getAbsolutePath)
|
||||
|
@ -4,11 +4,11 @@ import java.io.File;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.util.Map;
|
||||
import org.enso.common.HostAccessFactory;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.logger.Converter;
|
||||
import org.enso.logger.JulHandler;
|
||||
import org.enso.logger.LoggerSetup;
|
||||
import org.enso.polyglot.HostAccessFactory;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.PolyglotContext;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.enso.polyglot.debugger.DebugServerInfo;
|
||||
|
@ -16,7 +16,8 @@ import org.enso.languageserver.boot.{
|
||||
import org.enso.libraryupload.LibraryUploader.UploadFailedError
|
||||
import org.slf4j.event.Level
|
||||
import org.enso.pkg.{Contact, PackageManager, Template}
|
||||
import org.enso.polyglot.{HostEnsoUtils, LanguageInfo, Module, PolyglotContext}
|
||||
import org.enso.common.{HostEnsoUtils, LanguageInfo}
|
||||
import org.enso.polyglot.{Module, PolyglotContext}
|
||||
import org.enso.profiling.sampler.{NoopSampler, OutputStreamSampler}
|
||||
import org.enso.version.VersionDescription
|
||||
import org.graalvm.polyglot.PolyglotException
|
||||
|
@ -10,9 +10,9 @@ import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.logging.Level;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.interpreter.runtime.EnsoContext;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Value;
|
||||
|
@ -3,11 +3,11 @@ package org.enso.compiler.benchmarks.inline;
|
||||
import java.io.IOException;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.compiler.benchmarks.CodeGenerator;
|
||||
import org.enso.compiler.benchmarks.Utils;
|
||||
import org.enso.interpreter.runtime.data.Type;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Source;
|
||||
|
||||
|
@ -7,12 +7,12 @@ import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.stream.Collectors;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.compiler.Compiler;
|
||||
import org.enso.compiler.benchmarks.Utils;
|
||||
import org.enso.interpreter.runtime.Module;
|
||||
import org.enso.interpreter.runtime.data.Type;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Source;
|
||||
|
@ -6,13 +6,13 @@ import java.io.OutputStream;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.compiler.Compiler;
|
||||
import org.enso.compiler.benchmarks.CodeGenerator;
|
||||
import org.enso.compiler.benchmarks.Utils;
|
||||
import org.enso.interpreter.runtime.Module;
|
||||
import org.enso.interpreter.runtime.data.Type;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Source;
|
||||
|
@ -5,13 +5,13 @@ import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.util.Random;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.compiler.Compiler;
|
||||
import org.enso.compiler.benchmarks.CodeGenerator;
|
||||
import org.enso.compiler.benchmarks.Utils;
|
||||
import org.enso.interpreter.runtime.Module;
|
||||
import org.enso.interpreter.runtime.data.Type;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Source;
|
||||
import org.openjdk.jmh.annotations.Benchmark;
|
||||
|
@ -6,13 +6,13 @@ import java.io.OutputStream;
|
||||
import java.util.Random;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.compiler.Compiler;
|
||||
import org.enso.compiler.benchmarks.CodeGenerator;
|
||||
import org.enso.compiler.benchmarks.Utils;
|
||||
import org.enso.interpreter.runtime.Module;
|
||||
import org.enso.interpreter.runtime.data.Type;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Source;
|
||||
import org.openjdk.jmh.annotations.Benchmark;
|
||||
|
@ -9,13 +9,13 @@ import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.compiler.Compiler;
|
||||
import org.enso.compiler.benchmarks.CodeGenerator;
|
||||
import org.enso.compiler.benchmarks.Utils;
|
||||
import org.enso.interpreter.runtime.Module;
|
||||
import org.enso.interpreter.runtime.data.Type;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Source;
|
||||
import org.openjdk.jmh.annotations.Benchmark;
|
||||
|
@ -7,8 +7,8 @@ import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.enso.common.MethodNames.Module;
|
||||
import org.enso.compiler.benchmarks.Utils;
|
||||
import org.enso.polyglot.MethodNames.Module;
|
||||
import org.graalvm.polyglot.Value;
|
||||
import org.openjdk.jmh.annotations.Benchmark;
|
||||
import org.openjdk.jmh.annotations.BenchmarkMode;
|
||||
|
@ -7,8 +7,8 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.enso.common.MethodNames.Module;
|
||||
import org.enso.compiler.benchmarks.Utils;
|
||||
import org.enso.polyglot.MethodNames.Module;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Value;
|
||||
import org.openjdk.jmh.annotations.Benchmark;
|
||||
|
@ -4,7 +4,7 @@ import java.io.File;
|
||||
import java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
import java.util.Objects;
|
||||
import org.enso.polyglot.MethodNames.Module;
|
||||
import org.enso.common.MethodNames.Module;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Source;
|
||||
import org.graalvm.polyglot.Value;
|
||||
|
@ -2,8 +2,8 @@ package org.enso.interpreter.bench.benchmarks.semantic;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.function.Function;
|
||||
import org.enso.common.MethodNames.Module;
|
||||
import org.enso.compiler.benchmarks.Utils;
|
||||
import org.enso.polyglot.MethodNames.Module;
|
||||
import org.graalvm.polyglot.Value;
|
||||
import org.openjdk.jmh.annotations.Benchmark;
|
||||
import org.openjdk.jmh.annotations.BenchmarkMode;
|
||||
|
@ -6,8 +6,8 @@ import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Random;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.compiler.benchmarks.Utils;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Value;
|
||||
import org.openjdk.jmh.annotations.Benchmark;
|
||||
|
@ -8,6 +8,7 @@ import java.util.List;
|
||||
import java.util.concurrent.Future;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.logging.Level;
|
||||
import org.enso.common.CompilationStage;
|
||||
import org.enso.compiler.Compiler;
|
||||
import org.enso.compiler.PackageRepository;
|
||||
import org.enso.compiler.Passes;
|
||||
@ -18,8 +19,6 @@ import org.enso.compiler.data.CompilerConfig;
|
||||
import org.enso.editions.LibraryName;
|
||||
import org.enso.pkg.Package;
|
||||
import org.enso.pkg.QualifiedName;
|
||||
import org.enso.polyglot.CompilationStage;
|
||||
import org.enso.polyglot.data.TypeGraph;
|
||||
|
||||
/**
|
||||
* Interface that encapsulate all services {@link Compiler} needs from Truffle or other environment.
|
||||
@ -98,19 +97,19 @@ public interface CompilerContext extends CompilerStub {
|
||||
|
||||
CompilationStage getCompilationStage(Module module);
|
||||
|
||||
TypeGraph getTypeHierarchy();
|
||||
org.enso.polyglot.data.TypeGraph getTypeHierarchy();
|
||||
|
||||
Future<Boolean> serializeLibrary(
|
||||
Compiler compiler, LibraryName libraryName, boolean useGlobalCacheLocations);
|
||||
|
||||
scala.Option<List<org.enso.polyglot.Suggestion>> deserializeSuggestions(LibraryName libraryName)
|
||||
throws InterruptedException;
|
||||
|
||||
Future<Boolean> serializeModule(
|
||||
Compiler compiler, Module module, boolean useGlobalCacheLocations, boolean usePool);
|
||||
|
||||
boolean deserializeModule(Compiler compiler, Module module);
|
||||
|
||||
scala.Option<List<org.enso.polyglot.Suggestion>> deserializeSuggestions(LibraryName libraryName)
|
||||
throws InterruptedException;
|
||||
|
||||
void shutdown(boolean waitForPendingJobCompletion);
|
||||
|
||||
public static interface Updater {
|
||||
|
@ -3,6 +3,7 @@ package org.enso.compiler.phase;
|
||||
import java.io.IOException;
|
||||
import java.util.Objects;
|
||||
|
||||
import org.enso.common.CompilationStage;
|
||||
import org.enso.compiler.Compiler;
|
||||
import org.enso.compiler.context.CompilerContext;
|
||||
import org.enso.compiler.core.ir.Module;
|
||||
@ -13,7 +14,6 @@ import org.enso.compiler.data.BindingsMap;
|
||||
import org.enso.compiler.data.BindingsMap$ModuleReference$Concrete;
|
||||
import org.enso.compiler.data.BindingsMap.ResolvedType;
|
||||
import org.enso.editions.LibraryName;
|
||||
import org.enso.polyglot.CompilationStage;
|
||||
|
||||
import scala.Option;
|
||||
import scala.Tuple2;
|
||||
|
@ -36,8 +36,8 @@ import org.enso.compiler.phase.{
|
||||
}
|
||||
import org.enso.editions.LibraryName
|
||||
import org.enso.pkg.QualifiedName
|
||||
import org.enso.polyglot.LanguageInfo
|
||||
import org.enso.polyglot.CompilationStage
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.common.CompilationStage
|
||||
import org.enso.syntax2.Tree
|
||||
|
||||
import java.io.{PrintStream, StringReader}
|
||||
|
@ -8,7 +8,7 @@ import org.enso.compiler.context.{
|
||||
ModuleContext
|
||||
}
|
||||
import org.enso.compiler.data.CompilerConfig
|
||||
import org.enso.polyglot.CompilationStage
|
||||
import org.enso.common.CompilationStage
|
||||
import scala.util.Using
|
||||
|
||||
/** A phase responsible for initializing the builtins' IR from the provided
|
||||
|
@ -7,7 +7,7 @@ import org.enso.compiler.core.ir.{DiagnosticStorage, MetadataStorage}
|
||||
import org.enso.compiler.core.ir.module.scope.{Export, Import}
|
||||
import org.enso.compiler.data.BindingsMap
|
||||
import org.enso.compiler.pass.analyse.BindingAnalysis
|
||||
import org.enso.polyglot.CompilationStage
|
||||
import org.enso.common.CompilationStage
|
||||
|
||||
import scala.collection.mutable
|
||||
import java.io.IOException
|
||||
|
@ -1,9 +1,9 @@
|
||||
package org.enso.interpreter.instrument.job;
|
||||
|
||||
import java.util.logging.Level;
|
||||
import org.enso.common.CompilationStage;
|
||||
import org.enso.interpreter.instrument.execution.RuntimeContext;
|
||||
import org.enso.pkg.QualifiedName;
|
||||
import org.enso.polyglot.CompilationStage;
|
||||
|
||||
/** The job that serializes module. */
|
||||
public final class SerializeModuleJob extends BackgroundJob<Void> {
|
||||
|
@ -23,6 +23,8 @@ import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.logging.Level;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.compiler.context.SimpleUpdate;
|
||||
import org.enso.interpreter.instrument.Endpoint;
|
||||
import org.enso.interpreter.instrument.MethodCallsCache;
|
||||
@ -53,8 +55,6 @@ import org.enso.interpreter.service.error.TypeNotFoundException;
|
||||
import org.enso.lockmanager.client.ConnectedLockManager;
|
||||
import org.enso.logger.masking.MaskedString;
|
||||
import org.enso.pkg.QualifiedName;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.polyglot.debugger.ExecutedVisualization;
|
||||
import org.enso.polyglot.debugger.IdExecutionService;
|
||||
import org.enso.text.editing.JavaEditorAdapter;
|
||||
|
@ -32,7 +32,8 @@ final class DeserializeLibrarySuggestionsJob(
|
||||
"Deserializing suggestions for library [{}].",
|
||||
libraryName
|
||||
)
|
||||
ctx.executionService.getContext.getCompiler.context
|
||||
val cc = ctx.executionService.getContext.getCompiler.context
|
||||
cc
|
||||
.deserializeSuggestions(libraryName)
|
||||
.foreach { cachedSuggestions =>
|
||||
ctx.endpoint.sendToClient(
|
||||
|
@ -2,6 +2,7 @@ package org.enso.interpreter.instrument.job
|
||||
|
||||
import cats.implicits._
|
||||
import com.oracle.truffle.api.TruffleLogger
|
||||
import org.enso.common.CompilationStage
|
||||
import org.enso.compiler.CompilerResult
|
||||
import org.enso.compiler.context._
|
||||
import org.enso.compiler.core.Implicits.AsMetadata
|
||||
@ -31,7 +32,6 @@ import org.enso.interpreter.instrument.{
|
||||
import org.enso.interpreter.runtime.Module
|
||||
import org.enso.interpreter.service.error.ModuleNotFoundForFileException
|
||||
import org.enso.pkg.QualifiedName
|
||||
import org.enso.polyglot.CompilationStage
|
||||
import org.enso.polyglot.runtime.Runtime.Api
|
||||
import org.enso.polyglot.runtime.Runtime.Api.StackItem
|
||||
import org.enso.text.buffer.Rope
|
||||
|
@ -28,7 +28,7 @@ import org.enso.interpreter.service.ExecutionService.{
|
||||
FunctionPointer
|
||||
}
|
||||
import org.enso.interpreter.service.error._
|
||||
import org.enso.polyglot.LanguageInfo
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.polyglot.debugger.ExecutedVisualization
|
||||
import org.enso.polyglot.runtime.Runtime.Api
|
||||
import org.enso.polyglot.runtime.Runtime.Api.{ContextId, ExecutionResult}
|
||||
|
@ -1,6 +1,6 @@
|
||||
package org.enso.interpreter.runtime;
|
||||
|
||||
import org.enso.polyglot.CompilationStage;
|
||||
import org.enso.common.CompilationStage;
|
||||
|
||||
public final class ModuleTestUtils {
|
||||
private ModuleTestUtils() {}
|
||||
|
@ -13,7 +13,7 @@ import org.enso.interpreter.runtime
|
||||
import org.enso.interpreter.runtime.ModuleTestUtils
|
||||
import org.enso.compiler.context.LocalScope
|
||||
import org.enso.pkg.QualifiedName
|
||||
import org.enso.polyglot.CompilationStage
|
||||
import org.enso.common.CompilationStage
|
||||
|
||||
/** A reduced version of [[org.enso.compiler.test.CompilerRunner]] that avoids introducing a cyclic dependency
|
||||
* to `runtime-instrument-common` subject.
|
||||
|
@ -58,7 +58,7 @@ public class RuntimeServerInstrument extends TruffleInstrument {
|
||||
|
||||
@Override
|
||||
public void onLanguageContextInitialized(TruffleContext context, LanguageInfo language) {
|
||||
if (language.getId().equals(org.enso.polyglot.LanguageInfo.ID)) {
|
||||
if (language.getId().equals(org.enso.common.LanguageInfo.ID)) {
|
||||
Object token = context.enter(null);
|
||||
ExecutionService service;
|
||||
try {
|
||||
|
@ -9,7 +9,7 @@ import static org.junit.Assert.fail;
|
||||
import java.net.URI;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.logging.Level;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.PolyglotException;
|
||||
|
@ -9,12 +9,12 @@ import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.compiler.core.ir.module.scope.Definition;
|
||||
import org.enso.compiler.core.ir.module.scope.Export;
|
||||
import org.enso.compiler.core.ir.module.scope.definition.Method;
|
||||
import org.enso.interpreter.runtime.EnsoContext;
|
||||
import org.enso.interpreter.test.TestBase;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.junit.AfterClass;
|
||||
|
@ -17,11 +17,11 @@ import java.util.logging.Handler;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.LogRecord;
|
||||
import java.util.logging.SimpleFormatter;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.compiler.core.ir.Module;
|
||||
import org.enso.interpreter.runtime.EnsoContext;
|
||||
import org.enso.pkg.PackageManager;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.io.IOAccess;
|
||||
|
@ -9,6 +9,8 @@ import java.util.concurrent.TimeoutException;
|
||||
import java.util.function.Supplier;
|
||||
import java.util.stream.Stream;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.editions.LibraryName;
|
||||
import org.enso.interpreter.runtime.EnsoContext;
|
||||
import org.enso.interpreter.runtime.util.TruffleFileSystem;
|
||||
@ -16,8 +18,6 @@ import org.enso.interpreter.test.InterpreterContext;
|
||||
import org.enso.interpreter.util.ScalaConversions;
|
||||
import org.enso.pkg.Package;
|
||||
import org.enso.pkg.PackageManager;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.polyglot.Suggestion;
|
||||
import org.junit.After;
|
||||
import org.junit.Assert;
|
||||
|
@ -9,10 +9,10 @@ import java.io.IOException;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.logging.Level;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.interpreter.runtime.EnsoContext;
|
||||
import org.enso.pkg.PackageManager;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.io.IOAccess;
|
||||
|
@ -5,12 +5,12 @@ import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import org.enso.common.CompilationStage;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.compiler.CompilerTest;
|
||||
import org.enso.interpreter.runtime.EnsoContext;
|
||||
import org.enso.interpreter.test.TestBase;
|
||||
import org.enso.polyglot.CompilationStage;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Source;
|
||||
|
@ -6,8 +6,8 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.logging.Level;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.enso.text.buffer.Rope$;
|
||||
import org.graalvm.polyglot.Context;
|
||||
|
@ -9,11 +9,11 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.logging.Level;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.compiler.data.BindingsMap;
|
||||
import org.enso.compiler.data.BindingsMap$ModuleReference$Concrete;
|
||||
import org.enso.pkg.QualifiedName;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Engine;
|
||||
|
@ -1,6 +1,6 @@
|
||||
package org.enso.interpreter.runtime;
|
||||
|
||||
import org.enso.polyglot.CompilationStage;
|
||||
import org.enso.common.CompilationStage;
|
||||
|
||||
public final class ModuleTestUtils {
|
||||
private ModuleTestUtils() {}
|
||||
|
@ -8,9 +8,9 @@ import com.oracle.truffle.api.interop.InteropLibrary;
|
||||
import com.oracle.truffle.api.interop.TruffleObject;
|
||||
import com.oracle.truffle.api.library.ExportLibrary;
|
||||
import com.oracle.truffle.api.library.ExportMessage;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.interpreter.test.TestBase;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.junit.Test;
|
||||
|
||||
public class ResourceManagerTest extends TestBase {
|
||||
|
@ -5,12 +5,12 @@ import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
import java.util.function.Function;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.interpreter.runtime.data.atom.Atom;
|
||||
import org.enso.interpreter.runtime.data.atom.AtomConstructor;
|
||||
import org.enso.interpreter.runtime.data.atom.AtomNewInstanceNode;
|
||||
import org.enso.interpreter.runtime.data.atom.StructsLibrary;
|
||||
import org.enso.interpreter.runtime.error.PanicException;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.junit.AfterClass;
|
||||
import org.junit.BeforeClass;
|
||||
|
@ -6,7 +6,7 @@ import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.PolyglotException;
|
||||
import org.junit.AfterClass;
|
||||
|
@ -4,8 +4,8 @@ import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.interpreter.runtime.error.PanicException;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.PolyglotException;
|
||||
import org.graalvm.polyglot.Source;
|
||||
|
@ -8,7 +8,7 @@ import com.google.common.collect.Streams;
|
||||
import java.util.Arrays;
|
||||
import java.util.Random;
|
||||
import java.util.stream.Stream;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.PolyglotException;
|
||||
import org.graalvm.polyglot.Value;
|
||||
|
@ -8,7 +8,7 @@ import com.google.common.collect.Streams;
|
||||
import java.util.Arrays;
|
||||
import java.util.Random;
|
||||
import java.util.stream.Stream;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Value;
|
||||
import org.junit.AfterClass;
|
||||
|
@ -31,7 +31,7 @@ import java.util.Set;
|
||||
import java.util.TreeSet;
|
||||
import java.util.logging.Level;
|
||||
import java.util.stream.Collectors;
|
||||
import org.enso.polyglot.MethodNames.Module;
|
||||
import org.enso.common.MethodNames.Module;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Engine;
|
||||
|
@ -11,12 +11,12 @@ import java.nio.file.Paths;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.logging.Level;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames.Module;
|
||||
import org.enso.common.MethodNames.TopScope;
|
||||
import org.enso.compiler.core.ir.Diagnostic;
|
||||
import org.enso.interpreter.runtime.EnsoContext;
|
||||
import org.enso.interpreter.runtime.util.DiagnosticFormatter;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames.Module;
|
||||
import org.enso.polyglot.MethodNames.TopScope;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.PolyglotException;
|
||||
|
@ -15,11 +15,11 @@ import java.time.ZonedDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.interpreter.node.expression.builtin.interop.syntax.HostValueToEnsoNode;
|
||||
import org.enso.interpreter.node.expression.builtin.meta.EqualsNode;
|
||||
import org.enso.interpreter.runtime.callable.UnresolvedConversion;
|
||||
import org.enso.interpreter.runtime.number.EnsoBigInteger;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Source;
|
||||
import org.graalvm.polyglot.Value;
|
||||
|
@ -7,8 +7,8 @@ import static org.junit.Assert.assertNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
import org.enso.common.HostEnsoUtils;
|
||||
import org.enso.interpreter.instrument.job.VisualizationResult;
|
||||
import org.enso.polyglot.HostEnsoUtils;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.PolyglotException;
|
||||
import org.graalvm.polyglot.Value;
|
||||
|
@ -7,7 +7,7 @@ import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.stream.Collectors;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Source;
|
||||
import org.graalvm.polyglot.Value;
|
||||
|
@ -15,9 +15,9 @@ import java.net.URI;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Set;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.interpreter.runtime.type.ConstantsGen;
|
||||
import org.enso.interpreter.test.ValuesGenerator.Language;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Source;
|
||||
import org.graalvm.polyglot.Value;
|
||||
|
@ -3,7 +3,7 @@ package org.enso.interpreter.test;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
import org.enso.polyglot.HostEnsoUtils;
|
||||
import org.enso.common.HostEnsoUtils;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.PolyglotException;
|
||||
import org.graalvm.polyglot.Value;
|
||||
|
@ -6,7 +6,7 @@ import java.io.ByteArrayOutputStream;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Source;
|
||||
import org.graalvm.polyglot.Value;
|
||||
|
@ -7,7 +7,7 @@ import static org.junit.Assert.fail;
|
||||
import java.io.OutputStream;
|
||||
import java.net.URI;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.PolyglotException;
|
||||
import org.graalvm.polyglot.Source;
|
||||
|
@ -10,7 +10,7 @@ import java.io.OutputStream;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.util.ArrayList;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.PolyglotException;
|
||||
import org.graalvm.polyglot.Source;
|
||||
|
@ -15,11 +15,11 @@ import java.util.Map;
|
||||
import java.util.concurrent.Callable;
|
||||
import java.util.function.Function;
|
||||
import java.util.logging.Level;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames.Module;
|
||||
import org.enso.common.MethodNames.TopScope;
|
||||
import org.enso.interpreter.EnsoLanguage;
|
||||
import org.enso.interpreter.runtime.EnsoContext;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames.Module;
|
||||
import org.enso.polyglot.MethodNames.TopScope;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Language;
|
||||
|
@ -23,8 +23,8 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.TimeZone;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.enso.polyglot.MethodNames.Module;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.common.MethodNames.Module;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.PolyglotException;
|
||||
import org.graalvm.polyglot.Value;
|
||||
|
@ -3,12 +3,12 @@ package org.enso.interpreter.test;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.interpreter.runtime.EnsoContext;
|
||||
import org.enso.interpreter.runtime.error.Warning;
|
||||
import org.enso.interpreter.runtime.error.WarningsLibrary;
|
||||
import org.enso.interpreter.runtime.error.WithWarnings;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.junit.AfterClass;
|
||||
import org.junit.Assert;
|
||||
|
@ -11,10 +11,10 @@ import static org.junit.Assert.fail;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.util.List;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames;
|
||||
import org.enso.interpreter.runtime.EnsoContext;
|
||||
import org.enso.interpreter.test.TestBase;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.PolyglotException;
|
||||
import org.graalvm.polyglot.Value;
|
||||
|
@ -5,10 +5,10 @@ import static org.hamcrest.core.Is.is;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.common.MethodNames.TopScope;
|
||||
import org.enso.interpreter.runtime.EnsoContext;
|
||||
import org.enso.interpreter.test.TestBase;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.MethodNames.TopScope;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.graalvm.polyglot.Value;
|
||||
import org.junit.AfterClass;
|
||||
|
@ -4,8 +4,8 @@ import static org.junit.Assert.assertTrue;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.util.List;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.interpreter.test.TestBase;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.graalvm.polyglot.Context;
|
||||
import org.junit.After;
|
||||
import org.junit.AfterClass;
|
||||
|
@ -7,7 +7,7 @@ import org.enso.interpreter.runtime
|
||||
import org.enso.interpreter.runtime.EnsoContext
|
||||
import org.enso.interpreter.test.InterpreterContext
|
||||
import org.enso.pkg.QualifiedName
|
||||
import org.enso.polyglot.{LanguageInfo, MethodNames}
|
||||
import org.enso.common.{LanguageInfo, MethodNames}
|
||||
import org.scalatest.OptionValues
|
||||
import org.scalatest.matchers.should.Matchers
|
||||
import org.scalatest.wordspec.AnyWordSpecLike
|
||||
|
@ -17,7 +17,7 @@ import org.enso.interpreter.runtime
|
||||
import org.enso.interpreter.runtime.ModuleTestUtils
|
||||
import org.enso.compiler.context.LocalScope
|
||||
import org.enso.pkg.QualifiedName
|
||||
import org.enso.polyglot.CompilationStage
|
||||
import org.enso.common.CompilationStage
|
||||
|
||||
import java.util.UUID
|
||||
|
||||
|
@ -4,7 +4,8 @@ import org.apache.commons.io.FileUtils
|
||||
import org.apache.commons.io.filefilter.{IOFileFilter, TrueFileFilter}
|
||||
import org.enso.interpreter.test.{InterpreterException, ValueEquality}
|
||||
import org.enso.pkg.PackageManager
|
||||
import org.enso.polyglot.{LanguageInfo, PolyglotContext, RuntimeOptions}
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.polyglot.{PolyglotContext, RuntimeOptions}
|
||||
import org.graalvm.polyglot.{Context, Value}
|
||||
import org.scalatest.BeforeAndAfterAll
|
||||
import org.scalatest.flatspec.AnyFlatSpec
|
||||
|
@ -1,12 +1,11 @@
|
||||
package org.enso.compiler.test.context
|
||||
|
||||
import org.enso.compiler.context.SuggestionBuilder
|
||||
import org.enso.compiler.core.ir.Module
|
||||
import org.enso.interpreter.runtime
|
||||
import org.enso.interpreter.runtime.EnsoContext
|
||||
import org.enso.interpreter.test.InterpreterContext
|
||||
import org.enso.pkg.QualifiedName
|
||||
import org.enso.polyglot.{LanguageInfo, MethodNames, Suggestion}
|
||||
import org.enso.common.{LanguageInfo, MethodNames}
|
||||
import org.enso.polyglot.Suggestion
|
||||
import org.enso.polyglot.data.Tree
|
||||
import org.scalatest.matchers.should.Matchers
|
||||
import org.scalatest.wordspec.AnyWordSpecLike
|
||||
|
@ -10,7 +10,9 @@ import org.enso.interpreter.runtime
|
||||
import org.enso.interpreter.runtime.EnsoContext
|
||||
import org.enso.persist.Persistance
|
||||
import org.enso.pkg.QualifiedName
|
||||
import org.enso.polyglot.{LanguageInfo, MethodNames, RuntimeOptions}
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.common.MethodNames
|
||||
import org.enso.polyglot.RuntimeOptions
|
||||
import org.graalvm.polyglot.{Context, Engine}
|
||||
import org.scalatest.BeforeAndAfter
|
||||
import org.scalatest.matchers.should.Matchers
|
||||
|
@ -10,7 +10,7 @@ import org.enso.interpreter.runtime
|
||||
import org.enso.interpreter.runtime.EnsoContext
|
||||
import org.enso.interpreter.test.InterpreterContext
|
||||
import org.enso.pkg.QualifiedName
|
||||
import org.enso.polyglot.{LanguageInfo, MethodNames}
|
||||
import org.enso.common.{LanguageInfo, MethodNames}
|
||||
import org.scalatest.matchers.{MatchResult, Matcher}
|
||||
import org.scalatest.matchers.should.Matchers
|
||||
import org.scalatest.wordspec.AnyWordSpecLike
|
||||
|
@ -13,12 +13,8 @@ import org.enso.polyglot.debugger.{
|
||||
ReplExecutor,
|
||||
SessionManager
|
||||
}
|
||||
import org.enso.polyglot.{
|
||||
Function,
|
||||
LanguageInfo,
|
||||
PolyglotContext,
|
||||
RuntimeOptions
|
||||
}
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.polyglot.{Function, PolyglotContext, RuntimeOptions}
|
||||
import org.graalvm.polyglot.{Context, Value}
|
||||
import org.scalatest.Assertions
|
||||
import org.scalatest.matchers.should.Matchers
|
||||
|
@ -1,7 +1,8 @@
|
||||
package org.enso.interpreter.test
|
||||
|
||||
import org.enso.pkg.PackageManager
|
||||
import org.enso.polyglot.{LanguageInfo, PolyglotContext, RuntimeOptions}
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.polyglot.{PolyglotContext, RuntimeOptions}
|
||||
import org.graalvm.polyglot.{Context, Value}
|
||||
import org.scalatest.flatspec.AnyFlatSpec
|
||||
import org.scalatest.matchers.should.Matchers
|
||||
|
@ -2,7 +2,9 @@ package org.enso.interpreter.test.instrument
|
||||
|
||||
import org.enso.interpreter.runtime.`type`.ConstantsGen
|
||||
import org.enso.interpreter.test.Metadata
|
||||
import org.enso.polyglot._
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.polyglot.RuntimeOptions
|
||||
import org.enso.polyglot.RuntimeServerInfo
|
||||
import org.enso.polyglot.runtime.Runtime.Api
|
||||
import org.graalvm.polyglot.Context
|
||||
import org.scalatest.BeforeAndAfterEach
|
||||
|
@ -3,7 +3,8 @@ package org.enso.interpreter.test.instrument
|
||||
import org.apache.commons.io.FileUtils
|
||||
import org.enso.distribution.locking.ThreadSafeFileLockManager
|
||||
import org.enso.pkg.{Package, PackageManager}
|
||||
import org.enso.polyglot.{LanguageInfo, PolyglotContext}
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.polyglot.PolyglotContext
|
||||
import org.enso.polyglot.runtime.Runtime.Api
|
||||
import org.graalvm.polyglot.Context
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
package org.enso.interpreter.test.instrument
|
||||
|
||||
import org.enso.interpreter.test.Metadata
|
||||
import org.enso.polyglot._
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.polyglot.RuntimeOptions
|
||||
import org.enso.polyglot.RuntimeServerInfo
|
||||
import org.enso.polyglot.runtime.Runtime.Api
|
||||
import org.enso.text.{ContentVersion, Sha3_224VersionCalculator}
|
||||
import org.graalvm.polyglot.Context
|
||||
|
@ -12,7 +12,10 @@ import org.enso.pkg.{
|
||||
Package,
|
||||
PackageManager
|
||||
}
|
||||
import org.enso.polyglot._
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.common.MethodNames
|
||||
import org.enso.polyglot.RuntimeOptions
|
||||
import org.enso.polyglot.RuntimeServerInfo
|
||||
import org.enso.polyglot.runtime.Runtime.Api
|
||||
import org.enso.testkit.OsSpec
|
||||
import org.graalvm.polyglot.Context
|
||||
|
@ -2,7 +2,9 @@ package org.enso.interpreter.test.instrument
|
||||
|
||||
import org.enso.interpreter.runtime.`type`.ConstantsGen
|
||||
import org.enso.interpreter.test.Metadata
|
||||
import org.enso.polyglot._
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.polyglot.RuntimeOptions
|
||||
import org.enso.polyglot.RuntimeServerInfo
|
||||
import org.enso.polyglot.runtime.Runtime.Api
|
||||
import org.enso.text.editing.model
|
||||
import org.enso.text.editing.model.TextEdit
|
||||
|
@ -4,7 +4,10 @@ import org.enso.interpreter.runtime.EnsoContext
|
||||
import org.enso.interpreter.runtime.`type`.ConstantsGen
|
||||
import org.enso.interpreter.test.Metadata
|
||||
import org.enso.pkg.{Package, PackageManager}
|
||||
import org.enso.polyglot._
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.common.MethodNames
|
||||
import org.enso.polyglot.RuntimeOptions
|
||||
import org.enso.polyglot.RuntimeServerInfo
|
||||
import org.enso.polyglot.runtime.Runtime.Api
|
||||
import org.enso.testkit.OsSpec
|
||||
import org.graalvm.polyglot.Context
|
||||
|
@ -2,7 +2,9 @@ package org.enso.interpreter.test.instrument
|
||||
|
||||
import org.enso.interpreter.runtime.`type`.{Constants, ConstantsGen}
|
||||
import org.enso.interpreter.test.Metadata
|
||||
import org.enso.polyglot._
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.polyglot.RuntimeOptions
|
||||
import org.enso.polyglot.RuntimeServerInfo
|
||||
import org.enso.polyglot.runtime.Runtime.Api
|
||||
import org.enso.text.{ContentVersion, Sha3_224VersionCalculator}
|
||||
import org.graalvm.polyglot.Context
|
||||
|
@ -1,6 +1,7 @@
|
||||
package org.enso.interpreter.test.instrument
|
||||
|
||||
import org.enso.polyglot.{LanguageInfo, RuntimeOptions}
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.polyglot.RuntimeOptions
|
||||
import org.graalvm.polyglot.{Context, PolyglotException}
|
||||
import org.scalatest.matchers.should.Matchers
|
||||
import org.scalatest.wordspec.AnyWordSpec
|
||||
|
@ -3,7 +3,9 @@ package org.enso.interpreter.test.instrument
|
||||
import org.apache.commons.io.output.TeeOutputStream
|
||||
import org.enso.interpreter.runtime.`type`.ConstantsGen
|
||||
import org.enso.interpreter.test.Metadata
|
||||
import org.enso.polyglot._
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.polyglot.RuntimeOptions
|
||||
import org.enso.polyglot.RuntimeServerInfo
|
||||
import org.enso.polyglot.runtime.Runtime.Api
|
||||
import org.enso.text.editing.model
|
||||
import org.enso.text.editing.model.TextEdit
|
||||
|
@ -4,8 +4,11 @@ import org.apache.commons.io.output.TeeOutputStream
|
||||
import org.enso.interpreter.runtime.EnsoContext
|
||||
import org.enso.interpreter.runtime.`type`.{Constants, ConstantsGen, Types}
|
||||
import org.enso.interpreter.test.Metadata
|
||||
import org.enso.polyglot._
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.common.MethodNames
|
||||
import org.enso.polyglot.data.TypeGraph
|
||||
import org.enso.polyglot.RuntimeOptions
|
||||
import org.enso.polyglot.RuntimeServerInfo
|
||||
import org.enso.polyglot.runtime.Runtime.Api
|
||||
import org.enso.text.editing.model
|
||||
import org.enso.text.editing.model.TextEdit
|
||||
|
@ -2,7 +2,10 @@ package org.enso.interpreter.test.instrument
|
||||
|
||||
import org.enso.interpreter.test.Metadata
|
||||
import org.enso.pkg.{Package, PackageManager, QualifiedName}
|
||||
import org.enso.polyglot._
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.polyglot.RuntimeOptions
|
||||
import org.enso.polyglot.RuntimeServerInfo
|
||||
import org.enso.polyglot.Suggestion
|
||||
import org.enso.polyglot.runtime.Runtime.Api
|
||||
import org.enso.testkit.OsSpec
|
||||
import org.graalvm.polyglot.Context
|
||||
|
@ -1,7 +1,12 @@
|
||||
package org.enso.interpreter.test.instrument
|
||||
|
||||
import org.enso.interpreter.runtime.`type`.ConstantsGen
|
||||
import org.enso.polyglot._
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.polyglot.RuntimeOptions
|
||||
import org.enso.polyglot.RuntimeServerInfo
|
||||
import org.enso.polyglot.ExportedSymbol
|
||||
import org.enso.polyglot.ModuleExports
|
||||
import org.enso.polyglot.Suggestion
|
||||
import org.enso.polyglot.data.Tree
|
||||
import org.enso.polyglot.runtime.Runtime.Api
|
||||
import org.enso.text.editing.model
|
||||
|
@ -1,9 +1,9 @@
|
||||
package org.enso.interpreter.test.instrument
|
||||
|
||||
import org.enso.interpreter.runtime.`type`.ConstantsGen
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.polyglot.{
|
||||
ExportedSymbol,
|
||||
LanguageInfo,
|
||||
ModuleExports,
|
||||
RuntimeOptions,
|
||||
RuntimeServerInfo,
|
||||
|
@ -4,7 +4,10 @@ import org.apache.commons.io.output.TeeOutputStream
|
||||
import org.enso.interpreter.runtime.EnsoContext
|
||||
import org.enso.interpreter.runtime.`type`.ConstantsGen
|
||||
import org.enso.interpreter.test.Metadata
|
||||
import org.enso.polyglot._
|
||||
import org.enso.common.LanguageInfo
|
||||
import org.enso.common.MethodNames
|
||||
import org.enso.polyglot.RuntimeOptions
|
||||
import org.enso.polyglot.RuntimeServerInfo
|
||||
import org.enso.polyglot.runtime.Runtime.Api
|
||||
import org.enso.text.editing.model
|
||||
import org.enso.text.editing.model.TextEdit
|
||||
|
@ -6,7 +6,7 @@ import org.enso.interpreter.node.controlflow.caseexpr.CaseNode
|
||||
import org.enso.interpreter.node.expression.literal.LiteralNode
|
||||
import org.enso.interpreter.node.scope.{AssignmentNode, ReadLocalVariableNode}
|
||||
import org.enso.interpreter.test.{InterpreterContext, InterpreterTest}
|
||||
import org.enso.polyglot.MethodNames
|
||||
import org.enso.common.MethodNames
|
||||
|
||||
class CodeLocationsTest extends InterpreterTest {
|
||||
|
||||
|
@ -2,7 +2,7 @@ package org.enso.interpreter.test.semantic
|
||||
|
||||
import org.enso.interpreter.runtime.EnsoContext
|
||||
import org.enso.interpreter.test.{InterpreterContext, InterpreterTest}
|
||||
import org.enso.polyglot.{LanguageInfo, MethodNames}
|
||||
import org.enso.common.{LanguageInfo, MethodNames}
|
||||
|
||||
import scala.ref.WeakReference
|
||||
import scala.util.Try
|
||||
|
@ -15,6 +15,7 @@ import java.io.ByteArrayOutputStream;
|
||||
import java.io.PrintStream;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import org.enso.common.LanguageInfo;
|
||||
import org.enso.compiler.Compiler;
|
||||
import org.enso.compiler.context.InlineContext;
|
||||
import org.enso.compiler.context.LocalScope;
|
||||
@ -43,7 +44,6 @@ import org.enso.interpreter.runtime.tag.Patchable;
|
||||
import org.enso.interpreter.util.FileDetector;
|
||||
import org.enso.lockmanager.client.ConnectedLockManager;
|
||||
import org.enso.logger.masking.MaskingFactory;
|
||||
import org.enso.polyglot.LanguageInfo;
|
||||
import org.enso.polyglot.RuntimeOptions;
|
||||
import org.enso.syntax2.Line;
|
||||
import org.enso.syntax2.Tree;
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user