mbeditor 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd0837fbeccc3634d7804e6f9957bbbaca06bb4c02942eb4decc5e8b174499ab
-  data.tar.gz: 9f97239369b2968c17cd3909abdced4917329a349564d02ebde6beb89cb8c36f
+  metadata.gz: 6ce79d4cc314cce5975277d04c12a0d7d5fa13629fa0447d66cf742bf05aee3e
+  data.tar.gz: 820ef6cac234149c3f3e69069c5255598b27d161dea7c60939d06999d16d9c4a
 SHA512:
-  metadata.gz: 6310dc010236970bf25c0945a465122e1f8a081c399696d8870dc852d85454153863b01b1f1e9a8871abc3fbe07b1489724a065835c2909daa15426899701833
-  data.tar.gz: f8ed953601769d6785a4fecd4c3b16a6ce820e6e7f5c88a7cb12750d8f32b5122dc6bc25fd67be5e86bd7ef02ae1beba9ece2dbc5fc5bc0324df47785a03c9ba
+  metadata.gz: 87cc5da11a46b54e9399ecb678c450a6f71053807a2f80bb22b788ef7c4c359b2cbcb2cc6bce4e1691763336ecd9c9ef4d9540f6a80f587f013188142a7d0b1c
+  data.tar.gz: 3cd29156eda196448f5f31eed27e5b8d7483e7a8f2f91d70ab6adc58a039a3e5cb19568a6b1a7bc94e38bee904cc4a495e9c698428117e8cd5aba4c09f6e9342

data/app/assets/javascripts/mbeditor/application.js

@@ -4,6 +4,7 @@
 //= require mbeditor/file_service
 //= require mbeditor/websocket_service
 //= require mbeditor/git_service
+//= require mbeditor/conflict_parser
 //= require mbeditor/search_service
 //= require mbeditor/tab_manager
 //= require mbeditor/editor_plugins

data/app/assets/javascripts/mbeditor/components/EditorPanel.js

@@ -35,10 +35,18 @@ var EditorPanel = function EditorPanel(_ref) {
   var editorRef = useRef(null);
   var monacoRef = useRef(null);
   var latestContentRef = useRef('');
-  var lastAppliedExternalVersionRef = useRef(-1);
+  var lastAppliedExternalVersionRef = useRef(0);
+  var conflictDecorationsRef = React.useRef([]);
+  var conflictBlocksRef = React.useRef([]);
   var aviBaseRef = useRef(0);
   var aviMaxRef = useRef(0);
 
+  var _conflictState = React.useState(0);
+  var conflictCount = _conflictState[0];
+  var setConflictCount = _conflictState[1];
+
+  var currentConflictIndexRef = React.useRef(0);
+
   var _useState = useState('');
   var _useState2 = _slicedToArray(_useState, 2);
   var markup = _useState2[0];
@@ -832,13 +840,68 @@ var EditorPanel = function EditorPanel(_ref) {
       EditorStore.setState({ canUndo: false, canRedo: false });
     } else {
       // Keep undo stack for formats or replaces by using executeEdits
+      var _extEntry = window.__mbeditorModels && window.__mbeditorModels[tab.path];
+      if (_extEntry) _extEntry.cleanVersionId = null;
       editor.pushUndoStop();
       editor.executeEdits("external", [{
         range: model.getFullModelRange(),
         text: tab.content
       }]);
       editor.pushUndoStop();
+      // Re-anchor the clean baseline so onDidChangeContent doesn't mark this
+      // externally-applied content as a dirty edit.
+      var _newExtAvi = model.getAlternativeVersionId();
+      if (_extEntry) _extEntry.cleanVersionId = _newExtAvi;
+      aviBaseRef.current = _newExtAvi;
+    }
+  }, [tab.content, tab.externalContentVersion]);
+
+  useEffect(function () {
+    var editor = monacoRef.current;
+    if (!editor || !window.monaco || typeof tab.content !== 'string') return;
+    var model = editor.getModel();
+    if (!model) return;
+
+    if (!ConflictParser.hasConflicts(tab.content)) {
+      conflictDecorationsRef.current = model.deltaDecorations(conflictDecorationsRef.current, []);
+      conflictBlocksRef.current = [];
+      setConflictCount(0);
+      return;
     }
+
+    var blocks = ConflictParser.parse(tab.content);
+    conflictBlocksRef.current = blocks;
+    setConflictCount(blocks.length);
+
+    var decorations = [];
+    blocks.forEach(function (block) {
+      decorations.push({
+        range: new window.monaco.Range(block.startLine + 1, 1, block.startLine + 1, 1),
+        options: { isWholeLine: true, className: 'mb-conflict-marker-line' }
+      });
+      if (block.headEnd > block.startLine + 1) {
+        decorations.push({
+          range: new window.monaco.Range(block.startLine + 2, 1, block.headEnd, 1),
+          options: { isWholeLine: true, className: 'mb-conflict-head' }
+        });
+      }
+      decorations.push({
+        range: new window.monaco.Range(block.dividerLine + 1, 1, block.dividerLine + 1, 1),
+        options: { isWholeLine: true, className: 'mb-conflict-marker-line' }
+      });
+      if (block.endLine > block.dividerLine + 1) {
+        decorations.push({
+          range: new window.monaco.Range(block.dividerLine + 2, 1, block.endLine, 1),
+          options: { isWholeLine: true, className: 'mb-conflict-incoming' }
+        });
+      }
+      decorations.push({
+        range: new window.monaco.Range(block.endLine + 1, 1, block.endLine + 1, 1),
+        options: { isWholeLine: true, className: 'mb-conflict-marker-line' }
+      });
+    });
+
+    conflictDecorationsRef.current = model.deltaDecorations(conflictDecorationsRef.current, decorations);
   }, [tab.content, tab.externalContentVersion]);
 
   // Apply editorPrefs changes to a running editor without remounting
