fix f6caa2c: actually get new style code, #2059

Author: tophf

src/background/style-manager/index.js

@@ -155,23 +155,23 @@ export function getByUrl(url, id, tabId, needsOvrs) {
 /**
  * @param {{}} [opts]
  * @param {number} [opts.id] - process and return only one style
- * @param {boolean} [opts.code] - include `code` and `sourceCode`
- * @param {boolean} [opts.sections] - include `sections`
+ * @param {boolean} [opts.sections] - include `sections` stripped of `code`
+ * @param {boolean} [opts.src] - include full `sections` if sectioned or `sourceCode` if UserCSS
  * @param {boolean} [opts.vars] - include `usercssData.vars`
  * @return {StyleObj[] | StyleObj}
  */
-export function getCore({id, code, sections, size, vars} = {}) {
+export function getCore({id, sections, size, src, vars} = {}) {
   const res = [];
   for (let {style} of id ? [dataMap.get(id)] : dataMap.values()) {
     style = {...style};
     let tmp;
     if (size)
       style[k_size] = calcObjSize(style);
-    if (!code && sections)
+    if (sections)
       tmp = style.sections.map(sec => ({...sec, code: undefined}));
-    if (!code || !sections)
+    if (!src || !sections)
       style.sections = tmp;
-    if (!code)
+    if (!src)
       style.sourceCode = undefined;
     if (!vars && (tmp = style[UCD]) && tmp.vars)
       style[UCD] = {...tmp, vars: Object.keys(tmp.vars).length};

src/edit/on-msg-extension.js

@@ -38,7 +38,7 @@ async function handleExternalUpdate({style, reason, editorId}) {
     editor.updateMeta();
     return;
   }
-  style = await API.styles.getCore({id: style.id, vars: true});
+  style = await API.styles.getCore({id: style.id, src: true, vars: true});
   if (reason === 'config') {
     for (const key in editor.style)
       if (key !== 'sourceCode' && key !== 'sections' && !(key in style))

src/edit/source-editor.js

@@ -228,7 +228,7 @@ export default function SourceEditor() {
       if (!sameCode) {
         const si0 = draft && draft.si.cms[0];
         const cursor = !si0 && cm.getCursor();
-        cm.setValue(newStyle.sourceCode);
+        cm.setValue(style.sourceCode); // `style` is merged with `newStyle` by useSavedStyle
         if (si0) {
           editor.applyScrollInfo(cm, si0);
         } else {