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

when you change a source block, prompt to convert it again

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-12-18 15:43:03 -07:00
parent 9827febcca
commit f2800e0bcd
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
projects/kiss-vscode/src/ktxt2/KTxt2Editor.hx
View File

@@ -26,7 +26,8 @@ typedef EditorState = {
startCursorPos:Int, startCursorPos:Int,
endCursorPos:Int, endCursorPos:Int,
lastSearch:String, lastSearch:String,
outputTerminator:String outputTerminator:String,
sourceBlockChanged:Null<Int>
}; };
typedef Disposable = { typedef Disposable = {

14
projects/kiss-vscode/src/ktxt2/KTxt2Editor.kiss
View File

@@ -20,7 +20,8 @@
startCursorPos -1 startCursorPos -1
endCursorPos -1 endCursorPos -1
lastSearch "" lastSearch ""
outputTerminator ""))) outputTerminator ""
sourceBlockChanged null)))
(function :Void setState [:EditorState state] (function :Void setState [:EditorState state]
(_vscode.setState state)) (_vscode.setState state))
@@ -270,7 +271,8 @@
(s.dropString oldTerminator) (s.dropString oldTerminator)
(postMessage (objectWith [type "replace" text terminator end (s.position)] start)))) (postMessage (objectWith [type "replace" text terminator end (s.position)] start))))
(function replaceSourceBlock [element newText] (function replaceSourceBlock [element idx newText]
(changeState s (set s.sourceBlockChanged idx))
(case element (case element
((Block (object source text sourceStart start sourceEnd end)) ((Block (object source text sourceStart start sourceEnd end))
(postMessage (object type "replace" text newText start start end end))) (postMessage (object type "replace" text newText start start end end)))
@@ -339,7 +341,7 @@
(content.appendChild (document.createElement "br")) (content.appendChild (document.createElement "br"))
(monacoEditor sourceDiv "width: 50%;" source /* TODO get the real extension of the source file: */ "txt" locked (monacoEditor sourceDiv "width: 50%;" source /* TODO get the real extension of the source file: */ "txt" locked
->editor (replaceSourceBlock (nth ktxt2Elements idx) (.replace (editor.getValue) "\r" ""))) ->editor (replaceSourceBlock (nth ktxt2Elements idx) idx (.replace (editor.getValue) "\r" "")))
(monacoEditor outputDiv "flex-grow: 1;" output /* TODO get the real extension of the output file: */ "txt" locked (monacoEditor outputDiv "flex-grow: 1;" output /* TODO get the real extension of the output file: */ "txt" locked
->editor (replaceOutputBlock (nth ktxt2Elements idx) (withOutputTerminator (.replace (editor.getValue) "\r" "")))) ->editor (replaceOutputBlock (nth ktxt2Elements idx) (withOutputTerminator (.replace (editor.getValue) "\r" ""))))
@@ -396,6 +398,11 @@
// (print "updating content because $reason") // (print "updating content because $reason")
(try (try
{ {
(when text (set ktxt2Elements (KTxt2.splitFileElements (Stream.fromString text))))
(whenLet [sourceBlockChanged .sourceBlockChanged (getState)]
(changeState s (set s.sourceBlockChanged null))
(tryAutoConvert (nth ktxt2Elements sourceBlockChanged))
(return))
(set updatingContent true) (set updatingContent true)
(when content (when content
(set editors []) (set editors [])
@@ -404,7 +411,6 @@
(document.body.removeChild content)) (document.body.removeChild content))
(set content (document.createElement "div")) (set content (document.createElement "div"))
(document.body.appendChild content) (document.body.appendChild content)
(when text (set ktxt2Elements (KTxt2.splitFileElements (Stream.fromString text))))
(let [terminatorEditor (document.createElement "div") (let [terminatorEditor (document.createElement "div")
help (document.createElement "p") help (document.createElement "p")
explanation (document.createElement "p")] explanation (document.createElement "p")]