mbeditor 0.13.0 → 0.14.0

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

@@ -145,10 +145,12 @@ var TabManager = (function () {
     });
   }
 
-  // Single slot holding "where the cursor was before the last jump".
-  // PageUp/PageDown swap the cursor between this slot and its current spot.
-  // ponytail: two-position cycle, upgrade to a real back/forward stack if asked
-  var _jumpOrigin = null;
+  // Back/forward navigation history: every real jump or file change pushes
+  // an entry; PageUp/PageDown walk it like browser back/forward.
+  var _navStack = [];
+  var _navIndex = -1;
+  var _navigating = false;
+  var NAV_STACK_MAX = 50;
 
   function _snapshotPosition() {
     var editor = window.__mbeditorActiveEditor;
@@ -161,16 +163,40 @@ var TabManager = (function () {
     return { path: tab.path, name: tab.name, line: pos.lineNumber, col: pos.column };
   }
 
-  function toggleJumpOrigin() {
-    var target = _jumpOrigin;
-    if (!target) return;
-    // openTab re-snapshots the current position into _jumpOrigin below,
-    // which is exactly the swap we want.
-    openTab(target.path, target.name, target.line, null, false, target.col);
-  }
-
-  function openTab(path, name, line, forcePaneId, isSoftOpen, col) {
-    if (line) _jumpOrigin = _snapshotPosition() || _jumpOrigin;
+  // Truncates any forward entries, then pushes. Skips a push that would
+  // duplicate the current top entry's path+line, and is a no-op entirely
+  // while a navigateBack/navigateForward-driven openTab is replaying.
+  function _pushNavEntry(entry) {
+    if (_navigating || !entry || !entry.path) return;
+    if (_navIndex > -1) _navStack = _navStack.slice(0, _navIndex + 1);
+    var top = _navStack[_navStack.length - 1];
+    if (top && top.path === entry.path && top.line === entry.line) return;
+    _navStack.push(entry);
+    if (_navStack.length > NAV_STACK_MAX) _navStack.shift();
+    _navIndex = _navStack.length - 1;
+  }
+
+  // Refreshing the entry we are leaving from the live cursor is what makes
+  // going back land where you actually were, not where the entry was created.
+  function _navigate(step) {
+    var next = _navIndex + step;
+    if (_navIndex < 0 || next < 0 || next >= _navStack.length) return;
+    var live = _snapshotPosition();
+    if (live) _navStack[_navIndex] = live;
+    _navIndex = next;
+    var target = _navStack[next];
+    _navigating = true;
+    try { openTab(target.path, target.name, target.line, null, false, target.col); }
+    finally { _navigating = false; }
+  }
+
+  function navigateBack() { _navigate(-1); }
+  function navigateForward() { _navigate(1); }
+
+  // col/endCol are the 1-based bounds of the thing being jumped to. Pass both
+  // and the editor selects it, leaving the cursor at its end; pass col alone
+  // and it just parks the cursor there.
+  function openTab(path, name, line, forcePaneId, isSoftOpen, col, endCol) {
     var state = EditorStore.getState();
     var paneId = forcePaneId || state.focusedPaneId;
     var pane = state.panes.find(function(p) { return p.id === paneId; });
@@ -186,13 +212,14 @@ var TabManager = (function () {
 
     if (!pane) return;
 
+    _pushNavEntry({ path: path, name: name, line: line || null, col: col || null });
     _recordRecentFile(path, name);
 
     var existing = pane.tabs.find(function(t) { return t.path === path; });
 
     if (existing) {
-      if (line) _updateTab(paneId, path, { gotoLine: line, gotoCol: col || null });
-      switchTab(paneId, path);
+      if (line) _updateTab(paneId, path, { gotoLine: line, gotoCol: col || null, gotoEndCol: endCol || null });
+      _switchTab(paneId, path);
       if (_isMarkdownPath(path)) {
         _ensureMarkdownPreview(paneId, path, existing.name || name, existing.content || "");
       }
@@ -217,7 +244,7 @@ var TabManager = (function () {
       isSoftOpen: isSoftOpen ? true : false,
       loading: true
     };
-    if (line) { newTab.gotoLine = line; newTab.gotoCol = col || null; }
+    if (line) { newTab.gotoLine = line; newTab.gotoCol = col || null; newTab.gotoEndCol = endCol || null; }
 
     var newPanes = state.panes.map(function(p) {
       if (p.id === paneId) {
@@ -227,6 +254,7 @@ var TabManager = (function () {
     });
 
     EditorStore.setState({ panes: newPanes, focusedPaneId: paneId, activeTabId: path });
+    _promoteMru(paneId, path);
 
     // Virtual paths (diff://, combined-diff://) should never hit the file endpoint
     if (path.indexOf('diff://') === 0 || path.indexOf('combined-diff://') === 0) {
@@ -234,6 +262,7 @@ var TabManager = (function () {
     }
 
     // Use a prefetched result if available (hover-prefetch hit), otherwise fetch normally.
+    var startedAt = Date.now();
     var prefetchPromise = FileService.getPrefetched(path);
     var filePromise = prefetchPromise || FileService.getFile(path, { allowMissing: true });
 
@@ -246,6 +275,11 @@ var TabManager = (function () {
       if (!data) { closeTab(paneId, path); return; }
       var loadedContent = typeof data.content === 'string' ? data.content : "";
       var fileNotFound = data && data.missing === true;
+      var audit = window.MbeditorAudit;
+      if (audit) {
+        audit.rec(audit.EV.OPEN, audit.code('ext', String(path).split('.').pop().toLowerCase()),
+                  loadedContent.length, Date.now() - startedAt);
+      }
       _updateTab(paneId, path, {
         content: loadedContent,
         cleanContent: loadedContent,
@@ -260,6 +294,8 @@ var TabManager = (function () {
         _syncMarkdownPreviewContent(path, typeof data.content === 'string' ? data.content : "");
       }
     }).catch(function(err) {
+      var audit = window.MbeditorAudit;
+      if (audit) audit.rec(audit.EV.ERR, audit.EV.OPEN);
       if (path.startsWith('diff://')) return; // diff tabs handle their own loading
       if (err.response && err.response.status === 413) {
         FileService.getFileChunk(path, 0, 500).then(function(data) {
@@ -423,18 +459,34 @@ var TabManager = (function () {
     if (typeof HistoryService !== 'undefined') {
       HistoryService.flushForPath(path);
     }
+    _removeMru(paneId, path);
     var state = EditorStore.getState();
+    // Closing a markdown source also closes its preview tab, wherever it lives.
+    // Guard against recursion: a preview tab has no preview of its own.
+    var closingPane = state.panes.find(function(p) { return p.id === paneId; });
+    var closingTab = closingPane && closingPane.tabs.find(function(t) { return t.id === path; });
+    var closePreviewsFor = (closingTab && !closingTab.isPreview) ? path : null;
+
     var newPanes = state.panes.map(function(pane) {
-      if (pane.id === paneId) {
-        // Match by t.id so diff tabs (id = 'diff://...') are closed correctly
-        var newTabs = pane.tabs.filter(function(t) { return t.id !== path; });
-        var newActive = pane.activeTabId;
-        if (pane.activeTabId === path) {
-          newActive = newTabs.length > 0 ? newTabs[newTabs.length - 1].id : null;
+      // Match by t.id so diff tabs (id = 'diff://...') are closed correctly
+      var newTabs = pane.tabs.filter(function(t) {
+        if (pane.id === paneId && t.id === path) return false;
+        if (closePreviewsFor && t.isPreview && t.previewFor === closePreviewsFor) return false;
+        return true;
+      });
+      if (newTabs.length === pane.tabs.length) return pane;
+
+      var newActive = pane.activeTabId;
+      if (!newTabs.some(function(t) { return t.id === newActive; })) {
+        // Reactivate the tab the user was actually last in, not just the rightmost one.
+        var mruList = _mru[pane.id] || [];
+        var mruPick = null;
+        for (var i = 0; i < mruList.length; i++) {
+          if (newTabs.some(function(t) { return t.id === mruList[i]; })) { mruPick = mruList[i]; break; }
         }
-        return Object.assign({}, pane, { tabs: newTabs, activeTabId: newActive });
+        newActive = mruPick || (newTabs.length > 0 ? newTabs[newTabs.length - 1].id : null);
       }
-      return pane;
+      return Object.assign({}, pane, { tabs: newTabs, activeTabId: newActive });
     });
 
     var nextFocusedPaneId = state.focusedPaneId;
@@ -494,7 +546,7 @@ var TabManager = (function () {
     if (!pane || pane.tabs.length === 0) return;
 
     pane.tabs.slice().forEach(function(tab) {
-      closeTab(paneId, tab.path);
+      closeTab(paneId, tab.id);
     });
   }
 
@@ -525,13 +577,43 @@ var TabManager = (function () {
     });
   }
 
-  function switchTab(paneId, path) {
+  // Most-recently-used tab ids per pane, most-recent first. Lets closeTab
+  // reactivate the tab the user was actually last in, not just the rightmost one.
+  var _mru = {};
+  var MRU_MAX = 20;
+
+  function _promoteMru(paneId, tabId) {
+    if (!tabId) return;
+    var list = _mru[paneId] || (_mru[paneId] = []);
+    var idx = list.indexOf(tabId);
+    if (idx !== -1) list.splice(idx, 1);
+    list.unshift(tabId);
+    if (list.length > MRU_MAX) list.length = MRU_MAX;
+  }
+
+  function _removeMru(paneId, tabId) {
+    var list = _mru[paneId];
+    if (!list) return;
+    var idx = list.indexOf(tabId);
+    if (idx !== -1) list.splice(idx, 1);
+  }
+
+  function _switchTab(paneId, path) {
     var state = EditorStore.getState();
     var newPanes = state.panes.map(function(p) {
       if (p.id === paneId) return Object.assign({}, p, { activeTabId: path });
       return p;
     });
     EditorStore.setState({ panes: newPanes, focusedPaneId: paneId, activeTabId: path });
+    _promoteMru(paneId, path);
+  }
+
+  function switchTab(paneId, path) {
+    _switchTab(paneId, path);
+    var state = EditorStore.getState();
+    var pane = state.panes.find(function(p) { return p.id === paneId; });
+    var tab = pane && pane.tabs.find(function(t) { return t.id === path; });
+    _pushNavEntry({ path: path, name: tab ? tab.name : null, line: null, col: null });
   }
 
   function focusPane(paneId) {
@@ -561,12 +643,12 @@ var TabManager = (function () {
   function _queueContent(paneId, path, content, updates, markdown) {
     var key = paneId + '' + path;
     if (updates) {
-      // A state transition has to land now, and it takes the content with it.
-      delete _pendingContent[key];
-      updates.content = content;
+      // A clean<->dirty transition must land now, but the full buffer is still
+      // materialized only on the trailing edge below. Callers pass a provider
+      // (a function) from the per-keystroke content listener so getValue() runs
+      // once per flush instead of once per keypress; everything else passes the
+      // string it already holds.
       _updateTab(paneId, path, updates);
-      if (markdown) _syncMarkdownPreviewContent(path, content);
-      return;
     }
     _pendingContent[key] = { paneId: paneId, path: path, content: content, markdown: markdown };
     if (_contentTimer === null) {
@@ -574,6 +656,13 @@ var TabManager = (function () {
     }
   }
 
+  // A pending content slot holds either a string or a provider invoked at flush
+  // time. A provider whose model has gone away returns nothing and is skipped.
+  function _resolveContent(content) {
+    if (typeof content !== 'function') return content;
+    try { return content(); } catch (e) { return null; }
+  }
+
   function flushContent() {
     if (_contentTimer !== null) {
       clearTimeout(_contentTimer);
@@ -583,8 +672,10 @@ var TabManager = (function () {
     _pendingContent = {};
     Object.keys(pending).forEach(function (k) {
       var p = pending[k];
-      _updateTab(p.paneId, p.path, { content: p.content });
-      if (p.markdown) _syncMarkdownPreviewContent(p.path, p.content);
+      var content = _resolveContent(p.content);
+      if (typeof content !== 'string') return;
+      _updateTab(p.paneId, p.path, { content: content });
+      if (p.markdown) _syncMarkdownPreviewContent(p.path, content);
     });
   }
 
@@ -614,24 +705,13 @@ var TabManager = (function () {
     _updateTab(paneId, path, { isSoftOpen: false });
   }
 
-  function saveTabViewState(paneIdOrPath, pathOrViewState, maybeViewState) {
-    var paneId = paneIdOrPath;
-    var path = pathOrViewState;
-    var viewState = maybeViewState;
-
-    // Backward-compatible signature: saveTabViewState(path, viewState)
-    if (typeof maybeViewState === 'undefined') {
-      var state = EditorStore.getState();
-      path = paneIdOrPath;
-      viewState = pathOrViewState;
-      var containingPane = state.panes.find(function(p) {
-        return p.tabs.some(function(t) { return t.path === path; });
-      });
-      if (!containingPane) return;
-      paneId = containingPane.id;
-    }
-
-    _updateTab(paneId, path, { viewState: viewState });
+  function saveTabViewState(path, viewState) {
+    var state = EditorStore.getState();
+    var containingPane = state.panes.find(function(p) {
+      return p.tabs.some(function(t) { return t.path === path; });
+    });
+    if (!containingPane) return;
+    _updateTab(containingPane.id, path, { viewState: viewState });
   }
 
   function reorderTabInPane(paneId, tabId, insertBeforeTabId) {
@@ -699,7 +779,7 @@ var TabManager = (function () {
   }
 
   function clearGotoLine(paneId, path) {
-    _updateTab(paneId, path, { gotoLine: null, gotoCol: null });
+    _updateTab(paneId, path, { gotoLine: null, gotoCol: null, gotoEndCol: null });
   }
 
   // VS Code-style scratch buffer: a tab with no file behind it. Nothing is
@@ -752,7 +832,8 @@ var TabManager = (function () {
     reorderTabInPane: reorderTabInPane,
     moveTabToPane: moveTabToPane,
     clearGotoLine: clearGotoLine,
-    toggleJumpOrigin: toggleJumpOrigin,
+    navigateBack: navigateBack,
+    navigateForward: navigateForward,
     closeAllTabsInPane: closeAllTabsInPane,
     closeOtherTabsInPane: closeOtherTabsInPane,
     closeSavedTabsInPane: closeSavedTabsInPane,

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

@@ -75,6 +75,17 @@ var WebSocketService = (function () {
     return window.ActionCable.createConsumer(_cableUrl());
   }
 
+  // Single consumer for both the EditorChannel and every CollaborationChannel.
+  // subscribeCollaboration used to mint its own consumer whenever _consumer was
+  // null (the state after a drop), and _attemptConnect then created a second one
+  // — the first socket was never disconnected, so every outage during which a
+  // file was opened leaked a WebSocket. Whoever asks first creates it; everyone
+  // else reuses it.
+  function _ensureConsumer() {
+    if (!_consumer) _consumer = _getConsumer();
+    return _consumer;
+  }
+
   function _cleanupConsumer() {
     if (_subscription) {
       try { _subscription.unsubscribe(); } catch (e) { /* ignore */ }
@@ -146,7 +157,7 @@ var WebSocketService = (function () {
     if (_status !== 'rejected') _status = 'connecting';
 
     try {
-      _consumer = _getConsumer();
+      _consumer = _ensureConsumer();
       _subscription = _consumer.subscriptions.create(
         { channel: 'Mbeditor::EditorChannel' },
         {
@@ -344,10 +355,7 @@ var WebSocketService = (function () {
     if (!isCableAvailable()) return null;
     handlers = handlers || {};
     try {
-      if (!_consumer) {
-        _consumer = _getConsumer();
-      }
-      return _consumer.subscriptions.create(
+      return _ensureConsumer().subscriptions.create(
         { channel: 'Mbeditor::CollaborationChannel', path: path },
         {
           connected: function () { if (handlers.connected) handlers.connected(); },

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

@@ -2,6 +2,7 @@
  *= require pico.classless
  *= require mbeditor/themes
  *= require mbeditor/editor
+ *= require mbeditor/glass
  */
 
 /* ── Git & Code Review Styles ───────────────────────────────────────── */
@@ -641,7 +642,7 @@
 }
 .redmine-badge {
   background-color: var(--ide-accent);
-  color: var(--ide-accent-text);
+  color: var(--ide-on-accent);
   font-size: 10px;
   padding: 2px 6px;
   border-radius: 10px;
@@ -858,6 +859,10 @@
   .search-loading-spinner {
     animation-duration: 0.7s !important;
   }
+
+  .statusbar-offline {
+    animation: none;
+  }
 }
 
 .cdiff-ctx  { color: var(--ide-text-muted); }