strip newlines when switching to typewriter

pull/120/head
joneugster 3 years ago
parent 047c5ae268
commit 9cd44911a4

@ -347,20 +347,27 @@ function PlayableLevel({impressum, setImpressum}) {
// Effect when command line mode gets enabled // Effect when command line mode gets enabled
useEffect(() => { useEffect(() => {
if (editor && typewriterMode) { if (editor && typewriterMode) {
let endPos = editor.getModel().getFullModelRange().getEndPosition() let code = editor.getModel().getLinesContent().filter(line => line.trim())
if (editor.getModel().getLineContent(endPos.lineNumber).trim() !== "") {
editor.executeEdits("typewriter", [{ editor.executeEdits("typewriter", [{
range: monaco.Selection.fromPositions(endPos, endPos), range: editor.getModel().getFullModelRange(),
text: "\n", text: code.join('\n')+'\n',
forceMoveMarkers: true forceMoveMarkers: true
}]); }]);
}
endPos = editor.getModel().getFullModelRange().getEndPosition() // let endPos = editor.getModel().getFullModelRange().getEndPosition()
let currPos = editor.getPosition() // if (editor.getModel().getLineContent(endPos.lineNumber).trim() !== "") {
if (currPos.column != 1 || (currPos.lineNumber != endPos.lineNumber && currPos.lineNumber != endPos.lineNumber - 1)) { // editor.executeEdits("typewriter", [{
// This is not a position that would naturally occur from Typewriter, reset: // range: monaco.Selection.fromPositions(endPos, endPos),
editor.setSelection(monaco.Selection.fromPositions(endPos, endPos)) // text: "\n",
} // forceMoveMarkers: true
// }]);
// }
// let endPos = editor.getModel().getFullModelRange().getEndPosition()
// let currPos = editor.getPosition()
// if (currPos.column != 1 || (currPos.lineNumber != endPos.lineNumber && currPos.lineNumber != endPos.lineNumber - 1)) {
// // This is not a position that would naturally occur from Typewriter, reset:
// editor.setSelection(monaco.Selection.fromPositions(endPos, endPos))
// }
} }
}, [editor, typewriterMode]) }, [editor, typewriterMode])

Loading…
Cancel
Save