@@ -1451,6 +1514,57 @@ var EditorPanel = function EditorPanel(_ref) {
     );
   }
 
+  function resolveConflict(blockIndex, resolution) {
+    var editor = monacoRef.current;
+    if (!editor || !window.monaco) return;
+    var blocks = conflictBlocksRef.current;
+    if (blockIndex < 0 || blockIndex >= blocks.length) return;
+    var block = blocks[blockIndex];
+    var model = editor.getModel();
+    if (!model) return;
+
+    var resolvedContent;
+    if (resolution === 'head') {
+      resolvedContent = block.headContent;
+    } else if (resolution === 'incoming') {
+      resolvedContent = block.incomingContent;
+    } else {
+      resolvedContent = block.headContent +
+        (block.headContent && block.incomingContent ? '\n' : '') +
+        block.incomingContent;
+    }
+
+    editor.pushUndoStop();
+    editor.executeEdits('conflict-resolve', [{
+      range: new window.monaco.Range(
+        block.startLine + 1, 1,
+        block.endLine + 1,
+        model.getLineMaxColumn(block.endLine + 1)
+      ),
+      text: resolvedContent
+    }]);
+    editor.pushUndoStop();
+
+    var newContent = editor.getValue();
+    EditorStore.setState({
+      panes: EditorStore.getState().panes.map(function (p) {
+        return Object.assign({}, p, {
+          tabs: p.tabs.map(function (t) {
+            if (t.path !== tab.path) return t;
+            return Object.assign({}, t, {
+              content: newContent,
+              dirty: true,
+              externalContentVersion: (t.externalContentVersion || 0) + 1
+            });
+          })
+        });
+      })
+    });
+
+    var remaining = conflictBlocksRef.current.length - 1;
+    currentConflictIndexRef.current = Math.min(currentConflictIndexRef.current, Math.max(0, remaining - 1));
+  }
+
   // Always render the same wrapper structure so the editorRef div is never
   // unmounted when gitAvailable changes (e.g. loaded async after workspace
   // call returns). The toolbar is conditionally included inside the wrapper.
@@ -1525,6 +1639,65 @@ var EditorPanel = function EditorPanel(_ref) {
         !editorPrefs.toolbarIconOnly && !testLoading && React.createElement('span', { className: 'ide-toolbar-label' }, 'Test')
       )
     ),
