kiss-lang/kiss-vscode
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

show ktxt2 conversion outputs in the quickpick

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-12-17 13:26:01 -07:00
parent 1e35d6781f
commit 0d21d1fb53
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
projects/kiss-vscode/src/ktxt2/KTxt2.kiss
View File

@@ -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]

7
projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.kiss
View File

@@ -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))