Merge pull request #161 from Flow-Works/fix/editor-does-not-use-themes-correctly

[🐛] (#160) Editor now uses theming correctly

src/system/apps/Editor.ts

@@ -12,26 +12,6 @@ interface EditorConfig {
   path: string
 }
 
-const fileLanguageMap: {
-  [key: string]: string
-} = {
-  c: 'clike',
-  cpp: 'clike',
-  java: 'clike',
-  cs: 'clike',
-  ts: 'typescript',
-  js: 'javascript',
-  mjs: 'javascript',
-  cjs: 'javascript',
-  jsx: 'jsx',
-  tsx: 'tsx',
-  html: 'html',
-  md: 'markdown',
-  css: 'css',
-  xml: 'xml',
-  py: 'python'
-}
-
 const Editor: Process = {
   config: {
     name: 'Editor',
@@ -40,6 +20,8 @@ const Editor: Process = {
     targetVer: '1.0.0-indev.0'
   },
   run: async (process) => {
+    const MIMETypes = await process.loadLibrary('lib/MIMETypes')
+
     if (Object.keys(process.data).length > 0) {
       const win = await process.loadLibrary('lib/WindowManager').then((wm: any) => {
         return wm.createWindow({
@@ -153,8 +135,44 @@ const Editor: Process = {
             }
           })
 
-          const fileExtension = data.path.split('.').pop()?.toLowerCase() as string
+          const fileExtension = (data.path.split('.').pop() as string).toLowerCase()
-          const language = fileLanguageMap[fileExtension] ?? 'text'
+          console.log('owo ' + fileExtension, MIMETypes)
+          const mime = fileExtension in MIMETypes ? MIMETypes[fileExtension].type : 'text/plain'
+          let language = 'text'
+
+          switch (mime) {
+            case 'text/markdown':
+              language = 'markdown'
+              break
+            case 'text/css':
+              language = 'css'
+              break
+            case 'text/html':
+              language = 'html'
+              break
+            case 'text/javascript':
+              language = 'javascript'
+              break
+            case 'text/jsx':
+              language = 'jsx'
+              break
+            case 'application/x-flow-theme':
+            case 'application/json':
+              language = 'clike'
+              break
+            case 'text/typescript':
+              language = 'typescript'
+              break
+            case 'text/tsx':
+              language = 'tsx'
+              break
+            case 'application/python':
+              language = 'python'
+              break
+            default:
+              language = 'text'
+              break
+          }
 
           const value = Buffer.from(await fs.readFile(data.path)).toString()
           const editor = fullEditor(
@@ -169,6 +187,7 @@ const Editor: Process = {
           const style = document.createElement('style')
           style.textContent = `
       .prism-code-editor {
+        color: var(--text);
         border-radius: 10px 10px 0 0;
         caret-color: var(--text);
         font-weight: 400;
@@ -208,6 +227,9 @@ const Editor: Process = {
         document.addEventListener('fs_update', () => {
           render().catch(e => console.error(e))
         })
+        document.addEventListener('theme_update', () => {
+          render().catch(e => console.error(e))
+        })
       }
       return
     }

src/system/lib/MIMETypes.ts

@@ -44,6 +44,30 @@ const MIMETypes: Library = {
       opensWith: ['apps/ImageViewer'],
       icon: 'image'
     },
+    cjs: {
+      type: 'application/javascript',
+      description: 'CommonJS Module',
+      opensWith: ['apps/Editor'],
+      icon: 'code'
+    },
+    htm: {
+      type: 'text/html',
+      description: 'HTML Document',
+      opensWith: ['apps/Editor'],
+      icon: 'code'
+    },
+    html: {
+      type: 'text/html',
+      description: 'HTML Document',
+      opensWith: ['apps/Editor'],
+      icon: 'code'
+    },
+    js: {
+      type: 'text/javascript',
+      description: 'JavaScript File',
+      opensWith: ['apps/Editor'],
+      icon: 'code'
+    },
     lnk: {
       type: 'application/x-ms-shortcut',
       description: 'Windows Shortcut',
@@ -56,6 +80,12 @@ const MIMETypes: Library = {
       opensWith: ['apps/Editor'],
       icon: 'markdown'
     },
+    mjs: {
+      type: 'text/javascript',
+      description: 'JavaScript Module',
+      opensWith: ['apps/Editor'],
+      icon: 'code'
+    },
     mp4: {
       type: 'video/mp4',
       description: 'MP4 Video',