Include original case in snapshot

extensions/positron-r/src/test/indentation.test.ts

@@ -3,6 +3,7 @@ import * as assert from 'assert';
 import * as fs from 'fs';
 import { CURSOR, type, withFileEditor } from './editor-utils';
 import { EXTENSION_ROOT_DIR } from '../constants';
+import { removeLeadingLines } from '../util';
 
 const snapshotsFolder = `${EXTENSION_ROOT_DIR}/src/test/snapshots`;
 const snippetsPath = `${snapshotsFolder}/indentation-cases.R`;
@@ -51,10 +52,13 @@ async function regenerateIndentSnapshots() {
 	const snapshots: string[] = ['# File generated from `indentation-cases.R`.\n\n'];
 
 	for (const snippet of snippets) {
+		const bareSnippet = snippet.split('\n').slice(0, -1).join('\n');
+
 		await withFileEditor(snippet, 'R', async (_editor, doc) => {
 			// Type one newline character to trigger indentation
 			await type(doc, `\n${CURSOR}`);
-			snapshots.push(doc.getText());
+			const snapshot = removeLeadingLines(doc.getText(), /^$|^#/);
+			snapshots.push(bareSnippet + '\n# ->\n' + snapshot);
 		});
 	}
 

extensions/positron-r/src/test/snapshots/indentation-snapshots.R

@@ -1,52 +1,91 @@
 # File generated from `indentation-cases.R`.
 
 # ---
+1 +"<>"
+
+# ->
 1 +
   "<>"
 
 # ---
+1 +
+	2 +"<>"
+
+# ->
 1 +
 	2 +
 	"<>"
 
 # ---
+data |>"<>"
+
+# ->
 data |>
   "<>"
 
 # ---
+data |>
+	fn()"<>"
+
+# ->
 data |>
 	fn()
 "<>"
 
 # ---
 # https://github.com/posit-dev/positron/issues/1727
 # FIXME
+data |>
+	fn()
+"<>"
+
+# ->
 data |>
 	fn()
 
 	"<>"
 
 # ---
 # https://github.com/posit-dev/positron/issues/1316
+data |>
+	fn() |>"<>"
+
+# ->
 data |>
 	fn() |>
 	"<>"
 
 # ---
 # With trailing whitespace
 # https://github.com/posit-dev/positron/pull/1655#issuecomment-1780093395
+data |>
+	fn() |> "<>"
+
+# ->
 data |>
 	fn() |> 
 	"<>"
 
 # ---
+data |>
+	fn1() |>
+	fn2() |>"<>"
+
+# ->
 data |>
 	fn1() |>
 	fn2() |>
 	"<>"
 
 # ---
 # FIXME
+data |>
+	fn1() |>
+	fn2(
+		"arg"
+	)"<>"
+
+# ->
 data |>
 	fn1() |>
 	fn2(
@@ -57,19 +96,35 @@ data |>
 # ---
 # https://github.com/posit-dev/positron-beta/discussions/46
 # FIXME
+data |>
+	fn("<>")
+
+# ->
 data |>
 	fn(
 "<>")
 
 # ---
 # FIXME
+{
+	fn(function() {}"<>")
+}
+
+# ->
 {
 	fn(function() {}
 "<>")
 }
 
 # ---
 # FIXME
+{
+	fn(function() {
+		#
+	}"<>")
+}
+
+# ->
 {
 	fn(function() {
 		#
@@ -78,11 +133,16 @@ data |>
 }
 
 # ---
+for (i in NA) NULL"<>"
+
+# ->
 for (i in NA) NULL
 "<>"
 
 # ---
 # https://github.com/posit-dev/positron/issues/1880
 # FIXME
+for (i in 1) fn()"<>"
+# ->
 for (i in 1) fn()
   "<>"

extensions/positron-r/src/util.ts

@@ -48,3 +48,18 @@ export function extractValue(str: string, key: string, delim: string = '='): str
 	const m = str.match(re);
 	return m?.[1] ?? '';
 }
+
+export function removeLeadingLines(x: string, pattern: RegExp): string {
+	const lines = x.split('\n');
+	let output = lines;
+
+	for (const line of lines) {
+		if (pattern.test(line)) {
+			output = output.slice(1);
+			continue;
+		}
+		break;
+	}
+
+	return output.join('\n');
+}