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 visualization_config = VisualizationConfiguration {
+        visualization_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"
                 },
+                "visualizationModule" : "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 visualization_config = VisualizationConfiguration {
+        visualization_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"
                 },
+                "visualizationModule" : "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 VisualizationConfiguration {
+    /// Module to evaluate visualization in context of.
+    pub visualization_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

@@ -403,12 +403,21 @@ impl Handle {
     }
 
 
-    /// Get a full qualified name of the module in the [`graph`]. The name is obtained from the
+    /// Get a fully qualified name of the module in the [`graph`]. The name is obtained from the
     /// module's path and the `project` name.
-    pub fn module_qualified_name(&self, project: &dyn model::project::API) -> QualifiedName {
+    pub fn module_qualified_name_with_project(
+        &self,
+        project: &dyn model::project::API,
+    ) -> QualifiedName {
         self.graph().module.path().qualified_module_name(project.qualified_name())
     }
 
+    /// Get a full qualified name of the module in the [`graph`]. The name is obtained from the
+    /// module's path and the `project` name.
+    pub fn module_qualified_name(&self) -> QualifiedName {
+        self.graph().module.path().qualified_module_name(self.project.qualified_name())
+    }
+
     /// Returns information about all the connections between graph's nodes.
     ///
     /// In contrast with the `controller::Graph::connections` this uses information received from

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,12 @@ impl QueryData {
         Ast::raw_text_literal(arg).repr()
     }
 
+    /// Creates unresolved symbol via ".name" syntax. Unresolved symbol contains name and also
+    /// module scope to resolve it properly.
+    fn as_unresolved_symbol(arg: &str) -> String {
+        format!(".{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,7 @@ impl Searcher {
             "Standard.Visualization.AI",
             "build_ai_prompt",
         )?;
-        let vis = Visualization::new(this.id, vis_ptr, vec![]);
+        let vis = Visualization::new(vis_ptr.module.to_owned(), 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)?;
@@ -1091,7 +1091,7 @@ impl Searcher {
     }
 
     fn module_qualified_name(&self) -> QualifiedName {
-        self.graph.module_qualified_name(&*self.project)
+        self.graph.module_qualified_name_with_project(&*self.project)
     }
 
     fn filter(&self) -> Filter {

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

@@ -10,6 +10,7 @@ use crate::model::execution_context::VisualizationId;
 use crate::model::execution_context::VisualizationUpdateData;
 use crate::sync::Synchronized;
 
+use double_representation::name::QualifiedName;
 use futures::channel::mpsc::UnboundedReceiver;
 use futures::future::ready;
 use ide_view::graph_editor::component::visualization::Metadata;
@@ -158,6 +159,7 @@ impl Default for Status {
 #[allow(missing_docs)]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Desired {
+    pub module:           QualifiedName,
     pub visualization_id: VisualizationId,
     pub expression_id:    ast::Id,
     pub metadata:         Metadata,
@@ -285,11 +287,15 @@ impl Manager {
             // Early return: requested to remove visualization that was already removed.
             return;
         };
+        let prj = self.executed_graph.module_qualified_name();
+        let graph = self.executed_graph.graph();
+        let module = prj.new_child(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 +338,7 @@ impl Manager {
         Ok(Visualization {
             id: desired.visualization_id,
             expression_id: desired.expression_id,
+            module: desired.module,
             method_pointer,
             arguments,
         })
@@ -556,13 +563,14 @@ mod tests {
             let qualified_module = inner.project.qualified_module_name(inner.module.path());
             let method_pointer = QualifiedMethodPointer {
                 module:          qualified_module.clone(),
-                defined_on_type: qualified_module,
+                defined_on_type: qualified_module.clone(),
                 name:            Identifier::from_text("faux").unwrap(),
             };
             let arguments = vec!["foo".to_owned()];
             let faux_vis = Visualization {
                 id: default(),
                 expression_id: default(),
+                module: qualified_module,
                 method_pointer,
                 arguments,
             };
@@ -666,6 +674,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:           QualifiedName::from_text("local.Widgets.Main").unwrap(),
             visualization_id: VisualizationId::from_u128(900),
             expression_id:    node_id,
             metadata:         desired_vis_1,

app/gui/src/model/execution_context.rs

@@ -323,6 +323,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:         QualifiedName,
     /// A pointer to the enso method that will transform the data into expected format.
     pub method_pointer: QualifiedMethodPointer,
     /// Enso expressions for positional arguments
@@ -333,19 +335,21 @@ impl Visualization {
     /// Creates a new visualization description. The visualization will get a randomly assigned
     /// identifier.
     pub fn new(
+        module: QualifiedName,
         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 `VisualizationConfiguration` that is used in communication with language server.
     pub fn config(&self, execution_context_id: Uuid) -> VisualizationConfiguration {
         let expression = self.method_pointer.clone().into();
         let positional_arguments_expressions = self.arguments.clone();
         VisualizationConfiguration {
+            visualization_module: self.module.to_string_with_main_segment(),
             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.clone(),
             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.clone(),
             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.clone(),
             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::VisualizationConfiguration {
                 execution_context_id: data.context_id,
+                visualization_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,
+        visualization_module: visualization_module.to_string(),
     };
     let response =
         client.attach_visualization(&visualization_id, &expression_id, &visualization_config);
@@ -157,6 +158,7 @@ async fn ls_text_protocol_test() {
         execution_context_id,
         expression,
         positional_arguments_expressions,
+        visualization_module: visualization_module.to_string(),
     };
     let response = client.modify_visualization(&visualization_id, &visualization_config).await;
     response.expect("Couldn't modify visualization.");
@@ -375,7 +377,8 @@ 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.clone(), 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();

distribution/lib/Standard/Base/0.0.0-dev/src/Meta.enso

@@ -419,10 +419,10 @@ type_of value = @Builtin_Method "Meta.type_of"
 
    Arguments:
    - target: The value or type to get the attribute from.
-   - method_name: The name of the method or constructor to get the attribute for.
+   - method: The symbol representing method or constructor to get the attribute for.
    - parameter_name: The name of the parameter to get the attribute for.
-get_annotation : Any -> Text -> Text -> Any | Nothing
-get_annotation target method_name parameter_name = @Builtin_Method "Meta.get_annotation"
+get_annotation : Any -> Any -> Text -> Any | Nothing
+get_annotation target method parameter_name = @Builtin_Method "Meta.get_annotation"
 
 ## PRIVATE
    Represents a polyglot language.

distribution/lib/Standard/Visualization/0.0.0-dev/src/Widgets.enso

@@ -4,7 +4,7 @@ from Standard.Base import all
    Basic preprocessor for widgets metadata visualization.
 
    Returns full annotation data for all requested arguments.
-get_widget_json : Any -> Text -> Vector Text -> Text
+get_widget_json : Any -> Any -> Vector Text -> Text
 get_widget_json value call_name argument_names =
     read_annotation argument =
         annotation = Warning.clear <| Meta.get_annotation value call_name argument

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

@@ -453,10 +453,9 @@ interface VisualizationConfiguration {
   executionContextId: UUID;
 
   /**
-   * A qualified name of the module containing the expression which creates
-   * visualization.
+   * A qualified name of the module to be used to evaluate the arguments for the visualization expression.
    */
-  visualizationModule?: String;
+  visualizationModule: String;
 
   /** An expression that creates a visualization. */
   expression: String | MethodPointer;

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

@@ -12,16 +12,16 @@ import java.util.UUID
   *
   * @param executionContextId an execution context of the visualization
   * @param expression an expression that creates a visualization
+  * @param visualizationModule the name of a module to execute expression at
+  * @param executionContextId an execution context of the visualization
+  * @param expression an expression that creates a visualization
   */
 case class VisualizationConfiguration(
   executionContextId: UUID,
-  expression: VisualizationExpression
+  expression: VisualizationExpression,
+  visualizationModule: String
 ) extends ToLogString {
 
-  /** A qualified module name containing the expression. */
-  def visualizationModule: String =
-    expression.module
-
   /** @inheritdoc */
   override def toLogString(shouldMask: Boolean): String =
     s"VisualizationConfiguration(" +
@@ -31,8 +31,9 @@ case class VisualizationConfiguration(
   /** Convert to corresponding [[Api]] message. */
   def toApi: Api.VisualizationConfiguration =
     Api.VisualizationConfiguration(
-      executionContextId = executionContextId,
-      expression         = expression.toApi
+      executionContextId  = executionContextId,
+      expression          = expression.toApi,
+      visualizationModule = visualizationModule
     )
 
 }
@@ -52,7 +53,8 @@ object VisualizationConfiguration {
   ): VisualizationConfiguration =
     new VisualizationConfiguration(
       contextId,
-      VisualizationExpression.Text(module, expression)
+      VisualizationExpression.Text(module, expression),
+      module
     )
 
   /** Create a visualization configuration.
@@ -65,6 +67,7 @@ object VisualizationConfiguration {
     */
   def apply(
     contextId: UUID,
+    module: String,
     expression: MethodPointer,
     positionalArgumentsExpressions: Vector[String]
   ): VisualizationConfiguration =
@@ -73,7 +76,8 @@ object VisualizationConfiguration {
       VisualizationExpression.ModuleMethod(
         expression,
         positionalArgumentsExpressions
-      )
+      ),
+      module
     )
 
   private object CodecField {
@@ -99,11 +103,15 @@ object VisualizationConfiguration {
             expression <- cursor
               .downField(CodecField.Expression)
               .as[MethodPointer]
+            visualizationModule <- cursor
+              .downField(CodecField.VisualizationModule)
+              .as[String]
             arguments <- cursor
               .downField(CodecField.Arguments)
               .as[Option[Vector[String]]]
           } yield VisualizationConfiguration(
             contextId,
+            visualizationModule,
             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,
               "visualizationConfig": {
                 "executionContextId": ${configuration.executionContextId},
+                "visualizationModule": ${configuration.visualizationModule},
                 "expression": {
                   "module": ${methodPointer.module},
                   "definedOnType": ${methodPointer.definedOnType},
@@ -223,6 +224,7 @@ object ExecutionContextJsonMessages {
               "expressionId": $expressionId,
               "visualizationConfig": {
                 "executionContextId": ${configuration.executionContextId},
+                "visualizationModule": ${methodPointer.module},
                 "expression": {
                   "module": ${methodPointer.module},
                   "definedOnType": ${methodPointer.definedOnType},