Merge pull request #890 from posit-dev/bugfix/open-file-uri

lionel- · web-flow · commit 1cc08c836e92 · 2025-08-26T12:37:05.000+02:00
Send `OpenFile` request with `kind` field
diff --git a/crates/amalthea/src/comm/data_explorer_comm.rs b/crates/amalthea/src/comm/data_explorer_comm.rs
@@ -714,7 +714,7 @@ pub enum SearchSchemaSortOrder {
 }
 
 /// Possible values for ColumnDisplayType
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
 pub enum ColumnDisplayType {
 	#[serde(rename = "number")]
 	#[strum(to_string = "number")]
@@ -762,7 +762,7 @@ pub enum ColumnDisplayType {
 }
 
 /// Possible values for Condition in RowFilter
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
 pub enum RowFilterCondition {
 	#[serde(rename = "and")]
 	#[strum(to_string = "and")]
@@ -774,7 +774,7 @@ pub enum RowFilterCondition {
 }
 
 /// Possible values for RowFilterType
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
 pub enum RowFilterType {
 	#[serde(rename = "between")]
 	#[strum(to_string = "between")]
@@ -822,7 +822,7 @@ pub enum RowFilterType {
 }
 
 /// Possible values for Op in FilterComparison
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
 pub enum FilterComparisonOp {
 	#[serde(rename = "=")]
 	#[strum(to_string = "=")]
@@ -850,7 +850,7 @@ pub enum FilterComparisonOp {
 }
 
 /// Possible values for TextSearchType
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
 pub enum TextSearchType {
 	#[serde(rename = "contains")]
 	#[strum(to_string = "contains")]
@@ -874,7 +874,7 @@ pub enum TextSearchType {
 }
 
 /// Possible values for ColumnFilterType
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
 pub enum ColumnFilterType {
 	#[serde(rename = "text_search")]
 	#[strum(to_string = "text_search")]
@@ -886,7 +886,7 @@ pub enum ColumnFilterType {
 }
 
 /// Possible values for ColumnProfileType
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
 pub enum ColumnProfileType {
 	#[serde(rename = "null_count")]
 	#[strum(to_string = "null_count")]
@@ -914,7 +914,7 @@ pub enum ColumnProfileType {
 }
 
 /// Possible values for Method in ColumnHistogramParams
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
 pub enum ColumnHistogramParamsMethod {
 	#[serde(rename = "sturges")]
 	#[strum(to_string = "sturges")]
@@ -934,7 +934,7 @@ pub enum ColumnHistogramParamsMethod {
 }
 
 /// Possible values for Kind in TableSelection
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
 pub enum TableSelectionKind {
 	#[serde(rename = "single_cell")]
 	#[strum(to_string = "single_cell")]
@@ -962,7 +962,7 @@ pub enum TableSelectionKind {
 }
 
 /// Possible values for ExportFormat
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
 pub enum ExportFormat {
 	#[serde(rename = "csv")]
 	#[strum(to_string = "csv")]
@@ -978,7 +978,7 @@ pub enum ExportFormat {
 }
 
 /// Possible values for SupportStatus
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
 pub enum SupportStatus {
 	#[serde(rename = "unsupported")]
 	#[strum(to_string = "unsupported")]
diff --git a/crates/amalthea/src/comm/help_comm.rs b/crates/amalthea/src/comm/help_comm.rs
@@ -12,7 +12,7 @@ use serde::Deserialize;
 use serde::Serialize;
 
 /// Possible values for Kind in ShowHelp
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
 pub enum ShowHelpKind {
 	#[serde(rename = "html")]
 	#[strum(to_string = "html")]
diff --git a/crates/amalthea/src/comm/plot_comm.rs b/crates/amalthea/src/comm/plot_comm.rs
@@ -64,7 +64,7 @@ pub struct PlotRenderSettings {
 }
 
 /// Possible values for PlotUnit
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
 pub enum PlotUnit {
 	#[serde(rename = "pixels")]
 	#[strum(to_string = "pixels")]
@@ -76,7 +76,7 @@ pub enum PlotUnit {
 }
 
 /// Possible values for PlotRenderFormat
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
 pub enum PlotRenderFormat {
 	#[serde(rename = "png")]
 	#[strum(to_string = "png")]
diff --git a/crates/amalthea/src/comm/ui_comm.rs b/crates/amalthea/src/comm/ui_comm.rs
@@ -98,6 +98,18 @@ pub struct Range {
 	pub end: Position
 }
 
+/// Possible values for Kind in OpenEditor
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, strum_macros::Display, strum_macros::EnumString)]
+pub enum OpenEditorKind {
+	#[serde(rename = "path")]
+	#[strum(to_string = "path")]
+	Path,
+
+	#[serde(rename = "uri")]
+	#[strum(to_string = "uri")]
+	Uri
+}
+
 /// Parameters for the DidChangePlotsRenderSettings method.
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct DidChangePlotsRenderSettingsParams {
@@ -133,6 +145,10 @@ pub struct OpenEditorParams {
 
 	/// The column number to jump to
 	pub column: i64,
+
+	/// How to interpret the 'file' argument: as a file path or as a URI. If
+	/// omitted, defaults to 'path'.
+	pub kind: OpenEditorKind,
 }
 
 /// Parameters for the NewDocument method.
diff --git a/crates/ark/src/modules/positron/frontend-methods.R b/crates/ark/src/modules/positron/frontend-methods.R
@@ -39,7 +39,10 @@
     column = 0L
 ) {
     # Don't normalize if that's an `ark:` URI
-    if (!grepl("^ark:", file)) {
+    if (is_ark_uri(file)) {
+        kind <- "uri"
+    } else {
+        kind <- "path"
         file <- normalizePath(file)
     }
 
@@ -51,7 +54,7 @@
         column <- 0L
     }
 
-    .ps.Call("ps_ui_navigate_to_file", file, line, column)
+    .ps.Call("ps_ui_navigate_to_file", file, line, column, kind)
 }
 
 #' @export
diff --git a/crates/ark/src/modules/positron/srcref.R b/crates/ark/src/modules/positron/srcref.R
@@ -118,8 +118,10 @@ srcref_info <- function(srcref) {
     lines <- srcfile$lines
 
     if (!identical(file, "") && !identical(file, "<text>")) {
-        # TODO: Handle absolute paths by using `wd`
-        file <- normalizePath(file, mustWork = FALSE)
+        if (!is_ark_uri(file)) {
+            # TODO: Handle absolute paths by using `wd`
+            file <- normalizePath(file, mustWork = FALSE)
+        }
         content <- NULL
     } else if (!is.null(lines)) {
         file <- NULL
diff --git a/crates/ark/src/ui/events.rs b/crates/ark/src/ui/events.rs
@@ -5,6 +5,9 @@
 //
 //
 
+use std::str::FromStr;
+
+use amalthea::comm::ui_comm::OpenEditorKind;
 use amalthea::comm::ui_comm::OpenEditorParams;
 use amalthea::comm::ui_comm::OpenWithSystemParams;
 use amalthea::comm::ui_comm::OpenWorkspaceParams;
@@ -63,11 +66,16 @@ pub unsafe extern "C-unwind" fn ps_ui_navigate_to_file(
     file: SEXP,
     line: SEXP,
     column: SEXP,
+    uri: SEXP,
 ) -> anyhow::Result<SEXP> {
+    let kind: String = RObject::view(uri).try_into()?;
+    let kind = OpenEditorKind::from_str(&kind)?;
+
     let params = OpenEditorParams {
         file: RObject::view(file).try_into()?,
         line: RObject::view(line).try_into()?,
         column: RObject::view(column).try_into()?,
+        kind,
     };
 
     let event = UiFrontendEvent::OpenEditor(params);

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,10 @@`
`39`	`39`	`column = 0L`
`40`	`40`	`) {`
`41`	`41`	# Don't normalize if that's an `ark:` URI
`42`		`- if (!grepl("^ark:", file)) {`
	`42`	`+ if (is_ark_uri(file)) {`
	`43`	`+ kind <- "uri"`
	`44`	`+ } else {`
	`45`	`+ kind <- "path"`
`43`	`46`	`file <- normalizePath(file)`
`44`	`47`	`}`
`45`	`48`
`@@ -51,7 +54,7 @@`
`51`	`54`	`column <- 0L`
`52`	`55`	`}`
`53`	`56`
`54`		`- .ps.Call("ps_ui_navigate_to_file", file, line, column)`
	`57`	`+ .ps.Call("ps_ui_navigate_to_file", file, line, column, kind)`
`55`	`58`	`}`
`56`	`59`
`57`	`60`	`#' @export`