fix: code Editor content is wrong when EditorTabs are changed (#160)

* fix: update workbench color theme json * fix: fix code Editor content is wrong when EditorTabs are changed
DTStack · May 31, 2021 · 2b05642 · 2b05642
1 parent e23a6b0
commit 2b05642
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/src/controller/editor.tsx b/src/controller/editor.tsx
@@ -107,8 +107,8 @@ export class EditorController extends Controller implements IEditorController {
 
     public updateCurrentValue = () => {
         const { current } = this.editorService.getState();
-        const newValue = current?.tab?.data?.value;
         const model = current?.editorInstance?.getModel();
+        const newValue = model.getValue();
         current?.editorInstance?.executeEdits('update-value', [
             {
                 range: model.getFullModelRange(),

diff --git a/src/extensions/theme-defaults/themes/dark_defaults.json b/src/extensions/theme-defaults/themes/dark_defaults.json
@@ -21,12 +21,11 @@
         "statusBarItem.remoteBackground": "#16825D",
         "sidebarSectionHeader.background": "#0000",
         "sidebarSectionHeader.border": "#ccc3",
-        "tabHeader.border": "#333",
-        "tabItem.background": "rgb(45, 45, 45)",
-        "tabItem.foreground": "rgba(255, 255, 255, 0.5)",
-        "tabItem.border": "rgb(37, 37, 38)",
-        "tabItem.activeBackground": "rgb(30, 30, 30)",
-        "tabItem.activeForeground": "rgb(255, 255, 255)",
+        "tab.border": "#333",
+        "tab.inactiveBackground": "rgb(45, 45, 45)",
+        "tab.inactiveForeground": "rgba(255, 255, 255, 0.5)",
+        "tab.activeBackground": "rgb(30, 30, 30)",
+        "tab.activeForeground": "rgb(255, 255, 255)",
         "search.matchValueBackground": "rgba(234, 92, 0, 0.33)",
         "actionBar.checkedBackground": "rgba(0, 127, 212, 0.4)"
     },

diff --git a/src/extensions/theme-defaults/themes/light_defaults.json b/src/extensions/theme-defaults/themes/light_defaults.json
@@ -20,12 +20,10 @@
         "statusBarItem.remoteBackground": "#16825D",
         "sidebarSectionHeader.background": "#0000",
         "sidebarSectionHeader.border": "#61616130",
-        "tabHeader.border": "#333",
-        "tabItem.background": "rgb(236, 236, 236)",
-        "tabItem.foreground": "rgba(51, 51, 51, 0.7)",
-        "tabItem.border": "rgb(243, 243, 243)",
-        "tabItem.activeBackground": "rgb(255, 255, 255)",
-        "tabItem.activeForeground": "rgb(51, 51, 51)"
+        "tab.border": "#333",
+        "tab.inactiveBackground": "rgb(236, 236, 236)",
+        "tab.inactiveForeground": "rgba(51, 51, 51, 0.7)",
+        "tab.activeForeground": "rgb(255, 255, 255)"
     },
     "semanticHighlighting": true
 }