fix: light background in dark mode (#55)

Author: moshfeu

resources/monaco/src/style.css

@@ -7,6 +7,10 @@ body {
   overflow: hidden;
 }
 
+body, .monaco-editor, .monaco-editor-background, .monaco-editor .inputarea.ime-input {
+  background-color: var(--vscode-editor-background) !important;
+}
+
 #container {
   height: 100%;
 }

resources/monaco/src/utils.js

@@ -9,6 +9,7 @@ export function render(
   _diffEditor,
   { rightPath, notSupportedFile, leftContent, rightContent, theme, tabSize }
 ) {
+  setTheme(theme);
   diffEditor = _diffEditor;
   window.diffEditor = _diffEditor;
   diffEditor.setModel({
@@ -28,7 +29,6 @@ export function render(
   diffEditor.modifiedEditor.onDidChangeModelContent(onDidUpdateDiff);
   bindSaveShortcut();
   extractEditorStyles(diffEditor);
-  setTheme(theme);
   setTabSize(tabSize);
 }
 
@@ -256,8 +256,12 @@ function setTheme(theme) {
   if (!theme) {
     return;
   }
-  monaco.editor.defineTheme('vscodeTheme', theme);
-  monaco.editor.setTheme('vscodeTheme');
+  try {
+    monaco.editor.defineTheme('vscodeTheme', theme);
+    monaco.editor.setTheme('vscodeTheme');
+  } catch (e) {
+    console.log(e);
+  }
 }
 
 function retrieveCssVariables() {

src/theme/adapter.ts

@@ -1,8 +1,13 @@
+const COMMENTED_LINE_REGEX = /^.*\/\/.*$\n/gm;
+const TRALING_COMMA_REGEX = /\,(?=\s*?[\}\]])/g;
+
+
 export function convertToMonacoTheme(text: string) {
   try {
     const vscodeTheme = JSON.parse(
       text
-        .replace(/\/\//gm, '')
+        .replace(COMMENTED_LINE_REGEX, '')
+        .replace(TRALING_COMMA_REGEX, '')
     );
 
     const rules = vscodeTheme.tokenColors.map((c: {scope: any, settings: any}) => ({