Handle PanicSentinel in Interpreter

distribution/std-lib/Base/src/Data/Number/Extensions.enso

@@ -1,6 +1,7 @@
 from Base import all
 polyglot java import java.lang.Math
 polyglot java import java.lang.Double
+polyglot java import java.lang.Integer as Java_Integer
 polyglot java import java.lang.String
 
 ## Computes the inverse of the sine function
@@ -102,3 +103,16 @@ Decimal.parse : Text -> Decimal | Nothing
 Decimal.parse text =
     Panic.recover (Double.parseDouble [text]) . catch (_ -> Nothing)
 
+## Parses a textual representation of an integer into an integer number.
+   Returns `Nothing` if the text does not represent a valid integer.
+Integer.parse : Text -> Integer | Nothing
+Integer.parse text =
+    Panic.recover (Java_Integer.parseInt [text]) . catch (_ -> Nothing)
+
+## Parses a textual representation of a number into an integer or decimal number.
+   Returns `Nothing` if the text does not represent a valid number.
+Number.parse : Text -> Number | Nothing
+Number.parse text =
+    case Integer.parse text of
+        Nothing -> Decimal.parse text
+        value   -> value

docs/language-server/protocol-language-server.md

@@ -319,7 +319,7 @@ interface ExpressionUpdate {
 An information about the computed value.
 
 ```typescript
-type ExpressionUpdatePayload = Value | DatafalowError | RuntimeError | Poisoned;
+type ExpressionUpdatePayload = Value | DatafalowError | RuntimeError;
 
 /**
  * An empty payload. Indicates that the expression was computed to a value.
@@ -350,17 +350,6 @@ interface RuntimeError {
    */
   trace: ExpressionId[];
 }
-
-/**
- * Indicates that the expression was not computed due to a dependency,
- * that failed with the runtime exception.
- */
-interface Poisoned {
-  /**
-   * The list of expressions leading to the root expression that failed.
-   */
-  trace: ExpressionId[];
-}
 ```
 
 ### `VisualisationConfiguration`

engine/language-server/src/main/scala/org/enso/languageserver/runtime/ContextEventsListener.scala

@@ -203,9 +203,6 @@ final class ContextEventsListener(
       case Api.ExpressionUpdate.Payload.RuntimeError(message, trace) =>
         ContextRegistryProtocol.ExpressionUpdate.Payload
           .RuntimeError(message, trace)
-
-      case Api.ExpressionUpdate.Payload.Poisoned(trace) =>
-        ContextRegistryProtocol.ExpressionUpdate.Payload.Poisoned(trace)
     }
 
   /** Convert the runtime profiling info to the context registry protocol

engine/language-server/src/main/scala/org/enso/languageserver/runtime/ContextRegistryProtocol.scala

@@ -148,13 +148,6 @@ object ContextRegistryProtocol {
         trace: Seq[UUID]
       ) extends Payload
 
-      /** Indicates that the expression was not computed due to a dependency,
-        * that failed with the runtime exception.
-        *
-        * @param trace the list of expressions leading to the root error.
-        */
-      case class Poisoned(trace: Seq[UUID]) extends Payload
-
       private object CodecField {
 
         val Type = "type"
@@ -168,7 +161,6 @@ object ContextRegistryProtocol {
 
         val RuntimeError = "RuntimeError"
 
-        val Poisoned = "Poisoned"
       }
 
       implicit val encoder: Encoder[Payload] =
@@ -189,13 +181,6 @@ object ContextRegistryProtocol {
               .deepMerge(
                 Json.obj(CodecField.Type -> PayloadType.RuntimeError.asJson)
               )
-
-          case m: Payload.Poisoned =>
-            Encoder[Payload.Poisoned]
-              .apply(m)
-              .deepMerge(
-                Json.obj(CodecField.Type -> PayloadType.Poisoned.asJson)
-              )
         }
 
       implicit val decoder: Decoder[Payload] =
@@ -209,9 +194,6 @@ object ContextRegistryProtocol {
 
             case PayloadType.RuntimeError =>
               Decoder[Payload.RuntimeError].tryDecode(cursor)
-
-            case PayloadType.Poisoned =>
-              Decoder[Payload.Poisoned].tryDecode(cursor)
           }
         }
     }

