From f8e1d5d8ce4084226c5b02bc4dd0f62b68f53898 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Fri, 3 Dec 2021 19:47:56 -0700 Subject: [PATCH] fix KTxt2 import split by paragraphs --- projects/kiss-vscode/src/Main.kiss | 2 +- projects/kiss-vscode/src/commands/KTxt2Tools.kiss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/kiss-vscode/src/Main.kiss b/projects/kiss-vscode/src/Main.kiss index 4665e511..e8b7a07e 100644 --- a/projects/kiss-vscode/src/Main.kiss +++ b/projects/kiss-vscode/src/Main.kiss @@ -55,7 +55,7 @@ oldFileMTime (mTime oldConfigFile) userConfigMTime - (let [foldersToCheck [(userConfigDir) builtinConfigDir ]] + (let [foldersToCheck [(userConfigDir) builtinConfigDir]] (when commandsDir (foldersToCheck.push commandsDir)) (apply max diff --git a/projects/kiss-vscode/src/commands/KTxt2Tools.kiss b/projects/kiss-vscode/src/commands/KTxt2Tools.kiss index 725de505..51411bd9 100644 --- a/projects/kiss-vscode/src/commands/KTxt2Tools.kiss +++ b/projects/kiss-vscode/src/commands/KTxt2Tools.kiss @@ -8,7 +8,7 @@ outputType (if (outputType.startsWith ".") (outputType.substr 1) outputType) ktxt2Filename "${file}.${outputType}.ktxt2" &mut newContents "" - :kiss.List inputBlocks (.split (File.getContent file) splitBy)] + :kiss.List inputBlocks (.split (.replace (File.getContent file) "\r" "") splitBy)] (doFor block (inputBlocks.slice 0 -1) (+= newContents (_blockOf block splitBy))) (+= newContents (_blockOf (last inputBlocks) ""))