+    conflictCount > 0 && React.createElement(
+      'div', { className: 'mb-conflict-banner' },
+      React.createElement(
+        'span', { className: 'mb-conflict-count' },
+        React.createElement('i', { className: 'fas fa-code-merge' }),
+        ' ',
+        conflictCount,
+        ' merge conflict',
+        conflictCount !== 1 ? 's' : ''
+      ),
+      React.createElement(
+        'div', { className: 'mb-conflict-nav' },
+        React.createElement('button', {
+          className: 'mb-btn mb-btn-sm',
+          title: 'Previous conflict',
+          onClick: function () {
+            var idx = Math.max(0, currentConflictIndexRef.current - 1);
+            currentConflictIndexRef.current = idx;
+            var b = conflictBlocksRef.current[idx];
+            if (b && monacoRef.current) {
+              monacoRef.current.revealLineInCenter(b.startLine + 1);
+              monacoRef.current.setPosition({ lineNumber: b.startLine + 1, column: 1 });
+            }
+          }
+        }, '↑ Prev'),
+        React.createElement('button', {
+          className: 'mb-btn mb-btn-sm',
+          title: 'Next conflict',
+          onClick: function () {
+            var blocks = conflictBlocksRef.current;
+            var idx = Math.min(blocks.length - 1, currentConflictIndexRef.current + 1);
+            currentConflictIndexRef.current = idx;
+            var b = blocks[idx];
+            if (b && monacoRef.current) {
+              monacoRef.current.revealLineInCenter(b.startLine + 1);
+              monacoRef.current.setPosition({ lineNumber: b.startLine + 1, column: 1 });
+            }
+          }
+        }, '↓ Next')
+      ),
+      React.createElement(
+        'div', { className: 'mb-conflict-actions' },
+        React.createElement('button', {
+          className: 'mb-btn mb-btn-sm mb-btn-success',
+          title: 'Accept current (HEAD) — keep your local changes',
+          onClick: function () { resolveConflict(currentConflictIndexRef.current, 'head'); }
+        }, 'Accept Current'),
+        React.createElement('button', {
+          className: 'mb-btn mb-btn-sm mb-btn-incoming',
+          title: 'Accept incoming — take the changes being merged in',
+          onClick: function () { resolveConflict(currentConflictIndexRef.current, 'incoming'); }
+        }, 'Accept Incoming'),
+        React.createElement('button', {
+          className: 'mb-btn mb-btn-sm',
+          title: 'Accept both — keep current above incoming',
+          onClick: function () { resolveConflict(currentConflictIndexRef.current, 'both'); }
+        }, 'Accept Both')
+      )
+    ),
     tab.truncated && React.createElement(
       'div',
       {

data/app/assets/javascripts/mbeditor/components/MbeditorApp.js

@@ -111,6 +111,44 @@ var SectionActionGroup = function SectionActionGroup(_ref2) {
   );
 };
 
+function FileReloadBanner(_ref) {
+  var pendingReloads = _ref.pendingReloads;
+  var onSaveAndReload = _ref.onSaveAndReload;
+  var onDiscardAndReload = _ref.onDiscardAndReload;
+  var onKeepMine = _ref.onKeepMine;
+  if (!pendingReloads || pendingReloads.length === 0) return null;
+  return React.createElement(
+    'div', { className: 'mb-file-reload-banner' },
+    pendingReloads.map(function (r) {
+      return React.createElement(
+        'div', { key: r.paneId + ':' + r.tabId, className: 'mb-file-reload-item' },
+        React.createElement(
+          'span', { className: 'mb-file-reload-msg' },
+          React.createElement('i', { className: 'fas fa-sync-alt' }),
+          '  ',
+          React.createElement('strong', null, r.name),
+          '  was updated externally'
+        ),
+        React.createElement(
+          'div', { className: 'mb-file-reload-actions' },
+          React.createElement('button', {
+            className: 'mb-btn mb-btn-sm mb-btn-primary',
+            onClick: function () { onSaveAndReload(r); }
+          }, 'Save & Reload'),
+          React.createElement('button', {
+            className: 'mb-btn mb-btn-sm mb-btn-warning',
+            onClick: function () { onDiscardAndReload(r); }
+          }, 'Discard & Reload'),
+          React.createElement('button', {
+            className: 'mb-btn mb-btn-sm',
+            onClick: function () { onKeepMine(r); }
+          }, 'Keep Mine')
+        )
+      );
+    })
+  );
+}
+
 var MbeditorApp = function MbeditorApp() {
   var _useState = useState(EditorStore.getState());
 
@@ -1099,12 +1137,77 @@ var MbeditorApp = function MbeditorApp() {
           SearchService.buildIndex(newData);
           return newData;
         });
+        checkOpenTabsForExternalChanges();
       })["catch"](function () {});
     }
     WebSocketService.onFilesChanged(handleFilesChanged);
     return function () { WebSocketService.offFilesChanged(handleFilesChanged); };
   }, []);
 
