Drop-down widgets for extension functions via UnresolvedSymbol

app/gui/controller/engine-protocol/src/language_server/tests.rs

@@ -434,6 +434,7 @@ fn test_execution_context() {
     };
     let positional_arguments_expressions = vec![1, 2, 3].iter().map(|x| x.to_string()).collect();
     let visualisation_config = VisualisationConfiguration {
+        visualisation_module: "Foo.Bar.Baz".to_string(),
         execution_context_id: context_id,
         expression,
         positional_arguments_expressions,
@@ -453,6 +454,7 @@ fn test_execution_context() {
                     "definedOnType" : "[Foo.Bar.Baz]",
                     "name"          : "foo"
                 },
+                "visualisationModule" : "Foo.Bar.Baz",
                 "positionalArgumentsExpressions" : ["1", "2", "3"]
             }
         }),
@@ -479,6 +481,7 @@ fn test_execution_context() {
     };
     let positional_arguments_expressions = vec!["foo"].iter().map(|x| x.to_string()).collect();
     let visualisation_config = VisualisationConfiguration {
+        visualisation_module: "Foo.Bar.Baz".to_string(),
         execution_context_id: context_id,
         expression,
         positional_arguments_expressions,
@@ -495,6 +498,7 @@ fn test_execution_context() {
                     "definedOnType" : "[Foo.Bar.Baz]",
                     "name"          : "foo"
                 },
+                "visualisationModule" : "Foo.Bar.Baz",
                 "positionalArgumentsExpressions" : ["foo"]
             }
         }),

app/gui/controller/engine-protocol/src/language_server/types.rs

