mbeditor 0.5.3 → 0.7.1

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/javascripts/mbeditor/file_service.js

@@ -95,7 +95,7 @@ var FileService = (function () {
   }
 
   function runTests(path) {
-    return axios.post(window.mbeditorBasePath() + '/test', { path: path }).then(function(res) { return res.data; });
+    return axios.post(window.mbeditorBasePath() + '/test', { path: path }, { timeout: 120000 }).then(function(res) { return res.data; });
   }
 
   function ping() {
@@ -177,7 +177,6 @@ var FileService = (function () {
       prefetchCache.delete(path);
       return null;
     }
-    prefetchCache.delete(path);
     return entry.promise;
   }
 
@@ -189,6 +188,16 @@ var FileService = (function () {
     prefetchCache.delete(path);
   }
 
+  function getJsDefinition(symbol, extraOptions) {
+    var config = Object.assign({ params: { symbol: symbol }, timeout: 5000 }, extraOptions || {});
+    return axios.get(window.mbeditorBasePath() + '/js_definition', config).then(function(res) { return res.data; });
+  }
+
+  function getJsMembers(symbol, extraOptions) {
+    var config = Object.assign({ params: { symbol: symbol }, timeout: 5000 }, extraOptions || {});
+    return axios.get(window.mbeditorBasePath() + '/js_members', config).then(function(res) { return res.data; });
+  }
+
   function getModuleMembers(name, extraOptions) {
     var config = Object.assign({ params: { name: name }, timeout: 8000 }, extraOptions || {});
     return axios.get(window.mbeditorBasePath() + '/module_members', config).then(function(res) { return res.data; });
@@ -199,9 +208,23 @@ var FileService = (function () {
     return axios.get(window.mbeditorBasePath() + '/file_includes', config).then(function(res) { return res.data; });
   }
 
-  function getUnusedMethods(path, extraOptions) {
-    var config = Object.assign({ params: { path: path }, timeout: 30000 }, extraOptions || {});
-    return axios.get(window.mbeditorBasePath() + '/unused_methods', config).then(function(res) { return res.data; });
+  function getClientConfig() {
+    return axios.get(window.mbeditorBasePath() + '/client_config').then(function(res) { return res.data; });
+  }
+
+  function getRelatedFiles(path) {
+    return axios.get(window.mbeditorBasePath() + '/related_files', { params: { path: path } })
+      .then(function(res) { return res.data; });
+  }
+
+  function getChangelog() {
+    return axios.get(window.mbeditorBasePath() + '/changelog')
+      .then(function(res) { return res.data; });
+  }
+
+  function getModelSchema(model) {
+    return axios.get(window.mbeditorBasePath() + '/model_schema', { params: { model: model } })
+      .then(function(res) { return res.data; });
   }
 
   return {
@@ -225,11 +248,16 @@ var FileService = (function () {
     saveBranchState: saveBranchState,
     pruneBranchStates: pruneBranchStates,
     getDefinition: getDefinition,
+    getJsDefinition: getJsDefinition,
+    getJsMembers: getJsMembers,
     prefetch: prefetch,
     getPrefetched: getPrefetched,
     cancelPrefetch: cancelPrefetch,
     getModuleMembers: getModuleMembers,
     getFileIncludes: getFileIncludes,
-    getUnusedMethods: getUnusedMethods
+    getClientConfig: getClientConfig,
+    getRelatedFiles: getRelatedFiles,
+    getModelSchema: getModelSchema,
+    getChangelog: getChangelog
   };
 })();

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

@@ -7,7 +7,8 @@ var GitService = (function () {
       gitInfo: data,
       gitInfoError: null
     };
-    if (JSON.stringify(files) !== JSON.stringify(current)) {
+    var gitSig = function(arr) { return arr.map(function(f) { return f.path + '\x00' + f.status; }).join('\x01'); };
+    if (gitSig(files) !== gitSig(current)) {
       stateUpdate.gitFiles = files;
     }
     EditorStore.setState(stateUpdate);

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

@@ -0,0 +1,177 @@
+'use strict';
+
+var HistoryService = (function () {
+  // _tracking[filePath] = { branch }
+  var _tracking = {};
+  // _pending["branch:filePath"] = [[sl,sc,el,ec,text], ...]
+  var _pending = {};
+  // _bases["branch:filePath"] = "original content" — cleared after first flush
+  var _bases = {};
+  // _replayingPaths: Set of filePaths currently undergoing Phase 2 replay
+  var _replayingPaths = {};
+  // _idleTimers["branch:filePath"] = timerHandle
+  var _idleTimers = {};
+
+  var IDLE_MS = 30000;
+
+  function _key(branch, filePath) {
+    return branch + ':' + filePath;
+  }
+
+  function beginTracking(branch, filePath, baseContent) {
+    _tracking[filePath] = { branch: branch };
+    var k = _key(branch, filePath);
+    _pending[k] = _pending[k] || [];
+    _bases[k] = baseContent;
+  }
+
+  function resumeTracking(branch, filePath) {
+    _tracking[filePath] = { branch: branch };
+    var k = _key(branch, filePath);
+    _pending[k] = _pending[k] || [];
+  }
+
+  function stopTracking(filePath) {
+    var rec = _tracking[filePath];
+    if (!rec) return;
+    var k = _key(rec.branch, filePath);
+    clearTimeout(_idleTimers[k]);
+    delete _idleTimers[k];
+    flush(rec.branch, filePath);
+    delete _tracking[filePath];
+  }
+
+  function setReplayInProgress(filePath, inProgress) {
+    if (inProgress) {
+      _replayingPaths[filePath] = true;
+    } else {
+      delete _replayingPaths[filePath];
+    }
+  }
+
+  function recordOps(filePath, changes) {
+    if (_replayingPaths[filePath]) return;
+    var rec = _tracking[filePath];
+    if (!rec) return;
+    var k = _key(rec.branch, filePath);
+    var bucket = _pending[k] = _pending[k] || [];
+    for (var i = 0; i < changes.length; i++) {
+      var c = changes[i];
+      bucket.push([
+        c.range.startLineNumber,
+        c.range.startColumn,
+        c.range.endLineNumber,
+        c.range.endColumn,
+        c.text
+      ]);
+    }
+    clearTimeout(_idleTimers[k]);
+    _idleTimers[k] = setTimeout(function () { flush(rec.branch, filePath); }, IDLE_MS);
+  }
+
+  function flush(branch, filePath) {
+    var k = _key(branch, filePath);
+    var ops = _pending[k];
+    if (!ops || ops.length === 0) return;
+    _pending[k] = [];
+    clearTimeout(_idleTimers[k]);
+    delete _idleTimers[k];
+
+    var body = { branch: branch, path: filePath, ops: ops };
+    if (_bases.hasOwnProperty(k)) {
+      body.base = _bases[k];
+      delete _bases[k];
+    }
+
+    try {
+      fetch(window.mbeditorBasePath() + '/file_history', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'X-Mbeditor-Client': '1'
+        },
+        body: JSON.stringify(body)
+      }).catch(function () {
+        // On failure, put ops back so next flush retries
+        var existing = _pending[k] || [];
+        _pending[k] = ops.concat(existing);
+        if (body.base !== undefined && !_bases.hasOwnProperty(k)) {
+          _bases[k] = body.base;
+        }
+      });
+    } catch (e) {}
+  }
+
+  function flushAll(options) {
+    var useKeepalive = options && options.keepalive;
+    Object.keys(_tracking).forEach(function (filePath) {
+      var rec = _tracking[filePath];
+      var k = _key(rec.branch, filePath);
+      var ops = _pending[k];
+      if (!ops || ops.length === 0) return;
+      var remaining = ops.slice();
+      _pending[k] = [];
+      clearTimeout(_idleTimers[k]);
+      delete _idleTimers[k];
+
+      var body = { branch: rec.branch, path: filePath, ops: remaining };
+      if (_bases.hasOwnProperty(k)) {
+        body.base = _bases[k];
+        delete _bases[k];
+      }
+
+      try {
+        fetch(window.mbeditorBasePath() + '/file_history', {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'X-Mbeditor-Client': '1'
+          },
+          keepalive: useKeepalive === true,
+          body: JSON.stringify(body)
+        });
+      } catch (e) {}
+    });
+  }
+
+  function fetchHistory(branch, filePath) {
+    return fetch(
+      window.mbeditorBasePath() + '/file_history' +
+      '?branch=' + encodeURIComponent(branch) +
+      '&path='   + encodeURIComponent(filePath),
+      { headers: { 'X-Mbeditor-Client': '1' } }
+    ).then(function (res) {
+      if (!res.ok) return null;
+      return res.json();
+    }).then(function (data) {
+      if (!data || !data.ops || data.ops.length === 0) return null;
+      return data;
+    }).catch(function () { return null; });
+  }
+
+  // Global flush triggers
+  document.addEventListener('visibilitychange', function () {
+    if (document.visibilityState === 'hidden') flushAll({});
+  });
+
+  window.addEventListener('beforeunload', function () {
+    flushAll({ keepalive: true });
+  });
+
+  function flushForPath(filePath) {
+    var rec = _tracking[filePath];
+    if (rec) flush(rec.branch, filePath);
+  }
+
+  return {
+    beginTracking:       beginTracking,
+    resumeTracking:      resumeTracking,
+    stopTracking:        stopTracking,
+    setReplayInProgress: setReplayInProgress,
+    recordOps:           recordOps,
+    flush:               flush,
+    flushAll:            flushAll,
+    flushForPath:        flushForPath,
+    fetchHistory:        fetchHistory
+  };
+})();

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

@@ -61,6 +61,7 @@ var SearchService = (function () {
 
       function traverse(nodes) {
         nodes.forEach(function(n) {
+          if (n.excluded) return; // skip excluded paths and their descendants
           if (n.type === 'file') {
             docs.push({ id: idCounter++, path: n.path, name: n.name, type: 'file' });
           } else if (n.type === 'folder') {

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

@@ -1,5 +1,5 @@
 var TabManager = (function () {
-  var MAX_MODELS = 15;
+  var MAX_MODELS = 25;
 
   // Evict the least-recently-used Monaco model that is not currently open in
   // any pane. Call this before creating a new model entry.
@@ -118,7 +118,7 @@ var TabManager = (function () {
     });
   }
 
-  function openTab(path, name, line, forcePaneId, isSoftOpen) {
+  function openTab(path, name, line, forcePaneId, isSoftOpen, col) {
     var state = EditorStore.getState();
     var paneId = forcePaneId || state.focusedPaneId;
     var pane = state.panes.find(function(p) { return p.id === paneId; });
@@ -137,7 +137,7 @@ var TabManager = (function () {
     var existing = pane.tabs.find(function(t) { return t.path === path; });
 
     if (existing) {
-      if (line) _updateTab(paneId, path, { gotoLine: line });
+      if (line) _updateTab(paneId, path, { gotoLine: line, gotoCol: col || null });
       switchTab(paneId, path);
       if (_isMarkdownPath(path)) {
         _ensureMarkdownPreview(paneId, path, existing.name || name, existing.content || "");
@@ -163,7 +163,7 @@ var TabManager = (function () {
       isSoftOpen: isSoftOpen ? true : false,
       loading: true
     };
-    if (line) newTab.gotoLine = line;
+    if (line) { newTab.gotoLine = line; newTab.gotoCol = col || null; }
 
     var newPanes = state.panes.map(function(p) {
       if (p.id === paneId) {
@@ -349,6 +349,9 @@ var TabManager = (function () {
   }
 
   function closeTab(paneId, path) {
+    if (typeof HistoryService !== 'undefined') {
+      HistoryService.flushForPath(path);
+    }
     var state = EditorStore.getState();
     var newPanes = state.panes.map(function(pane) {
       if (pane.id === paneId) {
@@ -553,7 +556,7 @@ var TabManager = (function () {
   }
 
   function clearGotoLine(paneId, path) {
-    _updateTab(paneId, path, { gotoLine: null });
+    _updateTab(paneId, path, { gotoLine: null, gotoCol: null });
   }
 
   return {

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;
+}