From 929c08e0941e347007490062a6a5bb76f8474426 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Sun, 7 Mar 2021 20:28:07 +0100
Subject: [PATCH] simplified ace editor

---
 packages/web/src/query/AceEditor.svelte     | 134 ++++++++++++++++++-
 packages/web/src/query/AceEditorCore.svelte | 135 --------------------
 2 files changed, 131 insertions(+), 138 deletions(-)
 delete mode 100644 packages/web/src/query/AceEditorCore.svelte

diff --git a/packages/web/src/query/AceEditor.svelte b/packages/web/src/query/AceEditor.svelte
index f8bd47aeb..5dfc74724 100644
--- a/packages/web/src/query/AceEditor.svelte
+++ b/packages/web/src/query/AceEditor.svelte
@@ -1,12 +1,140 @@
-<script>
-  import AceEditorCore from './AceEditorCore.svelte';
+<script lang="ts">
+  // copied from https://github.com/nateshmbhat/svelte-ace/blob/main/src/AceEditor.svelte
+  import { createEventDispatcher, tick, onMount, onDestroy } from 'svelte';
+
+  import * as ace from 'ace-builds/src-noconflict/ace';
+
+  import 'ace-builds/src-noconflict/mode-sql';
+  import 'ace-builds/src-noconflict/mode-mysql';
+  import 'ace-builds/src-noconflict/mode-pgsql';
+  import 'ace-builds/src-noconflict/mode-sqlserver';
+  import 'ace-builds/src-noconflict/mode-json';
+  import 'ace-builds/src-noconflict/mode-javascript';
+  import 'ace-builds/src-noconflict/mode-markdown';
+  import 'ace-builds/src-noconflict/theme-github';
+  import 'ace-builds/src-noconflict/theme-twilight';
+  import 'ace-builds/src-noconflict/ext-searchbox';
+  import 'ace-builds/src-noconflict/ext-language_tools';
+
+  const EDITOR_ID = `svelte-ace-editor-div:${Math.floor(Math.random() * 10000000000)}`;
+  const dispatch = createEventDispatcher<{
+    init: ace.Editor;
+    input: string;
+    selectionChange: any;
+    blur: void;
+    changeMode: any;
+    commandKey: { err: any; hashId: any; keyCode: any };
+    copy: void;
+    cursorChange: void;
+    cut: void;
+    documentChange: { data: any };
+    focus: void;
+    paste: string;
+  }>();
+
+  /**
+   * translation of vue component to svelte:
+   * @link https://github.com/chairuosen/vue2-ace-editor/blob/91051422b36482eaf94271f1a263afa4b998f099/index.js
+   **/
+  export let value: string = ''; // String, required
+  export let mode: string = 'text'; // String
+  export let theme: string = 'github'; // String
+  export let options: any = {}; // Object
+
+  let editor: ace.Editor;
+  let contentBackup: string = '';
 
   let clientWidth;
   let clientHeight;
+
+  const requireEditorPlugins = () => {};
+  requireEditorPlugins();
+
+  onDestroy(() => {
+    if (editor) {
+      editor.destroy();
+      editor.container.remove();
+    }
+  });
+
+  $: watchValue(value);
+  function watchValue(val: string) {
+    if (contentBackup !== val && editor && typeof val === 'string') {
+      editor.session.setValue(val);
+      contentBackup = val;
+    }
+  }
+
+  $: watchTheme(theme);
+  function watchTheme(newTheme: string) {
+    if (editor) {
+      editor.setTheme('ace/theme/' + newTheme);
+    }
+  }
+
+  $: watchMode(mode);
+  function watchMode(newOption: any) {
+    if (editor) {
+      editor.getSession().setMode('ace/mode/' + newOption);
+    }
+  }
+
+  $: watchOptions(options);
+  function watchOptions(newOption: any) {
+    if (editor) {
+      editor.setOptions(newOption);
+    }
+  }
+
+  const resizeOnNextTick = () =>
+    tick().then(() => {
+      if (editor) {
+        editor.resize();
+      }
+    });
+
+  $: if (clientWidth != null && clientHeight != null) {
+    resizeOnNextTick();
+  }
+
+  onMount(() => {
+    editor = ace.edit(EDITOR_ID);
+
+    dispatch('init', editor);
+    editor.$blockScrolling = Infinity;
+    // editor.setOption("enableEmmet", true);
+    editor.getSession().setMode('ace/mode/' + mode);
+    editor.setTheme('ace/theme/' + theme);
+    editor.setValue(value, 1);
+    contentBackup = value;
+    setEventCallBacks();
+    if (options) {
+      editor.setOptions(options);
+    }
+  });
+
+  function setEventCallBacks() {
+    editor.onBlur = () => dispatch('blur');
+    editor.onChangeMode = obj => dispatch('changeMode', obj);
+    editor.onCommandKey = (err, hashId, keyCode) => dispatch('commandKey', { err, hashId, keyCode });
+    editor.onCopy = () => dispatch('copy');
+    editor.onCursorChange = () => dispatch('cursorChange');
+    editor.onCut = () => dispatch('cut');
+    editor.onDocumentChange = (obj: { data: any }) => dispatch('documentChange', obj);
+    editor.onFocus = () => dispatch('focus');
+    editor.onPaste = text => dispatch('paste', text);
+    editor.onSelectionChange = obj => dispatch('selectionChange', obj);
+    editor.on('change', function () {
+      const content = editor.getValue();
+      value = content;
+      dispatch('input', content);
+      contentBackup = content;
+    });
+  }
 </script>
 
 <div bind:clientWidth bind:clientHeight class="ace-container">