@@ -713,6 +713,8 @@ pub type ExpressionId = Uuid;
 #[serde(rename_all = "camelCase")]
 #[allow(missing_docs)]
 pub struct VisualisationConfiguration {
+    /// FQN of module to use the visualisation from
+    pub visualisation_module: String,
     /// An execution context of the visualization.
     pub execution_context_id: ContextId,
     /// An enso function that will transform the data into expected format.

app/gui/src/controller/graph/executed.rs

@@ -96,7 +96,7 @@ pub struct Handle {
     execution_ctx: model::ExecutionContext,
     /// The handle to project controller is necessary, as entering nodes might need to switch
     /// modules, and only the project can provide their controllers.
-    project:       model::Project,
+    pub project:   model::Project,
     /// The publisher allowing sending notification to subscribed entities. Note that its outputs
     /// is merged with publishers from the stored graph and execution controllers.
     notifier:      notification::Publisher<Notification>,

app/gui/src/controller/graph/widget.rs

@@ -392,7 +392,7 @@ impl QueryData {
     /// Generate visualization metadata for this query.
     fn visualization_metadata(&self) -> Metadata {
         let arguments: Vec<Code> = vec![
-            Self::escape_visualization_argument(&self.method_name).into(),
+            Self::as_unresolved_symbol(&self.method_name).into(),
             Self::arg_sequence(&self.arguments).into(),
         ];
 
@@ -410,6 +410,10 @@ impl QueryData {
         Ast::raw_text_literal(arg).repr()
     }
 
+    fn as_unresolved_symbol(arg: &str) -> String {
+        ".".to_string() + arg
+    }
+
     /// Escape a list of strings to be used as a visualization argument. Transforms the strings into
     /// an enso expression with a list of string literals.
     fn arg_sequence(args: &[ImString]) -> String {

app/gui/src/controller/searcher.rs

@@ -574,7 +574,8 @@ impl Searcher {
             "Standard.Visualization.AI",
             "build_ai_prompt",
         )?;
-        let vis = Visualization::new(this.id, vis_ptr, vec![]);
+        let vis =
+            Visualization::new("Standard.Visualization.AI".to_string(), this.id, vis_ptr, vec![]);
         let mut result = graph.attach_visualization(vis.clone()).await?;
         let next = result.next().await.ok_or(NoAIVisualizationDataReceived)?;
         let prompt = std::str::from_utf8(&next)?;

app/gui/src/controller/visualization/manager.rs

@@ -158,6 +158,7 @@ impl Default for Status {
 #[allow(missing_docs)]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Desired {
+    pub module:           String,
     pub visualization_id: VisualizationId,
     pub expression_id:    ast::Id,
     pub metadata:         Metadata,
@@ -285,11 +286,15 @@ impl Manager {
             // Early return: requested to remove visualization that was already removed.
             return;
         };
+        let prj = self.executed_graph.module_qualified_name(&*self.executed_graph.project);
+        let graph = self.executed_graph.graph();
+        let module = prj.to_string() + "." + graph.module.name();
         let current_id = current.as_ref().and_then(|current| current.latest_id());
         let new_desired = new_desired.map(|new_desired| Desired {
-            expression_id:    target,
+            module,
+            expression_id: target,
             visualization_id: current_id.unwrap_or_else(VisualizationId::new_v4),
-            metadata:         new_desired,
+            metadata: new_desired,
         });
         self.write_new_desired(target, new_desired)
     }
@@ -332,6 +337,7 @@ impl Manager {
         Ok(Visualization {
             id: desired.visualization_id,
             expression_id: desired.expression_id,
+            module: desired.module,
             method_pointer,
             arguments,
         })
@@ -563,6 +569,7 @@ mod tests {
             let faux_vis = Visualization {
                 id: default(),
                 expression_id: default(),
+                module: "local.Widgets.Main".to_string(),
                 method_pointer,
                 arguments,
             };
@@ -666,6 +673,7 @@ mod tests {
         // We don't attach it separately, as Manager identifies visualizations by their
         // expression ID rather than visualization ID.
         let desired_vis_3 = Desired {
+            module:           "local.Widgets.Main".to_string(),
             visualization_id: VisualizationId::from_u128(900),
             expression_id:    node_id,
             metadata:         desired_vis_1,

app/gui/src/model/execution_context.rs

@@ -303,6 +303,8 @@ pub struct Visualization {
     pub id:             VisualizationId,
     /// Expression that is to be visualized.
     pub expression_id:  ExpressionId,
+    /// module to evaluate visualization in context of
+    pub module:         String,
     /// A pointer to the enso method that will transform the data into expected format.
     pub method_pointer: QualifiedMethodPointer,
     /// Enso expressions for positional arguments
@@ -313,19 +315,21 @@ impl Visualization {
     /// Creates a new visualization description. The visualization will get a randomly assigned
     /// identifier.
     pub fn new(
+        module: String,
         expression_id: ExpressionId,
         method_pointer: QualifiedMethodPointer,
         arguments: Vec<String>,
     ) -> Visualization {
         let id = VisualizationId::new_v4();
-        Visualization { id, expression_id, method_pointer, arguments }
+        Visualization { id, expression_id, module, method_pointer, arguments }
     }
 
     /// Creates a `VisualisationConfiguration` that is used in communication with language server.
     pub fn config(&self, execution_context_id: Uuid) -> VisualisationConfiguration {
         let expression = self.method_pointer.clone().into();
         let positional_arguments_expressions = self.arguments.clone();
         VisualisationConfiguration {
+            visualisation_module: self.module.to_owned(),
             execution_context_id,
             expression,
             positional_arguments_expressions,

app/gui/src/model/execution_context/synchronized.rs

@@ -532,6 +532,7 @@ pub mod test {
         let arguments = vec![];
         let vis = Visualization {
             id: model::execution_context::VisualizationId::new_v4(),
+            module: method_pointer.module.to_string(),
             expression_id: model::execution_context::ExpressionId::new_v4(),
             method_pointer,
             arguments,
@@ -581,6 +582,7 @@ pub mod test {
         let arguments = vec!["foo".to_owned()];
         let vis = Visualization {
             id: model::execution_context::VisualizationId::new_v4(),
+            module: method_pointer.module.to_string(),
             expression_id: model::execution_context::ExpressionId::new_v4(),
             method_pointer,
             arguments,
@@ -618,6 +620,7 @@ pub mod test {
         let arguments = vec!["bar".to_owned()];
         let vis = Visualization {
             id: model::execution_context::VisualizationId::new_v4(),
+            module: method_pointer.module.to_string(),
             expression_id: model::execution_context::ExpressionId::new_v4(),
             method_pointer,
             arguments: arguments.clone(),
@@ -634,6 +637,7 @@ pub mod test {
 
             let expected_config = language_server::types::VisualisationConfiguration {
                 execution_context_id: data.context_id,
+                visualisation_module: MockData::new().module_qualified_name().to_string(),
                 expression: new_expression.clone().into(),
                 positional_arguments_expressions: arguments.clone(),
             };

app/gui/tests/language_server.rs

@@ -140,6 +140,7 @@ async fn ls_text_protocol_test() {
         execution_context_id,
         expression,
         positional_arguments_expressions,
+        visualisation_module: visualization_module.to_string(),
     };
     let response =
         client.attach_visualisation(&visualisation_id, &expression_id, &visualisation_config);
@@ -157,6 +158,7 @@ async fn ls_text_protocol_test() {
         execution_context_id,
         expression,
         positional_arguments_expressions,
+        visualisation_module: visualization_module.to_string(),
     };
     let response = client.modify_visualisation(&visualisation_id, &visualisation_config).await;
     response.expect("Couldn't modify visualisation.");
@@ -375,7 +377,12 @@ async fn binary_visualization_updates_test_hlp() {
         module_qualified_name,
         Identifier::from_text("quux").unwrap(),
     );
-    let visualization = Visualization::new(the_node.id(), method_pointer, vec![]);
+    let visualization = Visualization::new(
+        method_pointer.module.to_string(),
+        the_node.id(),
+        method_pointer,
+        vec![],
+    );
     let stream = graph_executed.attach_visualization(visualization.clone()).await.unwrap();
     info!("Attached the visualization {}", visualization.id);
     let mut stream = stream.boxed_local();

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

@@ -12,16 +12,14 @@ import java.util.UUID
   *
   * @param executionContextId an execution context of the visualisation
   * @param expression an expression that creates a visualisation
+  * @param visualisationModule the name of a module to execute expression at
   */
 case class VisualisationConfiguration(
   executionContextId: UUID,
-  expression: VisualisationExpression
+  expression: VisualisationExpression,
+  visualisationModule: String
 ) extends ToLogString {
 
-  /** A qualified module name containing the expression. */
-  def visualisationModule: String =
-    expression.module
-
   /** @inheritdoc */
   override def toLogString(shouldMask: Boolean): String =
     s"VisualisationConfiguration(" +
@@ -31,8 +29,9 @@ case class VisualisationConfiguration(
   /** Convert to corresponding [[Api]] message. */
   def toApi: Api.VisualisationConfiguration =
     Api.VisualisationConfiguration(
-      executionContextId = executionContextId,
-      expression         = expression.toApi
+      executionContextId  = executionContextId,
+      expression          = expression.toApi,
+      visualisationModule = visualisationModule
     )
 
 }
@@ -52,7 +51,8 @@ object VisualisationConfiguration {
   ): VisualisationConfiguration =
     new VisualisationConfiguration(
       contextId,
-      VisualisationExpression.Text(module, expression)
+      VisualisationExpression.Text(module, expression),
+      module
     )
 
   /** Create a visualisation configuration.
@@ -65,6 +65,7 @@ object VisualisationConfiguration {
     */
   def apply(
     contextId: UUID,
+    module: String,
     expression: MethodPointer,
     positionalArgumentsExpressions: Vector[String]
   ): VisualisationConfiguration =
@@ -73,7 +74,8 @@ object VisualisationConfiguration {
       VisualisationExpression.ModuleMethod(
         expression,
         positionalArgumentsExpressions
-      )
+      ),
+      module
     )
 
   private object CodecField {
@@ -99,11 +101,15 @@ object VisualisationConfiguration {
             expression <- cursor
               .downField(CodecField.Expression)
               .as[MethodPointer]
+            visualisationModule <- cursor
+              .downField(CodecField.VisualisationModule)
+              .as[String]
             arguments <- cursor
               .downField(CodecField.Arguments)
               .as[Option[Vector[String]]]
           } yield VisualisationConfiguration(
             contextId,
+            visualisationModule,
             expression,
             arguments.getOrElse(Vector())
           )

engine/language-server/src/test/scala/org/enso/languageserver/websocket/json/ExecutionContextJsonMessages.scala

@@ -204,6 +204,7 @@ object ExecutionContextJsonMessages {
               "expressionId": $expressionId,
               "visualisationConfig": {
                 "executionContextId": ${configuration.executionContextId},
+                "visualisationModule": ${configuration.visualisationModule},
                 "expression": {
                   "module": ${methodPointer.module},
                   "definedOnType": ${methodPointer.definedOnType},
@@ -223,6 +224,7 @@ object ExecutionContextJsonMessages {
               "expressionId": $expressionId,
               "visualisationConfig": {
                 "executionContextId": ${configuration.executionContextId},
+                "visualisationModule": ${methodPointer.module},
                 "expression": {
                   "module": ${methodPointer.module},
                   "definedOnType": ${methodPointer.definedOnType},

engine/language-server/src/test/scala/org/enso/languageserver/websocket/json/VisualisationOperationsTest.scala

@@ -66,6 +66,7 @@ class VisualisationOperationsTest extends BaseServerTest {
       val visualisationConfig =
         VisualisationConfiguration(
           contextId,
+          visualisationModule,
           MethodPointer(
             visualisationModule,
             visualisationModule,
@@ -120,6 +121,7 @@ class VisualisationOperationsTest extends BaseServerTest {
       val visualisationConfig =
         VisualisationConfiguration(
           contextId,
+          visualisationModule,
           MethodPointer(
             visualisationModule,
             visualisationModule,

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

@@ -618,18 +618,16 @@ object Runtime {
       */
     case class VisualisationConfiguration(
       executionContextId: ContextId,
-      expression: VisualisationExpression
+      expression: VisualisationExpression,
+      visualisationModule: String
     ) extends ToLogString {
 
-      /** A qualified module name containing the expression. */
-      def visualisationModule: String =
-        expression.module
-
       /** @inheritdoc */
       override def toLogString(shouldMask: Boolean): String =
         s"VisualisationConfiguration(" +
         s"executionContextId=$executionContextId," +
-        s"expression=${expression.toLogString(shouldMask)})"
+        s"expression=${expression.toLogString(shouldMask)})" +
+        s"visualisationModule=${visualisationModule})"
     }
 
     /** An operation applied to the suggestion argument. */