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

ktxt2 editor handles edits of all parts

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-10-21 23:07:42 -04:00
parent 6e97574bea
commit 8c4943cf77
6 changed files with 161 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
projects/kiss-vscode/src/ktxt2/KTxt2.hx
View File

@@ -14,8 +14,14 @@ typedef KTxt2Block = {
outputEnd:Position
};
typedef KTxt2Comment = {
text:String,
start:Position,
end:Position
};
enum KTxt2Element {
Comment(content:String);
Comment(comment:KTxt2Comment);
Block(block:KTxt2Block);
}

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

@@ -31,7 +31,9 @@
(function :Array<KTxt2Element> splitFileElements [:Stream fileStream]
(let [elements []]
(loop
(let [block
(let [start
(fileStream.position)
block
(object
source ""
sourceStart null
@@ -41,11 +43,13 @@
outputEnd null
outputLocked false)]
// Look for the start of a KTxt2 block
(case (fileStream.takeUntilAndDrop blockStartEnd true)
(case (fileStream.takeUntilOneOf [blockStartEnd] true)
((Some comment)
// Anything before the start of the block is a comment
(when comment
(elements.push (Comment comment)))
(let [end (fileStream.position)]
(elements.push (Comment (object text comment start start end end)))))
(fileStream.dropChars blockStartEnd.length)
(when (fileStream.isEmpty) (break))
(let [sourceStartPosition (fileStream.position)
sourceBlock (fileStream.expect "A chunk of source text followed by one of $outputStarts"

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

@@ -2,10 +2,18 @@ package ktxt2;
import js.html.Document;
import js.html.Window;
import js.html.Element;
import ktxt2.EditorExterns;
import ktxt2.KTxt2;
import kiss.Prelude;
import kiss.Stream;
using StringTools;
typedef MessageToEditor = {
type:String,
?text:String
};
@:build(kiss.Kiss.build())
class KTxt2Editor {}

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

@@ -1,6 +1,7 @@
(var &mut :VSCodeAPI vscode)
(var &mut :Window window)
(var &mut :Document document)
(var &mut :Element content)
(var &mut :Array<KTxt2Element> ktxt2Elements)
(function main []
@@ -8,26 +9,115 @@
(set window EditorExterns.window)
(set document window.document)
(set Prelude.printStr ->[message]
(vscode.postMessage (object type "print" text message)))
(window.addEventListener "message"
->:Void event
(case event.data.type
("update"
(updateContent event.data.text))
(otherType (throw "bad message type $otherType for KTxt2Editor")))))
(case (the MessageToEditor event.data)
((object type "update" text text)
(updateContent text)
(vscode.setState (object text text)))
(otherType (throw "bad message $event for KTxt2Editor"))))
(whenLet [state (the Dynamic (vscode.getState))]
(updateContent state.text)))
(function pElement [text]
(var &mut :Map<Int,Int> editTimeoutHandles (new Map))
(var EDIT_TIMEOUT_MILLI 1000)
(function :Void addEditTimeout [idx :Void->Void handler]
(whenLet [activeTimeoutForIndex (dictGet editTimeoutHandles idx)]
(window.clearTimeout activeTimeoutForIndex))
(dictSet editTimeoutHandles
idx
(window.setTimeout
->{
(editTimeoutHandles.remove idx)
(handler)
}
EDIT_TIMEOUT_MILLI)))
(function pElement [text idx]
(let [p (document.createElement "p")]
(set p.innerHTML text)
(document.body.appendChild p)))
(p.setAttribute "style" "white-space: pre;")
(p.setAttribute "contenteditable" "true")
(p.addEventListener "input"
->(addEditTimeout idx ->(replaceComment (nth ktxt2Elements idx) p.innerHTML)))
(content.appendChild p)))
(function toPlaintext [:String text]
(.htmlUnescape
(.replace
(.replace
(text.replace "<div>" "\n")
"</div>" "")
"<br>" "\n")))
(function replaceComment [element newText]
(case element
((Comment (object text text start start end end))
(vscode.postMessage (object type "replace" text (toPlaintext newText) start start end end)))
(otherwise (throw "element $element is not a comment"))))
(function replaceSourceBlock [element newText]
(case element
((Block (object source text sourceStart start sourceEnd end))
(vscode.postMessage (object type "replace" text (toPlaintext newText) start start end end)))
(otherwise (throw "element $element is not a block"))))
(function replaceOutputBlock [element newText]
(case element
((Block (object output text outputStart start outputEnd end))
(vscode.postMessage (object type "replace" text (toPlaintext newText) start start end end)))
(otherwise (throw "element $element is not a block"))))
(function blockElements [source output locked idx]
(let [outerDiv (document.createElement "div")
sourceDiv (document.createElement "div")
outputDiv (document.createElement "div")
lockDiv (document.createElement "div")]
(outerDiv.setAttribute "class" "container")
(outerDiv.setAttribute "style" "display: flex;")
(sourceDiv.setAttribute "style" "width: 50%; white-space: pre;")
(sourceDiv.setAttribute "class" "block")
(sourceDiv.setAttribute "contenteditable" "true")
(sourceDiv.addEventListener "input"
->(addEditTimeout idx ->(replaceSourceBlock (nth ktxt2Elements idx) sourceDiv.innerHTML)))
(set sourceDiv.innerHTML source)
(outputDiv.setAttribute "style" "flex-grow: 1; white-space: pre;")
(outputDiv.setAttribute "class" "block")
(outputDiv.setAttribute "contenteditable" "true")
(outputDiv.addEventListener "input"
->(addEditTimeout idx ->(replaceOutputBlock (nth ktxt2Elements idx) outputDiv.innerHTML)))
(set outputDiv.innerHTML output)
(lockDiv.setAttribute "style" "width: 1ch")
(if locked
(set lockDiv.innerHTML "!")
// TODO add a "generate" button and "lock" button
)
(outerDiv.appendChild sourceDiv)
(outerDiv.appendChild lockDiv)
(outerDiv.appendChild outputDiv)
(content.appendChild outerDiv)))
(function :Void updateContent [text]
(set document.body.innerHTML "")
(doFor [idx element] (enumerate (KTxt2.splitFileElements (Stream.fromString text)))
(case element
((Comment comment)
(pElement comment))
((Block block)
0))))
(try
{
(when content
(document.body.removeChild content))
(set content (document.createElement "div"))
(document.body.appendChild content)
(set ktxt2Elements (KTxt2.splitFileElements (Stream.fromString text)))
(doFor [idx element] (enumerate ktxt2Elements)
(case element
// TODO make an objectWith macro for case that duplicates parameter names with the match expressions:
((Comment (object text text))
(pElement text idx))
((Block (object source source output output outputLocked outputLocked))
(blockElements source output outputLocked idx))))
}
(catch [error] (print "Error updating ktxt2 editor: ${error}"))))
/*(function exportSourceAndOutputFiles [document]
(let [[sourceText outputText] (splitFileContents document.fileName)
@@ -64,12 +154,6 @@
(outputDocument.save)]
(assert (and saveSourceSuccess saveOutputSuccess))))))
(function streamPosToVscodePos [pos]
(new vscode.Position pos.line (- pos.column 1)))
(function rangeFromStartEnd [start end]
(new Range (streamPosToVscodePos start) (streamPosToVscodePos end)))
(function splitBlocks [&opt _]
(let [blocks (splitFileBlocks)] (print blocks)))
*/

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

@@ -5,5 +5,12 @@ import kiss.List;
import vscode.*;
import js.lib.Promise;
typedef MessageFromEditor = {
type:String,
?text:String,
?start:kiss.Stream.Position,
?end:kiss.Stream.Position
};
@:build(kiss.Kiss.build())
class KTxt2EditorProvider {}

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

@@ -13,9 +13,29 @@
->(webviewPanel.webview.postMessage (object type "update" text (document.getText)))
changeDocumentSubscription
(Vscode.workspace.onDidChangeTextDocument
->e (when (= (e.document.uri.toString) (document.uri.toString))
(updateWebview)))]
(webviewPanel.onDidDispose ->e (changeDocumentSubscription.dispose))
->e (when (= (e.document.uri.toString) (document.uri.toString))
(updateWebview)))
streamPosToDocumentPos ->pos (document.positionAt pos.absoluteChar)
rangeFromStartEnd ->[start end] (new Range (streamPosToDocumentPos start) (streamPosToDocumentPos end))
makeEdit
->[:WorkspaceEdit->Void builder]
(let [edit (new WorkspaceEdit)]
(builder edit)
(Vscode.workspace.applyEdit edit))]
(webviewPanel.onDidDispose
->e (changeDocumentSubscription.dispose))
(webviewPanel.webview.onDidReceiveMessage
->:Void [e]
(case (the MessageFromEditor e)
((object type "print" text message)
(Vscode.window.showInformationMessage message))
((object type "replace" text text start start end end)
(makeEdit
->edit (edit.replace document.uri (rangeFromStartEnd start end) text)))
(otherwise
(Vscode.window.showErrorMessage "bad message $e from KTxt2Editor"))))
(updateWebview))
null)
@@ -28,8 +48,13 @@
<meta charset=\"UTF-8\">
<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">
<title>KTxt2</title>
<style>
.block {
border: 1px solid white;
}
</style>
</head>
<body>
<body>
<script src=\"${scriptUri}\"></script>
</body>
</html>"))