-  <AceEditorCore {...$$props} width={clientWidth} height={clientHeight} on:input on:focus on:blur />
+  <div id={EDITOR_ID} style="width:{clientWidth}px;height:{clientHeight}px" />
 </div>
 
 <style>
diff --git a/packages/web/src/query/AceEditorCore.svelte b/packages/web/src/query/AceEditorCore.svelte
deleted file mode 100644
index 89aeeee43..000000000
--- a/packages/web/src/query/AceEditorCore.svelte
+++ /dev/null
@@ -1,135 +0,0 @@
-<script lang="ts">
-  // copied from https://github.com/nateshmbhat/svelte-ace/blob/main/src/AceEditor.svelte
-  import { createEventDispatcher, tick, onMount, onDestroy } from 'svelte';
-
-  import * as ace from 'ace-builds/src-noconflict/ace';
-
-  import 'ace-builds/src-noconflict/mode-sql';
-  import 'ace-builds/src-noconflict/mode-mysql';
-  import 'ace-builds/src-noconflict/mode-pgsql';
-  import 'ace-builds/src-noconflict/mode-sqlserver';
-  import 'ace-builds/src-noconflict/mode-json';
-  import 'ace-builds/src-noconflict/mode-javascript';
-  import 'ace-builds/src-noconflict/mode-markdown';
-  import 'ace-builds/src-noconflict/theme-github';
-  import 'ace-builds/src-noconflict/theme-twilight';
-  import 'ace-builds/src-noconflict/ext-searchbox';
-  import 'ace-builds/src-noconflict/ext-language_tools';
-
-  const EDITOR_ID = `svelte-ace-editor-div:${Math.floor(Math.random() * 10000000000)}`;
-  const dispatch = createEventDispatcher<{
-    init: ace.Editor;
-    input: string;
-    selectionChange: any;
-    blur: void;
-    changeMode: any;
-    commandKey: { err: any; hashId: any; keyCode: any };
-    copy: void;
-    cursorChange: void;
-    cut: void;
-    documentChange: { data: any };
-    focus: void;
-    paste: string;
-  }>();
-
-  /**
-   * translation of vue component to svelte:
-   * @link https://github.com/chairuosen/vue2-ace-editor/blob/91051422b36482eaf94271f1a263afa4b998f099/index.js
-   **/
-  export let value: string = ''; // String, required
-  export let mode: string = 'text'; // String
-  export let theme: string = 'github'; // String
-  export let height: number;
-  export let width: number;
-  export let options: any = {}; // Object
-
-  let editor: ace.Editor;
-  let contentBackup: string = '';
-
-  const requireEditorPlugins = () => {};
-  requireEditorPlugins();
-
-  onDestroy(() => {
-    if (editor) {
-      editor.destroy();
-      editor.container.remove();
-    }
-  });
-
-  $: watchValue(value);
-  function watchValue(val: string) {
-    if (contentBackup !== val && editor && typeof val === 'string') {
-      editor.session.setValue(val);
-      contentBackup = val;
-    }
-  }
-
-  $: watchTheme(theme);
-  function watchTheme(newTheme: string) {
-    if (editor) {
-      editor.setTheme('ace/theme/' + newTheme);
-    }
-  }
-
-  $: watchMode(mode);
-  function watchMode(newOption: any) {
-    if (editor) {
-      editor.getSession().setMode('ace/mode/' + newOption);
-    }
-  }
-
-  $: watchOptions(options);
-  function watchOptions(newOption: any) {
-    if (editor) {
-      editor.setOptions(newOption);
-    }
-  }
-
-  const resizeOnNextTick = () =>
-    tick().then(() => {
-      if (editor) {
-        editor.resize();
-      }
-    });
-
-  $: if (height != null && width != null) {
-    resizeOnNextTick();
-  }
-
-  onMount(() => {
-    editor = ace.edit(EDITOR_ID);
-
-    dispatch('init', editor);
-    editor.$blockScrolling = Infinity;
-    // editor.setOption("enableEmmet", true);
-    editor.getSession().setMode('ace/mode/' + mode);
-    editor.setTheme('ace/theme/' + theme);
-    editor.setValue(value, 1);
-    contentBackup = value;
-    setEventCallBacks();
-    if (options) {
-      editor.setOptions(options);
-    }
-  });
-
-  function setEventCallBacks() {
-    editor.onBlur = () => dispatch('blur');
-    editor.onChangeMode = obj => dispatch('changeMode', obj);
-    editor.onCommandKey = (err, hashId, keyCode) => dispatch('commandKey', { err, hashId, keyCode });
-    editor.onCopy = () => dispatch('copy');
-    editor.onCursorChange = () => dispatch('cursorChange');
-    editor.onCut = () => dispatch('cut');
-    editor.onDocumentChange = (obj: { data: any }) => dispatch('documentChange', obj);
-    editor.onFocus = () => dispatch('focus');
-    editor.onPaste = text => dispatch('paste', text);
-    editor.onSelectionChange = obj => dispatch('selectionChange', obj);
-    editor.on('change', function () {
-      const content = editor.getValue();
-      value = content;
-      dispatch('input', content);
-      contentBackup = content;
-    });
-  }
-</script>
-
-<div id={EDITOR_ID} style="width:{width}px;height:{height}px" />