+  function checkOpenTabsForExternalChanges() {
+    var st = EditorStore.getState();
+    var allTabs = st.panes.reduce(function (acc, p) {
+      return acc.concat(p.tabs.map(function (t) { return { paneId: p.id, tab: t }; }));
+    }, []);
+    var fileTabs = allTabs.filter(function (pt) {
+      var path = pt.tab.path || '';
+      return path &&
+        !path.startsWith('mbeditor://') &&
+        !path.startsWith('diff://') &&
+        !path.startsWith('combined-diff://') &&
+        !pt.tab.isCombinedDiff &&
+        !pt.tab.isSettings &&
+        !pt.tab.isImage &&
+        !pt.tab.isDiff &&
+        typeof pt.tab.content === 'string';
+    });
+    fileTabs.forEach(function (pt) {
+      FileService.getFile(pt.tab.path, { allowMissing: true }).then(function (data) {
+        if (!data || typeof data.content !== 'string') return;
+        var serverNorm = data.content.replace(/\r\n/g, '\n');
+        var tabNorm = (pt.tab.content || '').replace(/\r\n/g, '\n');
+        if (serverNorm === tabNorm) return;
+        if (!pt.tab.dirty) {
+          EditorStore.setState({
+            panes: EditorStore.getState().panes.map(function (p) {
+              if (p.id !== pt.paneId) return p;
+              return Object.assign({}, p, {
+                tabs: p.tabs.map(function (t) {
+                  if (t.id !== pt.tab.id) return t;
+                  return Object.assign({}, t, {
+                    content: data.content,
+                    externalContentVersion: (t.externalContentVersion || 0) + 1
+                  });
+                })
+              });
+            })
+          });
+        } else {
+          // Re-verify the tab still exists before queuing
+          var currentState = EditorStore.getState();
+          var stillExists = currentState.panes.some(function (p) {
+            return p.id === pt.paneId && p.tabs.some(function (t) { return t.id === pt.tab.id; });
+          });
+          if (!stillExists) return;
+          var existing = EditorStore.getState().pendingReloads.find(function (r) {
+            return r.paneId === pt.paneId && r.tabId === pt.tab.id;
+          });
+          if (!existing) {
+            EditorStore.setState({
+              pendingReloads: EditorStore.getState().pendingReloads.concat([{
+                paneId: pt.paneId,
+                tabId: pt.tab.id,
+                path: pt.tab.path,
+                name: pt.tab.name,
+                serverContent: data.content
+              }])
+            });
+          }
+        }
+      })["catch"](function () {});
+    });
+  }
+
   // Auto-refresh the file tree every 10s to pick up external changes (new files, deletions, etc.)
   // When an ActionCable WebSocket is connected this acts only as a safety-net fallback —
   // the WebSocket push above handles immediate invalidation after mbeditor mutations.
@@ -1168,6 +1271,13 @@ var MbeditorApp = function MbeditorApp() {
       setClosingTabId(id);
     } else {
       TabManager.closeTab(paneId, id);
+      EditorStore.setState({
+        pendingReloads: EditorStore.getState().pendingReloads.filter(function (r) {
+          return EditorStore.getState().panes.some(function (p) {
+            return p.tabs.some(function (t) { return t.id === r.tabId; });
+          });
+        })
+      });
     }
   };
 
@@ -1199,6 +1309,13 @@ var MbeditorApp = function MbeditorApp() {
           _closeEntry.cleanVersionId = _closeEntry.model.getAlternativeVersionId();
         }
         TabManager.closeTab(closingPaneId, tab.id);
+        EditorStore.setState({
+          pendingReloads: EditorStore.getState().pendingReloads.filter(function (r) {
+            return EditorStore.getState().panes.some(function (p) {
+              return p.tabs.some(function (t) { return t.id === r.tabId; });
+            });
+          })
+        });
       })["catch"](function (err) {
         EditorStore.setStatus("Save failed: " + err.message, "error");
       })["finally"](function () {
@@ -1210,6 +1327,13 @@ var MbeditorApp = function MbeditorApp() {
       });
     } else {
       TabManager.closeTab(closingPaneId, tab.id);
+      EditorStore.setState({
+        pendingReloads: EditorStore.getState().pendingReloads.filter(function (r) {
+          return EditorStore.getState().panes.some(function (p) {
+            return p.tabs.some(function (t) { return t.id === r.tabId; });
+          });
+        })
+      });
       setClosingTabId(null);
       setClosingPaneId(null);
     }
@@ -1472,6 +1596,64 @@ var MbeditorApp = function MbeditorApp() {
     });
   };
 
