- sql support added

- refactorings

Author: tdonuk

package-lock.json

@@ -69,6 +69,7 @@
     "react": "^18.3.1",
     "react-ace": "^13.0.0",
     "react-dom": "^18.3.1",
+    "sql-formatter": "^15.6.10",
     "xml-formatter": "^3.6.3"
   }
 }

package.json

@@ -14,7 +14,9 @@ export enum LanguageName {
     CSS = "css",
     MARKDOWN = "markdown",
     JAVA = "java",
-    SH = "sh"
+    SH = "sh",
+    SQL = "sql",
+    PLSQL = "plsql",
 }
 
 export const SupportedLanguages: Record<LanguageName, SupportedLanguage> = {
@@ -31,7 +33,7 @@ export const SupportedLanguages: Record<LanguageName, SupportedLanguage> = {
     [LanguageName.XML]: {
         name: LanguageName.XML,
         label: "XML",
-        extensions: [".xml", ".xslt", ".xsl"]
+        extensions: [".xml", ".xslt", ".xsl", ".wsdl", ".xsd", ".jrxml"]
     },
     [LanguageName.JSON]: {
         name: LanguageName.JSON,
@@ -67,6 +69,16 @@ export const SupportedLanguages: Record<LanguageName, SupportedLanguage> = {
         name: LanguageName.SH,
         label: "SH",
         extensions: [".sh"]
+    },
+    [LanguageName.SQL]: {
+        name: LanguageName.SQL,
+        label: "SQL",
+        extensions: [".sql"]
+    },
+    [LanguageName.PLSQL]: {
+        name: LanguageName.PLSQL,
+        label: "PL/SQL",
+        extensions: [".sql", ".pck", ".pkg"]
     }
 };
 

src/domain/SupportedLanguage.ts

@@ -104,6 +104,8 @@ async function getEditorState() {
 
         initialState.tabs.push(tab);
         initialState.activeTabId = tab.id;
+    } else if (fileArg && initialState.tabs.map(t => t.file).includes(fileArg)) {
+        initialState.activeTabId = initialState.tabs.find(t => t.file === fileArg)?.id;
     }
 
     return initialState;

src/main.ts

@@ -12,6 +12,7 @@ import {shortenTabName} from "../../utils/TextUtils";
 import {useEditorContext} from "./editor/EditorContext";
 import {findLanguageByFileName} from "../../domain/SupportedLanguage";
 import {EditorState} from "../../domain/EditorState";
+import IpcRendererEvent = Electron.IpcRendererEvent;
 
 const DEFAULT_TAB_NAME = "New Document.txt";
 
@@ -96,15 +97,15 @@ export function TabList({onTabSelect, onTabAdd, onTabRemove}: {
     }
 
     useEffect(() => { // listen for menu accelerators
-        const onNewTab = () => {
+        const onNewTab = (event: IpcRendererEvent, data: any) => {
             addTab(
                 generateTempTab(
                     generateUniqueName(tabs, DEFAULT_TAB_NAME)
                 )
             );
         };
 
-        const handleTabOpen = (event: any, data: any) => {
+        const handleTabOpen = (event: IpcRendererEvent, data: any) => {
             addTab(data);
         };
 

src/react/components/TabList.tsx

@@ -1,6 +1,7 @@
 import {EditorAction, EditorMenuItem, EditorPlugin} from "./index";
 import {LanguageName} from "../../../../domain/SupportedLanguage";
 import xmlFormat from "xml-formatter";
+import { format as sqlFormat } from 'sql-formatter';
 import os from "os";
 import {EditorWrapper} from "../../../../domain/EditorWrapper";
 
@@ -85,6 +86,19 @@ function format(lang: string, content: string) {
             return handleXML(content);
         } else if(lang === LanguageName.JSON) {
             return JSON.stringify(JSON.parse(content), null, 4);
+        } else if(lang === LanguageName.SQL || lang === LanguageName.PLSQL) {
+            return sqlFormat(
+                content,
+                {
+                    dataTypeCase: "preserve",
+                    keywordCase: "preserve",
+                    functionCase: "preserve",
+                    identifierCase: "preserve",
+                    language: lang === LanguageName.PLSQL ? "plsql" : "sql",
+                    useTabs: false,
+                    tabWidth: 4
+                }
+            );
         }
     } catch (ignored) {
         console.warn("cannot format content: " + ignored);

src/react/components/editor/plugins/BeautifyPlugin.ts

@@ -65,20 +65,28 @@ export function getFocusedWindow() {
 }
 
 export function sendToFocusedWindow(channel: string, data?: any) {
-    getFocusedWindow()?.webContents.send(channel, data);
+    const win = getFocusedWindow();
+
+    if(win) sendToWindow(win, channel, data);
+}
+
+export function sendToWindow(window: electron.BrowserWindow, channel: string, data?: any) {
+    window.webContents.send(channel, data);
 }
 
 export function openInFocusedWindow(file: string) {
     console.log("opening file: " + file);
+
     const win = getFocusedWindow();
 
     if(win) openInWindow(win, file);
 }
 
 export function openInWindow(window: electron.BrowserWindow, file: string) {
     console.log("opening file: " + file + " in " + window.id);
+
     fileToTab(file).then(tab => {
-        window.webContents.send(EventType.OPEN_TAB, tab);
+        sendToWindow(window, EventType.OPEN_TAB, tab);
     });
 }