feat-fix(dep-query): argument markers for stdout functions (#1336)

Author: EagleoutIce

src/queries/catalog/dependencies-query/dependencies-query-format.ts

@@ -87,8 +87,8 @@ export const ReadFunctions: FunctionInfo[] = [
 	{ name: 'Import', argIdx: 0, argName: 'file' },
 ] as const;
 export const WriteFunctions: FunctionInfo[] = [
-	{ name: 'save', argIdx: 2, argName: 'file' },
-	{ name: 'save.image', argIdx: 0, argName: 'file' },
+	{ name: 'save', argName: 'file' },
+	{ name: 'save.image', argIdx: 1, argName: 'file' },
 	{ name: 'write', argIdx: 1, argName: 'file' },
 	{ name: 'dput', argIdx: 1, argName: 'file' },
 	{ name: 'dump', argIdx: 1, argName: 'file' },
@@ -97,7 +97,7 @@ export const WriteFunctions: FunctionInfo[] = [
 	{ name: 'saveRDS', argIdx: 1, argName: 'file' },
 	// write functions that don't have argIndex are assumed to write to stdout
 	{ name: 'print', linkTo: 'sink' },
-	{ name: 'cat', linkTo: 'sink', argIdx: 1, argName: 'file' },
+	{ name: 'cat', linkTo: 'sink', argName: 'file' },
 	{ name: 'message', linkTo: 'sink' },
 	{ name: 'warning', linkTo: 'sink' },
 	// readr

test/functionality/dataflow/query/dependencies-query.test.ts

@@ -141,6 +141,8 @@ describe.sequential('Dependencies Query', withShell(shell => {
 		testQuery('dump (argument)', 'dump(file="foo.txt", "foo")', { writtenData: [{ nodeId: '1@dump', functionName: 'dump', destination: 'foo.txt' }] });
 		testQuery('cat', 'cat("Hello!")', { writtenData: [{ nodeId: '1@cat', functionName: 'cat', destination: 'stdout' }] });
 		testQuery('cat with sink', 'sink("foo")\ncat("Hello!")', { writtenData: [{ nodeId: '2@cat', functionName: 'cat', destination: 'unknown', linkedIds: [3] }] });
+		testQuery('cat', 'cat("Hello", "World")', { writtenData: [{ nodeId: '1@cat', functionName: 'cat', destination: 'stdout' }] });
+		testQuery('cat', 'cat("Hello", "World", file="foo.txt")', { writtenData: [{ nodeId: '1@cat', functionName: 'cat', destination: 'foo.txt' }] });
 
 		testQuery('Unknown write', 'write.csv(data, file=u)', { writtenData: [{ nodeId: '1@write.csv', functionName: 'write.csv', destination: 'unknown', lexemeOfArgument: 'u' }] });
 		testQuery('File save', 'save(foo,file="a.Rda")', { writtenData: [{ nodeId: '1@save', functionName: 'save', destination: 'a.Rda' }] });