engine/language-server/src/main/scala/org/enso/languageserver/search/SuggestionsHandler.scala

@@ -90,7 +90,7 @@ final class SuggestionsHandler(
 
   override def preStart(): Unit = {
     context.system.eventStream
-      .subscribe(self, classOf[Api.ExpressionValuesComputed])
+      .subscribe(self, classOf[Api.ExpressionUpdates])
     context.system.eventStream
       .subscribe(self, classOf[Api.SuggestionsDatabaseModuleUpdateNotification])
     context.system.eventStream.subscribe(self, classOf[ProjectNameChangedEvent])
@@ -167,11 +167,11 @@ final class SuggestionsHandler(
             )
         }
 
-    case Api.ExpressionValuesComputed(_, updates) =>
+    case Api.ExpressionUpdates(_, updates) =>
       log.debug(
         s"ExpressionValuesComputed ${updates.map(u => (u.expressionId, u.expressionType))}"
       )
-      val types = updates
+      val types = updates.toSeq
         .flatMap(update => update.expressionType.map(update.expressionId -> _))
       suggestionsRepo
         .updateAll(types)

engine/language-server/src/test/scala/org/enso/languageserver/runtime/ContextEventsListenerSpec.scala

@@ -208,46 +208,6 @@ class ContextEventsListenerSpec
         )
     }
 
