From 0d21d1fb53e3e3bc8b4c0de1e266ff43a29eb734 Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Fri, 17 Dec 2021 13:26:01 -0700
Subject: [PATCH] show ktxt2 conversion outputs in the quickpick

---
 projects/kiss-vscode/src/ktxt2/KTxt2.kiss             | 11 +++++++----
 .../kiss-vscode/src/ktxt2/KTxt2EditorProvider.kiss    |  7 ++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/projects/kiss-vscode/src/ktxt2/KTxt2.kiss b/projects/kiss-vscode/src/ktxt2/KTxt2.kiss
index 4567ebe2..0465a473 100644
--- a/projects/kiss-vscode/src/ktxt2/KTxt2.kiss
+++ b/projects/kiss-vscode/src/ktxt2/KTxt2.kiss
@@ -96,7 +96,7 @@
                 (otherwise)))
         (.map [sourceText outputText] applySpecialChars)))
 
-(function :Map<String,KTxt2Conversion> validConversions [:Array<KTxt2Conversion> conversions :String sourceFile :String outputFile :String source]
+(function :Map<String,String> validConversions [:Array<KTxt2Conversion> conversions :String sourceFile :String outputFile :String source]
     (let [validMap (new Map)]
         (doFor c conversions
             (case c
@@ -104,8 +104,11 @@
                             (= sourceType (sourceFile.extension))
                             (= outputType (outputFile.extension))
                             (canConvert (applySpecialChars source)))
-                        (objectWith sourceType outputType canConvert name))
-                    (dictSet validMap name c))
+                        (objectWith sourceType outputType canConvert convert name))
+                    (dictSet validMap name
+                            (try (KTxt2.insertSpecialChars
+                                    (convert (KTxt2.applySpecialChars source)))
+                                (catch [e] "Conversion error: $e"))))
                 (otherwise {})))
         validMap))
 
@@ -119,7 +122,7 @@
                         (let [conversions (validConversions conversions "${base}.${sourceExt}" "${base}.${outputExt}" element.source)]
                             (when (= 1 (count conversions))
                                 (let [onlyConversion (first (collect (conversions.iterator)))]
-                                    (set element.output (insertSpecialChars (onlyConversion.convert (applySpecialChars element.source))))))))))
+                                    (set element.output onlyConversion)))))))
             (toString elements))))
 
 (function :String insertSpecialChars [:String text]
diff --git a/projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.kiss b/projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.kiss
index 482941db..c1c103b9 100644
--- a/projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.kiss
+++ b/projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.kiss
@@ -66,11 +66,8 @@
 										(withValueOrQuickPick overwrite ["Overwrite" "Cancel"]
 											(when (= "Overwrite" overwrite)
 												(withValueOrQuickPickMap chosenConversion conversions
-													(whenLet [converted
-																	(try (KTxt2.insertSpecialChars (chosenConversion.convert (KTxt2.applySpecialChars source)))
-																		(catch [e] (errorMessage "Conversion error: $e") null))]
-														(makeEdit
-															->edit (edit.replace document.uri (rangeFromStartEnd outputStart outputEnd) converted)))))))
+													(makeEdit
+														->edit (edit.replace document.uri (rangeFromStartEnd outputStart outputEnd) chosenConversion))))))
 								(errorMessage "No automatic conversions are valid for the chosen block."))))
 					((object type "export")
 						(exportSourceAndOutputFiles document))