From 55cc2270bee7c95dde8eb2f50a6d9bc5a03534b1 Mon Sep 17 00:00:00 2001
From: Faton Ramadani <faton.ramadani14@gmail.com>
Date: Tue, 9 Aug 2022 11:18:26 +0200
Subject: [PATCH] Fix Editor formating when saving while using dynamic inputs.
 (#378)

---
 frontend/src/lib/components/Editor.svelte     | 23 +++++++++++--------
 .../lib/components/InputTransformForm.svelte  |  1 +
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte
index e03ab17a32..384d664413 100644
--- a/frontend/src/lib/components/Editor.svelte
+++ b/frontend/src/lib/components/Editor.svelte
@@ -43,6 +43,7 @@
 	import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'
 	import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'
 
+	import { buildWorkerDefinition } from 'monaco-editor-workers'
 	import type {
 		Disposable,
 		DocumentUri,
@@ -50,10 +51,9 @@
 		MonacoLanguageClient
 	} from 'monaco-languageclient'
 	import { createEventDispatcher, onDestroy, onMount } from 'svelte'
-	import { buildWorkerDefinition } from 'monaco-editor-workers'
 
-	import { StandaloneServices } from 'vscode/services'
 	import getMessageServiceOverride from 'vscode/service-override/messages'
+	import { StandaloneServices } from 'vscode/services'
 
 	StandaloneServices.initialize({
 		...getMessageServiceOverride(document.body)
@@ -72,6 +72,7 @@
 	export let websocketAlive = { pyright: false, black: false, deno: false }
 	export let extraLib: string = ''
 	export let extraLibPath: string = ''
+	export let shouldBindKey: boolean = true
 
 	let websockets: [MonacoLanguageClient, WebSocket][] = []
 	let websocketInterval: NodeJS.Timer | undefined
@@ -399,15 +400,17 @@
 			}
 		})
 
-		editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyS, function () {
-			format()
-		})
+		if (shouldBindKey) {
+			editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyS, function () {
+				format()
+			})
 
-		editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.Enter, function () {
-			if (cmdEnterAction) {
-				cmdEnterAction()
-			}
-		})
+			editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.Enter, function () {
+				if (cmdEnterAction) {
+					cmdEnterAction()
+				}
+			})
+		}
 
 		editor.onDidChangeModelContent((event) => {
 			code = getCode()
diff --git a/frontend/src/lib/components/InputTransformForm.svelte b/frontend/src/lib/components/InputTransformForm.svelte
index c7746ae7f5..cc4ba927b1 100644
--- a/frontend/src/lib/components/InputTransformForm.svelte
+++ b/frontend/src/lib/components/InputTransformForm.svelte
@@ -208,6 +208,7 @@
 						class="few-lines-editor"
 						{extraLib}
 						extraLibPath="file:///node_modules/@types/windmill@{i}/index.d.ts"
+						shouldBindKey={false}
 					/>
 				</div>
 			</OverlayPropertyPicker>