Merge pull request #2631 from BetterThanTomorrow/2621-pretty-printfn-…

…terminal-output

Delete `printFn` from options sent to zprint

CHANGELOG.md

@@ -5,6 +5,7 @@ Changes to Calva.
 ## [Unreleased]
 
 - [Synchronize the file extensions for Calva and Calva Spritz](https://github.com/BetterThanTomorrow/calva/issues/2629)
+- [Terminal output pretty printing fails when using `printerFn` pretty print option](https://github.com/BetterThanTomorrow/calva/issues/2630)
 
 ## [2.0.473] - 2024-09-21
 

src/nrepl/index.ts

@@ -3,14 +3,19 @@ import { BEncoderStream, BDecoderStream } from './bencode';
 import * as cider from './cider';
 import * as state from './../state';
 import * as util from '../utilities';
-import { PrettyPrintingOptions, disabledPrettyPrinter, getServerSidePrinter } from '../printer';
+import {
+  PrettyPrintingOptions,
+  disabledPrettyPrinter,
+  getServerSidePrinter,
+  prettyPrint,
+} from '../printer';
 import * as debug from '../debugger/calva-debug';
 import * as vscode from 'vscode';
 import debugDecorations from '../debugger/decorations';
 import * as outputWindow from '../repl-window/repl-doc';
 import { formatAsLineComments } from '../results-output/util';
 import type { ReplSessionType } from '../config';
-import { getStateValue, prettyPrint } from '../../out/cljs-lib/cljs-lib';
+import { getStateValue } from '../../out/cljs-lib/cljs-lib';
 import { getConfig } from '../config';
 import { log, Direction } from './logging';
 import * as string from '../util/string';

src/printer.ts

@@ -129,5 +129,7 @@ export function getServerSidePrinterDependencies() {
 }
 
 export function prettyPrint(value: any, options: any = prettyPrintingOptions()) {
-  return calvaLib.prettyPrint(value, options);
+  const optionsClone = JSON.parse(JSON.stringify(options));
+  delete optionsClone['printFn']; // Zprint croaks on options it doesn't understand
+  return calvaLib.prettyPrint(value, optionsClone);
 }