From fe75ef0989448e331c93e326d09b83551f084cbd Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 4 Dec 2024 07:11:31 +0100
Subject: [PATCH] nit editors

---
 frontend/src/lib/components/Editor.svelte                  | 2 ++
 frontend/src/lib/components/ScriptEditor.svelte            | 3 ++-
 frontend/src/lib/components/SimpleEditor.svelte            | 2 ++
 frontend/src/lib/components/TemplateEditor.svelte          | 7 ++++---
 .../settingsPanel/inputEditor/EvalV2InputEditor.svelte     | 5 +++--
 .../components/flows/content/FlowModuleComponent.svelte    | 1 +
 frontend/src/lib/editorUtils.ts                            | 7 ++++---
 7 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte
index 68a58a989b..ba23b76fdc 100644
--- a/frontend/src/lib/components/Editor.svelte
+++ b/frontend/src/lib/components/Editor.svelte
@@ -214,6 +214,7 @@
 	export let small = false
 	export let scriptLang: Preview['language'] | 'bunnative'
 	export let disabled: boolean = false
+	export let lineNumbersMinChars = 3
 
 	const rHash = randomHash()
 	$: filePath = computePath(path)
@@ -1131,6 +1132,7 @@
 			...editorConfig(code, lang, automaticLayout, fixedOverflowWidgets),
 			model,
 			fontSize: !small ? 14 : 12,
+			lineNumbersMinChars,
 			// overflowWidgetsDomNode: widgets,
 			tabSize: lang == 'python' ? 4 : 2,
 			folding
diff --git a/frontend/src/lib/components/ScriptEditor.svelte b/frontend/src/lib/components/ScriptEditor.svelte
index 3e1009d0d9..8adff7f21e 100644
--- a/frontend/src/lib/components/ScriptEditor.svelte
+++ b/frontend/src/lib/components/ScriptEditor.svelte
@@ -317,9 +317,10 @@
 <SplitPanesWrapper>
 	<Splitpanes class="!overflow-visible">
 		<Pane size={60} minSize={10} class="!overflow-visible">
-			<div class="pl-2 h-full !overflow-visible bg-gray-50 dark:bg-[#272D38]">
+			<div class="h-full !overflow-visible bg-gray-50 dark:bg-[#272D38]">
 				{#key lang}
 					<Editor
+						lineNumbersMinChars={4}
 						folding
 						{path}
 						bind:code
diff --git a/frontend/src/lib/components/SimpleEditor.svelte b/frontend/src/lib/components/SimpleEditor.svelte
index 86ec070f86..18a42d8408 100644
--- a/frontend/src/lib/components/SimpleEditor.svelte
+++ b/frontend/src/lib/components/SimpleEditor.svelte
@@ -225,6 +225,8 @@
 		editor = meditor.create(divEl as HTMLDivElement, {
 			...editorConfig(code, lang, automaticLayout, fixedOverflowWidgets),
 			model,
+			lineDecorationsWidth: 6,
+			lineNumbersMinChars: 2,
 			// overflowWidgetsDomNode: widgets,
 			fontSize: small ? 12 : 14
 		})
diff --git a/frontend/src/lib/components/TemplateEditor.svelte b/frontend/src/lib/components/TemplateEditor.svelte
index 275bb06c80..0e999222f3 100644
--- a/frontend/src/lib/components/TemplateEditor.svelte
+++ b/frontend/src/lib/components/TemplateEditor.svelte
@@ -450,10 +450,11 @@
 			...editorConfig(code, lang, automaticLayout, fixedOverflowWidgets),
 			model,
 			// overflowWidgetsDomNode: widgets,
-			lineNumbers: 'off',
+			// lineNumbers: 'on',
+			lineDecorationsWidth: 6,
+			lineNumbersMinChars: 2,
 			fontSize,
-			suggestOnTriggerCharacters: true,
-			lineDecorationsWidth: 14
+			suggestOnTriggerCharacters: true
 		})
 
 		editor.onDidFocusEditorText(() => {
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
index 5296fbc21c..6072e2569b 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
@@ -133,8 +133,9 @@
 				</div>
 			{/if}
 			<button
-				class="border bg-surface absolute top-0.5 right-2 p-0.5"
-				on:click={() => (fullscreen = true)}><Maximize2 size={12} /></button
+				title="Open in drawer"
+				class="border bg-surface absolute hover:text-primary top-0 right-2 p-0.5 text-secondary"
+				on:click={() => (fullscreen = true)}><Maximize2 size={10} /></button
 			>
 			{#if focus}
 				<div class="relative w-full">
diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
index 97801d24ab..e5992f4ab5 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
@@ -303,6 +303,7 @@
 							{#if !noEditor}
 								{#key flowModule.id}
 									<Editor
+										
 										folding
 										path={$pathStore + '/' + flowModule.id}
 										bind:websocketAlive
diff --git a/frontend/src/lib/editorUtils.ts b/frontend/src/lib/editorUtils.ts
index ca2daa1392..03ce7420ca 100644
--- a/frontend/src/lib/editorUtils.ts
+++ b/frontend/src/lib/editorUtils.ts
@@ -12,12 +12,13 @@ export function editorConfig(
 		automaticLayout,
 		readOnly: false,
 		fixedOverflowWidgets,
-		//lineNumbers: 'off',
-		lineDecorationsWidth: 15,
-		lineNumbersMinChars: 2,
+		lineNumbers: 'on' as const,
+		lineDecorationsWidth: 10,
+		lineNumbersMinChars: 3,
 		scrollbar: { alwaysConsumeMouseWheel: false },
 		folding: false,
 		scrollBeyondLastLine: false,
+		glyphMargin: false,
 		minimap: {
 			enabled: false
 		},