-    "send poisoning error updates" taggedAs Retry in withDb {
-      (clientId, contextId, _, router, listener) =>
-        listener ! Api.ExpressionUpdates(
-          contextId,
-          Set(
-            Api.ExpressionUpdate(
-              Suggestions.local.externalId.get,
-              None,
-              None,
-              Vector(),
-              false,
-              Api.ExpressionUpdate.Payload.Poisoned(
-                Seq(Suggestions.method.externalId.get)
-              )
-            )
-          )
-        )
-
-        router.expectMsg(
-          DeliverToJsonController(
-            clientId,
-            ContextRegistryProtocol.ExpressionUpdatesNotification(
-              contextId,
-              Vector(
-                ContextRegistryProtocol.ExpressionUpdate(
-                  Suggestions.local.externalId.get,
-                  None,
-                  None,
-                  Vector(),
-                  false,
-                  ContextRegistryProtocol.ExpressionUpdate.Payload
-                    .Poisoned(Seq(Suggestions.method.externalId.get))
-                )
-              ),
-              None
-            )
-          )
-        )
-    }
-
     "send expression updates grouped" taggedAs Retry in withDb(0.seconds) {
       (clientId, contextId, repo, router, listener) =>
         Await.result(

engine/polyglot-api/src/main/scala/org/enso/polyglot/runtime/Runtime.scala

@@ -105,10 +105,6 @@ object Runtime {
         value = classOf[Api.VisualisationModified],
         name  = "visualisationModified"
       ),
-      new JsonSubTypes.Type(
-        value = classOf[Api.ExpressionValuesComputed],
-        name  = "expressionValuesComputed"
-      ),
       new JsonSubTypes.Type(
         value = classOf[Api.ExpressionUpdates],
         name  = "expressionUpdates"
@@ -251,24 +247,6 @@ object Runtime {
       case class LocalCall(expressionId: ExpressionId) extends StackItem
     }
 
-    /** An update containing information about expression.
-      *
-      * @param expressionId expression id.
-      * @param expressionType the type of expression.
-      * @param methodCall the pointer to a method definition.
-      * @param profilingInfo profiling information about the execution of this
-      *                      expression
-      * @param fromCache whether or not the value for this expression came from
-      *                  the cache
-      */
-    case class ExpressionValueUpdate(
-      expressionId: ExpressionId,
-      expressionType: Option[String],
-      methodCall: Option[MethodPointer],
-      profilingInfo: Vector[ProfilingInfo],
-      fromCache: Boolean
-    )
-
     /** An update about the computed expression.
       *
       * @param expressionId the expression id
@@ -305,10 +283,6 @@ object Runtime {
           new JsonSubTypes.Type(
             value = classOf[Payload.RuntimeError],
             name  = "expressionUpdatePayloadRuntimeError"
-          ),
-          new JsonSubTypes.Type(
-            value = classOf[Payload.Poisoned],
-            name  = "expressionUpdatePayloadPoisoned"
           )
         )
       )
@@ -336,12 +310,6 @@ object Runtime {
           trace: Seq[ExpressionId]
         ) extends Payload
 
-        /** Indicates that the expression was not computed due to a dependency,
-          * that failed with the runtime exception.
-          *
-          * @param trace the list of expressions leading to the root error.
-          */
-        case class Poisoned(trace: Seq[ExpressionId]) extends Payload
       }
     }
 
@@ -397,17 +365,6 @@ object Runtime {
           extends InvalidatedExpressions
     }
 
-    // TODO: [DB] Remove when IDE implements new updates API
-    /** A notification about updated expressions of the context.
-      *
-      * @param contextId the context's id.
-      * @param updates a list of updates.
-      */
-    case class ExpressionValuesComputed(
-      contextId: ContextId,
-      updates: Vector[ExpressionValueUpdate]
-    ) extends ApiNotification
-
     /** A notification about updated expressions of the context.
       *
       * @param contextId the context's id.

engine/runtime/src/main/java/org/enso/interpreter/instrument/IdExecutionInstrument.java

@@ -10,7 +10,6 @@
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
-import java.util.Arrays;
 import org.enso.interpreter.instrument.execution.Timer;
 import org.enso.interpreter.instrument.profiling.ExecutionTime;
 import org.enso.interpreter.instrument.profiling.ProfilingInfo;
@@ -19,14 +18,13 @@
 import org.enso.interpreter.node.MethodRootNode;
 import org.enso.interpreter.node.callable.FunctionCallInstrumentationNode;
 import org.enso.interpreter.runtime.control.TailCallException;
+import org.enso.interpreter.runtime.error.PanicException;
+import org.enso.interpreter.runtime.error.PanicSentinel;
 import org.enso.interpreter.runtime.tag.IdentifiedTag;
 import org.enso.interpreter.runtime.type.Types;
 import org.enso.pkg.QualifiedName;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
 import java.util.function.Consumer;
 
 /** An instrument for getting values from AST-identified expressions. */
@@ -51,7 +49,8 @@ protected void onCreate(Env env) {
     this.env = env;
   }
 
-  /** Override the default nanosecond timer with the specified {@code timer}.
+  /**
+   * Override the default nanosecond timer with the specified {@code timer}.
    *
    * @param timer the timer to override with
    */
@@ -270,7 +269,7 @@ private static class IdExecutionEventListener implements ExecutionEventListener
     private final Consumer<ExpressionCall> functionCallCallback;
     private final Consumer<ExpressionValue> onComputedCallback;
     private final Consumer<ExpressionValue> onCachedCallback;
-    private final Consumer<Throwable> onExceptionalCallback;
+    private final Consumer<Exception> onExceptionalCallback;
     private final RuntimeCache cache;
     private final MethodCallsCache callsCache;
     private final UUID nextExecutionItem;
@@ -299,7 +298,7 @@ public IdExecutionEventListener(
         Consumer<ExpressionCall> functionCallCallback,
         Consumer<ExpressionValue> onComputedCallback,
         Consumer<ExpressionValue> onCachedCallback,
-        Consumer<Throwable> onExceptionalCallback,
+        Consumer<Exception> onExceptionalCallback,
         Timer timer) {
       this.entryCallTarget = entryCallTarget;
       this.cache = cache;
@@ -322,15 +321,7 @@ public void onEnter(EventContext context, VirtualFrame frame) {
       if (!isTopFrame(entryCallTarget)) {
         return;
       }
-
-      Node node = context.getInstrumentedNode();
-
-      UUID nodeId = null;
-      if (node instanceof ExpressionNode) {
-        nodeId = ((ExpressionNode) node).getId();
-      } else if (node instanceof FunctionCallInstrumentationNode) {
-        nodeId = ((FunctionCallInstrumentationNode) node).getId();
-      }
+      UUID nodeId = getNodeId(context.getInstrumentedNode());
 
       // Add a flag to say it was cached.
       // An array of `ProfilingInfo` in the value update.
@@ -396,6 +387,9 @@ public void onReturnValue(EventContext context, VirtualFrame frame, Object resul
         onComputedCallback.accept(
             new ExpressionValue(
                 nodeId, result, resultType, cachedType, call, cachedCall, profilingInfo, false));
+        if (result instanceof PanicSentinel) {
+          throw context.createUnwind(result);
+        }
       }
     }
 
@@ -414,6 +408,11 @@ public void onReturnExceptional(EventContext context, VirtualFrame frame, Throwa
         } catch (InteropException e) {
           onExceptionalCallback.accept(e);
         }
+      } else if (exception instanceof PanicException) {
+        PanicException panicException = (PanicException) exception;
+        onReturnValue(context, frame, new PanicSentinel(panicException, context.getInstrumentedNode()));
+      } else if (exception instanceof PanicSentinel) {
+        onReturnValue(context, frame, exception);
       }
     }
 