+  function dismissPendingReload(reload) {
+    EditorStore.setState({
+      pendingReloads: EditorStore.getState().pendingReloads.filter(function (r) {
+        return !(r.paneId === reload.paneId && r.tabId === reload.tabId);
+      })
+    });
+  }
+
+  function handleSaveAndReload(reload) {
+    var st = EditorStore.getState();
+    var pane = st.panes.find(function (p) { return p.id === reload.paneId; });
+    var tab = pane && pane.tabs.find(function (t) { return t.id === reload.tabId; });
+    if (!tab) { dismissPendingReload(reload); return; }
+    FileService.saveFile(tab.path, tab.content).then(function () {
+      EditorStore.setState({
+        panes: EditorStore.getState().panes.map(function (p) {
+          if (p.id !== reload.paneId) return p;
+          return Object.assign({}, p, {
+            tabs: p.tabs.map(function (t) {
+              if (t.id !== reload.tabId) return t;
+              return Object.assign({}, t, {
+                content: tab.content,
+                dirty: false,
+                externalContentVersion: (t.externalContentVersion || 0) + 1
+              });
+            })
+          });
+        })
+      });
+      dismissPendingReload(reload);
+    })["catch"](function () {
+      EditorStore.setStatus('Save failed — cannot reload', 'error');
+    });
+  }
+
+  function handleDiscardAndReload(reload) {
+    EditorStore.setState({
+      panes: EditorStore.getState().panes.map(function (p) {
+        if (p.id !== reload.paneId) return p;
+        return Object.assign({}, p, {
+          tabs: p.tabs.map(function (t) {
+            if (t.id !== reload.tabId) return t;
+            return Object.assign({}, t, {
+              content: reload.serverContent,
+              dirty: false,
+              externalContentVersion: (t.externalContentVersion || 0) + 1
+            });
+          })
+        });
+      })
+    });
+    dismissPendingReload(reload);
+  }
+
+  function handleKeepMine(reload) {
+    dismissPendingReload(reload);
+  }
+
   var handleSaveAll = function handleSaveAll() {
     var dirtyTabs = state.panes.flatMap(function (p) {
       return p.tabs;
@@ -3775,6 +3957,12 @@ var MbeditorApp = function MbeditorApp() {
                 React.Fragment,
                 null,
                 renderTabBar(pane.id, pane.tabs, pane.activeTabId),
+                React.createElement(FileReloadBanner, {
+                  pendingReloads: (state.pendingReloads || []).filter(function (r) { return r.paneId === pane.id; }),
+                  onSaveAndReload: handleSaveAndReload,
+                  onDiscardAndReload: handleDiscardAndReload,
+                  onKeepMine: handleKeepMine
+                }),
                 React.createElement(
                   "div",
                   { style: { flex: 1, minHeight: 0, display: 'flex', flexDirection: 'column', visibility: activeResizeMode === 'pane' ? 'hidden' : 'visible' } },

data/app/assets/javascripts/mbeditor/conflict_parser.js

@@ -0,0 +1,48 @@
+var ConflictParser = (function () {
+  function hasConflicts(content) {
+    return /^<<<<<<< /m.test(content);
+  }
+
+  function parse(content) {
+    var blocks = [];
+    var lines = content.split('\n');
+    var state = null;
+    var headStart = -1, headEnd = -1, dividerLine = -1;
+    var headLines = [], incomingLines = [];
+    var marker = null;
+
+    for (var i = 0; i < lines.length; i++) {
+      var line = lines[i];
+      if (/^<<<<<<< /.test(line) && state === null) {
+        state = 'head';
+        headStart = i;
+        headLines = [];
+        marker = line;
+      } else if (/^=======\s*$/.test(line) && state === 'head') {
+        state = 'incoming';
+        headEnd = i;
+        dividerLine = i;
+        incomingLines = [];
+      } else if (/^>>>>>>> /.test(line) && state === 'incoming') {
+        blocks.push({
+          startLine: headStart,
+          headEnd: headEnd,
+          dividerLine: dividerLine,
+          endLine: i,
+          headContent: headLines.join('\n'),
+          incomingContent: incomingLines.join('\n'),
+          marker: marker,
+          endMarker: line
+        });
+        state = null;
+      } else if (state === 'head') {
+        headLines.push(line);
+      } else if (state === 'incoming') {
+        incomingLines.push(line);
+      }
+    }
+    return blocks;
+  }
+
+  return { hasConflicts: hasConflicts, parse: parse };
+})();

data/app/assets/javascripts/mbeditor/editor_plugins.js

@@ -68,9 +68,6 @@
         var key = keys[i];
         if (alreadyDeclared[key]) continue;
         if (!/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(key)) continue;
-        var desc;
-        try { desc = Object.getOwnPropertyDescriptor(window, key); } catch (e) { continue; }
-        if (!desc || !desc.configurable || !desc.writable || desc.get) continue;
         var value;
         try { value = window[key]; } catch (e) { continue; }
         if (value === null || value === undefined) continue;
@@ -488,11 +485,11 @@
       });
     }
 
-    // Declare globals that the sprockets asset pipeline injects at runtime so
-    // checkJs doesn't flag them as undefined.  `interface Window` augmentation
-    // covers `window.myAppGlobal` access patterns.  For app-specific component
-    // names not listed here, add `/* global MyComponent */` at the top of the
-    // file — TypeScript's checkJs mode respects that directive.
+    // Declare globals that are injected at runtime so checkJs doesn't flag them
+    // as undefined. The buildWindowGlobalsShim() function automatically detects
+    // window globals from the host application. Common Sprockets globals
+    // (React, ReactDOM, etc.) are declared explicitly. For additional globals
+    // not auto-detected, add `/* global MyComponent */` at the top of the file.
     if (monaco.languages.typescript && monaco.languages.typescript.javascriptDefaults) {
       monaco.languages.typescript.javascriptDefaults.addExtraLib(
         [
@@ -515,12 +512,18 @@
         );
       }
 
-      // Downgrade "declared but never read" (TS6133) from Error to Warning.
-      // TypeScript has no built-in way to emit this as a warning, so we intercept
+      // Downgrade certain TypeScript diagnostic codes from Error to Warning.
+      // TypeScript has no built-in way to emit these as warnings, so we intercept
       // the marker set after the worker fires and re-apply with lower severity.
-      // JS files use owner 'javascript', TS files use 'typescript'.
-      var WARN_CODES = { '6133': true };
-      var TS_OWNERS = ['javascript', 'typescript'];
+      //
+      // Patch markers after the TypeScript worker fires:
+      // - Both: downgrade TS6133 ("declared but never read") from Error to Warning.
+      // Host-app globals are handled by the dynamic window shim and explicit
+      // addExtraLib declarations above — we do not suppress TS2304 globally so
+      // that genuinely undefined names are still flagged as errors.
+      var JS_SUPPRESS_CODES = {};
+      var JS_WARN_CODES    = { '6133': true };
+      var TS_WARN_CODES    = { '6133': true };
       var _severityPatchActive = false;
       monaco.editor.onDidChangeMarkers(function(uris) {
         if (_severityPatchActive) return;
@@ -529,14 +532,20 @@
           uris.forEach(function(uri) {
             var model = monaco.editor.getModel(uri);
             if (!model) return;
-            TS_OWNERS.forEach(function(owner) {
-              var markers = monaco.editor.getModelMarkers({ resource: uri, owner: owner });
+            [
+              { owner: 'javascript', suppress: JS_SUPPRESS_CODES, warn: JS_WARN_CODES },
+              { owner: 'typescript', suppress: {},                 warn: TS_WARN_CODES }
+            ].forEach(function(entry) {
+              var markers = monaco.editor.getModelMarkers({ resource: uri, owner: entry.owner });
               var needsPatch = markers.some(function(m) {
-                return m.severity === monaco.MarkerSeverity.Error && WARN_CODES[String(m.code)];
+                var code = String(m.code);
+                return (m.severity === monaco.MarkerSeverity.Error && (entry.suppress[code] || entry.warn[code]));
               });
               if (!needsPatch) return;
-              monaco.editor.setModelMarkers(model, owner, markers.map(function(m) {
-                return (m.severity === monaco.MarkerSeverity.Error && WARN_CODES[String(m.code)])
+              monaco.editor.setModelMarkers(model, entry.owner, markers.filter(function(m) {
+                return !entry.suppress[String(m.code)];
+              }).map(function(m) {
+                return (m.severity === monaco.MarkerSeverity.Error && entry.warn[String(m.code)])
                   ? Object.assign({}, m, { severity: monaco.MarkerSeverity.Warning })
                   : m;
               }));
@@ -548,7 +557,7 @@
       });
     }
 
-    // TypeScript: enable JSX for .tsx files and catch unused locals.
+    // TypeScript: enable JSX for .tsx files.
     if (monaco.languages.typescript && monaco.languages.typescript.typescriptDefaults) {
       monaco.languages.typescript.typescriptDefaults.setCompilerOptions({
         target: monaco.languages.typescript.ScriptTarget.ES2020,

data/app/assets/javascripts/mbeditor/editor_store.js

@@ -15,6 +15,7 @@ var EditorStore = (function () {
     searchResults: [],
     searchCapped: false,
     statusMessage: { text: "", kind: "info" },
+    pendingReloads: [],
     canUndo: false,
     canRedo: false,
   };

data/app/assets/stylesheets/mbeditor/application.css

@@ -861,3 +861,115 @@
 }
 
 .cdiff-ctx  { color: var(--ide-text-muted); }
+
+/* ── File Reload Banner ─────────────────────────────────────────── */
+.mb-file-reload-banner {
+  display: flex;
+  flex-direction: column;
+  gap: 0;
+  flex-shrink: 0;
+}
+
+.mb-file-reload-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 5px 12px;
+  background: #2a2600;
+  border-bottom: 1px solid #5a5000;
+  font-size: 12px;
+  color: #e3d286;
+  gap: 12px;
+}
+
+.mb-file-reload-msg {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.mb-file-reload-actions {
+  display: flex;
+  gap: 5px;
+  flex-shrink: 0;
+}
+
+.mb-btn-warning {
+  background: #6b4500;
+  color: #ffd88a;
+  border: 1px solid #8a5900;
+}
+
+.mb-btn-warning:hover {
+  background: #8a5900;
+}
+
+/* ── Merge Conflict Decorations ─────────────────────────────────── */
+.mb-conflict-marker-line {
+  background: rgba(120, 80, 0, 0.35) !important;
+}
+
+.mb-conflict-head {
+  background: rgba(180, 60, 60, 0.18) !important;
+  border-left: 2px solid rgba(200, 80, 80, 0.6);
+}
+
+.mb-conflict-incoming {
+  background: rgba(60, 130, 60, 0.18) !important;
+  border-left: 2px solid rgba(80, 160, 80, 0.6);
+}
+
+/* ── Conflict Banner ─────────────────────────────────────────────── */
+.mb-conflict-banner {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 5px 12px;
+  background: #1e1a00;
+  border-bottom: 1px solid #5a5000;
+  font-size: 12px;
+  color: #e3d286;
+  flex-shrink: 0;
+}
+
+.mb-conflict-count {
+  font-weight: bold;
+  color: #f5a623;
+  white-space: nowrap;
+}
+
+.mb-conflict-nav {
+  display: flex;
+  gap: 4px;
+}
+
+.mb-conflict-actions {
+  display: flex;
+  gap: 5px;
+  margin-left: auto;
+}
+
+.mb-btn-success {
+  background: #1a5c2a;
+  color: #aef;
+  border: 1px solid #2a7a3a;
+}
+
+.mb-btn-success:hover {
+  background: #1e7a38;
+}
+
+.mb-btn-incoming {
+  background: #1a3060;
+  color: #aef;
+  border: 1px solid #1a4080;
+}
+
+.mb-btn-incoming:hover {
+  background: #1a4080;
+}

data/lib/mbeditor/rack/handle_pending_migrations.rb

@@ -36,6 +36,15 @@ module Mbeditor
       private
 
       def editor_shell_html(base)
+        prettier_scripts = %w[
+          prettier-standalone.js
+          prettier-plugin-babel.js
+          prettier-plugin-estree.js
+          prettier-plugin-html.js
+          prettier-plugin-postcss.js
+          prettier-plugin-markdown.js
+        ].map { |f| "#{base}/assets/#{f}" }.to_json
+
         <<~HTML
           <!DOCTYPE html>
           <html lang="en">
@@ -45,6 +54,16 @@ module Mbeditor
             <title>Mbeditor</title>
             <link rel="stylesheet" href="#{base}/assets/fontawesome.min.css" />
             <link rel="stylesheet" href="#{base}/assets/mbeditor/application.css" />
+            <script defer src="#{base}/assets/react.min.js"></script>
+            <script defer src="#{base}/assets/react-dom.min.js"></script>
+            <script defer src="#{base}/assets/axios.min.js"></script>
+            <script defer src="#{base}/assets/lodash.min.js"></script>
+            <script defer src="#{base}/assets/minisearch.min.js"></script>
+            <script defer src="#{base}/assets/marked.min.js"></script>
+            <script defer src="#{base}/assets/emmet.js"></script>
+            <script defer src="#{base}/assets/monaco-themes-bundle.js"></script>
+            <script>var require = { paths: { vs: '#{base}/monaco-editor/vs', 'monaco-editor/esm/vs': '#{base}/monaco-editor/vs', 'monaco-vim': '#{base}/assets/monaco-vim' } };</script>
+            <script src="#{base}/monaco-editor/vs/loader.js"></script>
           </head>
           <body>
             <script>
@@ -60,68 +79,70 @@ module Mbeditor
                 <div class="mbeditor-loading-text">Loading editor&hellip;</div>
               </div>
             </div>
-            <script defer src="#{base}/assets/react.min.js"></script>
-            <script defer src="#{base}/assets/react-dom.min.js"></script>
-            <script defer src="#{base}/assets/axios.min.js"></script>
-            <script defer src="#{base}/assets/lodash.min.js"></script>
-            <script defer src="#{base}/assets/minisearch.min.js"></script>
-            <script defer src="#{base}/assets/marked.min.js"></script>
-            <script defer src="#{base}/assets/emmet.js"></script>
-            <script defer src="#{base}/assets/monaco-themes-bundle.js"></script>
             <script>
               window.MonacoEnvironment = {
                 getWorkerUrl: function(workerId, label) {
-                  if (label === 'typescript' || label === 'javascript') return '#{base}/ts_worker.js';
-                  return '#{base}/monaco_worker.js';
+                  var b = window.MBEDITOR_BASE_PATH || '';
+                  if (label === 'typescript' || label === 'javascript') return b + '/ts_worker.js';
+                  return b + '/monaco_worker.js';
                 }
               };
-              var require = { paths: { vs: '#{base}/monaco-editor/vs', 'monaco-editor/esm/vs': '#{base}/monaco-editor/vs', 'monaco-vim': '#{base}/assets/monaco-vim' } };
-            </script>
-            <script src="#{base}/monaco-editor/vs/loader.js"></script>
-            <script>
               (function() {
-                var prettierScripts = [
-                  '#{base}/assets/prettier-standalone.js',
-                  '#{base}/assets/prettier-plugin-babel.js',
-                  '#{base}/assets/prettier-plugin-estree.js',
-                  '#{base}/assets/prettier-plugin-html.js',
-                  '#{base}/assets/prettier-plugin-postcss.js',
-                  '#{base}/assets/prettier-plugin-markdown.js'
-                ];
                 var _define = window.define;
                 window.define = undefined;
-                var pending = prettierScripts.length;
-                function onAllPrettierLoaded() {
-                  function proceed() {
-                    window.MbeditorRuntime = { React: window.React, ReactDOM: window.ReactDOM };
-                    window.React    = window._mbeditorHostReact;
-                    window.ReactDOM = window._mbeditorHostReactDOM;
-                    window.define = _define;
-                    require(['vs/editor/editor.main'], function() {
-                      if (window.MBEDITOR_CUSTOM_THEMES && window.monaco) {
-                        Object.keys(window.MBEDITOR_CUSTOM_THEMES).forEach(function(id) {
-                          window.monaco.editor.defineTheme(id, window.MBEDITOR_CUSTOM_THEMES[id]);
-                        });
-                      }
+
+                var prettierScripts = #{prettier_scripts};
+                window.loadPrettierPlugins = function() {
+                  if (window._prettierLoadPromise) return window._prettierLoadPromise;
+                  window._prettierLoadPromise = new Promise(function(resolve, reject) {
+                    var savedDefine = window.define;
+                    window.define = undefined;
+                    var pending = prettierScripts.length;
+                    prettierScripts.forEach(function(src) {
                       var s = document.createElement('script');
-                      s.src = '#{base}/assets/mbeditor/application.js';
-                      s.onload = function() {
-                        var root = document.getElementById('mbeditor-root');
-                        var _R = window.MbeditorRuntime.React, _RD = window.MbeditorRuntime.ReactDOM;
-                        if (window.MbeditorApp && _R && _RD) _RD.render(_R.createElement(window.MbeditorApp), root);
-                      };
-                      document.body.appendChild(s);
+                      s.src = src;
+                      s.onload = function() { if (--pending === 0) { window.define = savedDefine; resolve(); } };
+                      s.onerror = function() { window.define = savedDefine; reject(new Error('Failed to load Prettier: ' + src)); };
+                      document.head.appendChild(s);
                     });
-                  }
-                  if (window._mbeditorDOMReady) proceed();
-                  else document.addEventListener('DOMContentLoaded', proceed, { once: true });
+                  });
+                  return window._prettierLoadPromise;
+                };
+
+                function proceed() {
+                  window.MbeditorRuntime = { React: window.React, ReactDOM: window.ReactDOM };
+                  window.React    = window._mbeditorHostReact;
+                  window.ReactDOM = window._mbeditorHostReactDOM;
+                  window.define = _define;
+
+                  var _monacoResolve;
+                  window.__monacoReady = new Promise(function(resolve) { _monacoResolve = resolve; });
+
+                  var appScript = document.createElement('script');
+                  appScript.src = '#{base}/assets/mbeditor/application.js';
+                  appScript.onload = function() {
+                    var root = document.getElementById('mbeditor-root');
+                    var _R = window.MbeditorRuntime.React, _RD = window.MbeditorRuntime.ReactDOM;
+                    if (window.MbeditorApp && _R && _RD) _RD.render(_R.createElement(window.MbeditorApp), root);
+                  };
+                  appScript.onerror = function() {
+                    document.getElementById('mbeditor-root').innerHTML =
+                      '<div style="padding:2rem;font-family:sans-serif;color:#c00">Editor failed to load. Please refresh the page.</div>';
+                  };
+                  document.body.appendChild(appScript);
+
+                  require(['vs/editor/editor.main'], function() {
+                    if (window.MBEDITOR_CUSTOM_THEMES && window.monaco) {
+                      Object.keys(window.MBEDITOR_CUSTOM_THEMES).forEach(function(id) {
+                        window.monaco.editor.defineTheme(id, window.MBEDITOR_CUSTOM_THEMES[id]);
+                      });
+                    }
+                    _monacoResolve();
+                  });
                 }
-                prettierScripts.forEach(function(src) {
-                  var s = document.createElement('script');
-                  s.src = src;
-                  s.onload = function() { if (--pending === 0) onAllPrettierLoaded(); };
-                  document.head.appendChild(s);
-                });
+
+                if (window._mbeditorDOMReady) proceed();
+                else document.addEventListener('DOMContentLoaded', proceed, { once: true });
               })();
             </script>
           </body>

data/lib/mbeditor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mbeditor
-  VERSION = "0.5.2"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mbeditor
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Oliver Noonan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-30 00:00:00.000000000 Z
+date: 2026-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,6 +71,7 @@ files:
 - app/assets/javascripts/mbeditor/components/ShortcutHelp.js
 - app/assets/javascripts/mbeditor/components/TabBar.js
 - app/assets/javascripts/mbeditor/components/TestResultsPanel.js
+- app/assets/javascripts/mbeditor/conflict_parser.js
 - app/assets/javascripts/mbeditor/editor_plugins.js
 - app/assets/javascripts/mbeditor/editor_store.js
 - app/assets/javascripts/mbeditor/file_icon.js