@@ -446,6 +445,16 @@ public Object visitFrame(FrameInstance frameInstance) {
                   });
       return result == null;
     }
+
+    private UUID getNodeId(Node node) {
+      if (node instanceof ExpressionNode) {
+        return ((ExpressionNode) node).getId();
+      }
+      if (node instanceof FunctionCallInstrumentationNode) {
+        return ((FunctionCallInstrumentationNode) node).getId();
+      }
+      return null;
+    }
   }
 
   /**
@@ -473,7 +482,7 @@ public EventBinding<ExecutionEventListener> bind(
       Consumer<IdExecutionInstrument.ExpressionCall> functionCallCallback,
       Consumer<IdExecutionInstrument.ExpressionValue> onComputedCallback,
       Consumer<IdExecutionInstrument.ExpressionValue> onCachedCallback,
-      Consumer<Throwable> onExceptionalCallback) {
+      Consumer<Exception> onExceptionalCallback) {
     SourceSectionFilter filter =
         SourceSectionFilter.newBuilder()
             .tagIs(StandardTags.ExpressionTag.class, StandardTags.CallTag.class)

engine/runtime/src/main/java/org/enso/interpreter/runtime/type/Constants.java

@@ -12,6 +12,7 @@ public class Constants {
   public static final String INTEGER = "Builtins.Main.Integer";
   public static final String DECIMAL = "Builtins.Main.Decimal";
   public static final String NOTHING = "Builtins.Main.Nothing";
+  public static final String PANIC = "Builtins.Main.Panic";
   public static final String REF = "Builtins.Main.Ref";
   public static final String TEXT = "Builtins.Main.Text";
   public static final String THUNK = "Builtins.Main.Thunk";

engine/runtime/src/main/java/org/enso/interpreter/runtime/type/Types.java

@@ -138,6 +138,8 @@ public static String getName(Object value) {
       return Constants.ARRAY;
     } else if (TypesGen.isRef(value)) {
       return Constants.REF;
+    } else if (TypesGen.isPanicSentinel(value)) {
+      return Constants.PANIC;
     } else {
       return null;
     }