mbeditor 0.3.8 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caf178914c2be95307a23ee24744dabd50f12c8597c69eddf814f63895e17433
-  data.tar.gz: 0353fc7e791cf1fff4c739fddf59d0a1ba8259353a4147b738824275c4bca55f
+  metadata.gz: d378fdda8fc933a3c3d1f5b1fc5eb1622ca4ebee91db435378dd069827f708e2
+  data.tar.gz: 2c58b8db51c1df5e7f746af61550dc2ccf62ba33a515cb374c79931aefed1beb
 SHA512:
-  metadata.gz: 772a81a73df9b7ca2bd517193ee0178fb9843ea934c7bbc05157e84794596c62b98f34dbfa50004e2c8ee1abeda1e121e8936350826b1a213031952c1ef10563
-  data.tar.gz: 705bc59cb210934c909b35819d41c98ecd3e858a153a25efa6587e530c51faa0821aa39932c155c4860c7335a0c70d7f06302e4c6a5b7cb7f1214911bb1f7fbe
+  metadata.gz: 43753349cc14d328dbb45c4d6413cb0a56b9ac49979e7cd0bafe884de0889ede353decdd8552da38d872c278fa3c70162a1730df5827f45d0f629aa0d44a1f6f
+  data.tar.gz: 3547eec20751a3c7279765e79429dda30398dfd6aa64c7b70d7e2f70cda6e8de6d9ae8c30a0c671a9750dcce1422d115d2b42f1a3d35b6679e81d795ba134c3e

data/CHANGELOG.md

@@ -5,6 +5,41 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.2] - 2026-04-22
+
+### Fixed
+- Updated sidebar search system test selectors to match the current UI loading and clear controls, resolving CI matrix failures in GitHub Actions.
+
+## [0.4.1] - 2026-04-22
+
+### Added
+- Real-time file update integration via Action Cable to improve collaborative and live-refresh editing workflows.
+
+### Changed
+- Search functionality enhancements for improved result handling and responsiveness.
+
+## [0.4.0] - 2026-04-22
+
+### Added
+- **Draft auto-save and restore** — unsaved edits are written to `localStorage` every 500 ms per file. On reconnect after a server outage, a dialog offers to restore any drafts that diverged from the in-memory tab content.
+- **Tab bar layout setting** — new "Tab bar layout" preference (Scroll / Wrap multi-row) stored in editor prefs; `TabBar` receives a `tabDisplayMode` prop and applies the appropriate CSS class; horizontal wheel scroll is disabled in wrap mode.
+
+### Fixed
+- **Drag-to-split** — pane 2 drop zone is now only shown when the cursor actively hovers over the right-half content area, preventing the tab bar from collapsing during a drag. Dropping onto a tab bar element is no longer intercepted by the cross-pane drop handler, preserving same-pane reordering.
+- **Quick Open sorting** — files consistently rank above directories; within the same priority tier results are sorted by match relevance (exact basename > prefix match > substring > other).
+- **Search total count** — the count thread is joined with a 100 ms timeout; `total_count` is omitted from the response when the thread has not finished, so the first page is never blocked by the counting subprocess.
+- **Status bar message colour** — removed `color-mix` transparency that was dimming the accent-text colour.
+
+## [0.3.9] - 2026-04-21
+
+### Added
+- Search responses now include a total result count; background counting runs for the first page to populate it without blocking.
+- Editor preferences expanded with line height, letter spacing, cursor style, and auto-closing bracket/quote settings.
+
+### Fixed
+- Multi-line tab indentation corrected; added regression test to prevent recurrence.
+- 8 correctness, security, and reliability fixes surfaced by ultrareview.
+
 ## [0.3.8] - 2026-04-16
 
 ### Fixed

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

@@ -2,6 +2,7 @@
 //= require mbeditor/editor_store
 //= require mbeditor/file_icon
 //= require mbeditor/file_service
+//= require mbeditor/websocket_service
 //= require mbeditor/git_service
 //= require mbeditor/search_service
 //= require mbeditor/tab_manager

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

@@ -1,4 +1,11 @@
 // Mbeditor app IIFE — React and ReactDOM are injected from window.MbeditorRuntime
 // so that mbeditor never reads from or writes to window.React / window.ReactDOM,
 // protecting the host application's globals.
+
+// Shared helper — returns the engine mount path with no trailing slash.
+// All service modules and components use this instead of inlining the lookup.
+window.mbeditorBasePath = function() {
+  return (window.MBEDITOR_BASE_PATH || '/mbeditor').replace(/\/$/, '');
+};
+
 (function(React, ReactDOM) {

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

@@ -27,7 +27,7 @@ var CodeReviewPanel = function CodeReviewPanel(_ref) {
     setIsRedmineLoading(true);
 
     // Call the redmine endpoint. It will 503 if disabled via config.
-    axios.get((window.MBEDITOR_BASE_PATH || '/mbeditor' ) + '/redmine/issue/' + issueId)
+    axios.get(window.mbeditorBasePath() + '/redmine/issue/' + issueId)
       .then(function (res) {
         setRedmineIssue(res.data);
         setIsRedmineLoading(false);

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

@@ -68,6 +68,23 @@ var EditorPanel = function EditorPanel(_ref) {
   var editorReady = _useState10[0];
   var setEditorReady = _useState10[1];
 
+  var _useState11 = useState(false);
+  var _useState12 = _slicedToArray(_useState11, 2);
+  var methodsOpen = _useState12[0];
+  var setMethodsOpen = _useState12[1];
+
+  var _useState13 = useState([]);
+  var _useState14 = _slicedToArray(_useState13, 2);
+  var methodsList = _useState14[0];
+  var setMethodsList = _useState14[1];
+
+  var _useState15 = useState(null);
+  var _useState16 = _slicedToArray(_useState15, 2);
+  var methodsDropdownPos = _useState16[0];
+  var setMethodsDropdownPos = _useState16[1];
+
+  var methodsBtnRef = useRef(null);
+
   var onFormatRef = useRef(onFormat);
   onFormatRef.current = onFormat;
 
@@ -480,30 +497,80 @@ var EditorPanel = function EditorPanel(_ref) {
       theme: editorPrefs.theme || 'vs-dark',
       automaticLayout: true,
       minimap: { enabled: !!(editorPrefs.minimap) },
-      renderLineHighlight: 'none',
+      renderLineHighlight: editorPrefs.renderLineHighlight || 'none',
       bracketPairColorization: { enabled: editorPrefs.bracketPairColorization !== false },
       fontFamily: editorPrefs.fontFamily || "'JetBrains Mono', 'Fira Code', Consolas, 'Courier New', monospace",
       fontSize: editorPrefs.fontSize || 13,
+      lineHeight: editorPrefs.lineHeight || 0,
+      letterSpacing: editorPrefs.letterSpacing || 0,
       tabSize: editorPrefs.tabSize || 4,
       insertSpaces: typeof editorPrefs.insertSpaces === 'boolean' ? editorPrefs.insertSpaces : false,
       wordWrap: editorPrefs.wordWrap || 'off',
       lineNumbers: editorPrefs.lineNumbers || 'on',
       renderWhitespace: editorPrefs.renderWhitespace || 'none',
       scrollBeyondLastLine: !!(editorPrefs.scrollBeyondLastLine),
-      linkedEditing: true, // Enables Auto-Rename Tag natively!
+      cursorStyle: editorPrefs.cursorStyle || 'line',
+      cursorBlinking: editorPrefs.cursorBlinking || 'blink',
+      folding: editorPrefs.folding !== false,
+      smoothScrolling: !!(editorPrefs.smoothScrolling),
+      mouseWheelZoom: !!(editorPrefs.mouseWheelZoom),
+      autoClosingBrackets: editorPrefs.autoClosingBrackets || 'always',
+      autoClosingQuotes: editorPrefs.autoClosingQuotes || 'always',
+      autoIndent: editorPrefs.autoIndent || 'full',
+      formatOnPaste: editorPrefs.formatOnPaste !== false,
+      formatOnType: editorPrefs.formatOnType !== false,
+      quickSuggestions: editorPrefs.quickSuggestions !== false,
+      wordBasedSuggestions: editorPrefs.wordBasedSuggestions || 'matchingDocuments',
+      acceptSuggestionOnEnter: editorPrefs.acceptSuggestionOnEnter || 'on',
+      linkedEditing: true,
       fixedOverflowWidgets: true,
-      hover: { above: false },
-      autoClosingBrackets: 'always',
-      autoClosingQuotes: 'always',
-      autoIndent: 'full',
-      formatOnPaste: true,
-      formatOnType: true
+      hover: { above: false }
     });
 
     if (tab.viewState) {
       editor.restoreViewState(tab.viewState);
     }
 
+    // Restore the find widget state from the previous editor (when persistFindState is on).
+    if (editorPrefs.persistFindState !== false && window.__mbeditorFindState && window.__mbeditorFindState.searchString) {
+      var _savedFind = window.__mbeditorFindState;
+      if (_savedFind.isRevealed) {
+        // Open the widget first (setTimeout so layout is ready), then re-apply the
+        // saved query — actions.find may seed from the selection and overwrite it.
+        setTimeout(function() {
+          try {
+            editor.trigger('', 'actions.find', null);
+            setTimeout(function() {
+              try {
+                var _fc0 = editor.getContribution('editor.contrib.findController');
+                if (_fc0 && _fc0.getState) {
+                  _fc0.getState().change({
+                    searchString: _savedFind.searchString,
+                    isRegex: !!_savedFind.isRegex,
+                    matchCase: !!_savedFind.matchCase,
+                    wholeWord: !!_savedFind.wholeWord
+                  }, false);
+                }
+              } catch (e) {}
+            }, 0);
+          } catch (e) {}
+        }, 0);
+      } else {
+        // Widget was closed — just seed the state silently so Ctrl+F pre-fills it.
+        try {
+          var _fc0 = editor.getContribution('editor.contrib.findController');
+          if (_fc0 && _fc0.getState) {
+            _fc0.getState().change({
+              searchString: _savedFind.searchString,
+              isRegex: !!_savedFind.isRegex,
+              matchCase: !!_savedFind.matchCase,
+              wholeWord: !!_savedFind.wholeWord
+            }, false);
+          }
+        } catch (e) {}
+      }
+    }
+
     monacoRef.current = editor;
     window.__mbeditorActiveEditor = editor;
     setEditorReady(true);
@@ -634,6 +701,26 @@ var EditorPanel = function EditorPanel(_ref) {
         _me.aviBase = aviBaseRef.current;
         _me.aviMax = aviMaxRef.current;
       }
+      // Save the current find widget state so it can be restored on next tab switch.
+      // Only overwrite the global state when there is an actual search string — this
+      // prevents a blank/fresh editor from clobbering the shared query.
+      if (editorPrefs.persistFindState !== false) {
+        try {
+          var _fc = editor.getContribution('editor.contrib.findController');
+          if (_fc && _fc.getState) {
+            var _fs = _fc.getState();
+            if (_fs.searchString) {
+              window.__mbeditorFindState = {
+                searchString: _fs.searchString,
+                isRegex: _fs.isRegex,
+                matchCase: _fs.matchCase,
+                wholeWord: _fs.wholeWord,
+                isRevealed: _fs.isRevealed
+              };
+            }
+          }
+        } catch (e) {}
+      }
       if (window.__mbeditorActiveEditor === editor) {
         window.__mbeditorActiveEditor = null;
       }
@@ -700,6 +787,8 @@ var EditorPanel = function EditorPanel(_ref) {
       monacoRef.current.updateOptions({
         fontSize: editorPrefs.fontSize || 13,
         fontFamily: editorPrefs.fontFamily || "'JetBrains Mono', 'Fira Code', Consolas, 'Courier New', monospace",
+        lineHeight: editorPrefs.lineHeight || 0,
+        letterSpacing: editorPrefs.letterSpacing || 0,
         tabSize: editorPrefs.tabSize || 4,
         insertSpaces: typeof editorPrefs.insertSpaces === 'boolean' ? editorPrefs.insertSpaces : false,
         wordWrap: editorPrefs.wordWrap || 'off',
@@ -707,7 +796,21 @@ var EditorPanel = function EditorPanel(_ref) {
         renderWhitespace: editorPrefs.renderWhitespace || 'none',
         minimap: { enabled: !!(editorPrefs.minimap) },
         scrollBeyondLastLine: !!(editorPrefs.scrollBeyondLastLine),
-        bracketPairColorization: { enabled: editorPrefs.bracketPairColorization !== false }
+        bracketPairColorization: { enabled: editorPrefs.bracketPairColorization !== false },
+        renderLineHighlight: editorPrefs.renderLineHighlight || 'none',
+        cursorStyle: editorPrefs.cursorStyle || 'line',
+        cursorBlinking: editorPrefs.cursorBlinking || 'blink',
+        folding: editorPrefs.folding !== false,
+        smoothScrolling: !!(editorPrefs.smoothScrolling),
+        mouseWheelZoom: !!(editorPrefs.mouseWheelZoom),
+        autoClosingBrackets: editorPrefs.autoClosingBrackets || 'always',
+        autoClosingQuotes: editorPrefs.autoClosingQuotes || 'always',
+        autoIndent: editorPrefs.autoIndent || 'full',
+        formatOnPaste: editorPrefs.formatOnPaste !== false,
+        formatOnType: editorPrefs.formatOnType !== false,
+        quickSuggestions: editorPrefs.quickSuggestions !== false,
+        wordBasedSuggestions: editorPrefs.wordBasedSuggestions || 'matchingDocuments',
+        acceptSuggestionOnEnter: editorPrefs.acceptSuggestionOnEnter || 'on'
       });
     }
   }, [editorPrefs]);
@@ -1146,6 +1249,9 @@ var EditorPanel = function EditorPanel(_ref) {
   var ext = parts.length > 1 ? parts.pop().toLowerCase() : '';
   var isImage = tab.isImage || IMAGE_EXTENSIONS.includes(ext);
   var isMarkdown = ['md', 'markdown'].includes(ext);
+  var fileBaseName = (tab.path || '').split('/').pop().toLowerCase();
+  var isRubyFile = ext === 'rb' || ext === 'ruby' || ext === 'gemspec' ||
+    fileBaseName === 'gemfile' || fileBaseName === 'gemfile.lock' || fileBaseName === 'rakefile';
 
   useEffect(function () {
     if (isMarkdown && window.marked) {
@@ -1157,11 +1263,57 @@ var EditorPanel = function EditorPanel(_ref) {
         renderer.html = function (token) {
           return '<pre>' + escapeHtml(typeof token === 'object' ? token.text : token) + '</pre>';
         };
+        // Sanitize link/image hrefs to block javascript: and data: schemes.
+        var _origLink = renderer.link.bind(renderer);
+        var _origImage = renderer.image.bind(renderer);
+        var SAFE_HREF_SCHEME = /^(https?:|mailto:|#|\/)/i;
+        var safeHref = function(href) {
+          if (!href) return href;
+          return SAFE_HREF_SCHEME.test(href.trim()) ? href : '#';
+        };
+        renderer.link = function(token) {
+          if (token && typeof token === 'object') { token = Object.assign({}, token, { href: safeHref(token.href) }); }
+          return _origLink(token);
+        };
+        renderer.image = function(token) {
+          if (token && typeof token === 'object') { token = Object.assign({}, token, { href: safeHref(token.href) }); }
+          return _origImage(token);
+        };
         setMarkup(window.marked.parse(markdownContent, { renderer: renderer }));
       })();
     }
   }, [markdownContent, isMarkdown]);
 
+  // Click-outside handler to close the methods dropdown
+  useEffect(function() {
+    if (!methodsOpen) return;
+    function handleClickOutside(e) {
+      var btn = methodsBtnRef.current;
+      // Close if click is not on the button (the dropdown uses onMouseDown with preventDefault)
+      if (btn && !btn.contains(e.target)) {
+        setMethodsOpen(false);
+      }
+    }
+    document.addEventListener('mousedown', handleClickOutside);
+    return function() { document.removeEventListener('mousedown', handleClickOutside); };
+  }, [methodsOpen]);
+
+  // Parse all method definitions from the current Monaco model
+  function parseRubyMethods(model) {
+    var methods = [];
+    var lineCount = model.getLineCount();
+    var DEF_RE = /^\s*def\s+(self\.)?([a-zA-Z_][a-zA-Z0-9_?!=]*)/;
+    for (var i = 1; i <= lineCount; i++) {
+      var line = model.getLineContent(i);
+      var m = DEF_RE.exec(line);
+      if (m) {
+        var selfPrefix = m[1] ? 'self.' : '';
+        methods.push({ line: i, name: selfPrefix + m[2] });
+      }
+    }
+    return methods;
+  }
+
   if (tab.fileNotFound) {
     return React.createElement(
       'div',
@@ -1192,11 +1344,10 @@ var EditorPanel = function EditorPanel(_ref) {
   }
 
   if (isImage) {
-    var basePath = (window.MBEDITOR_BASE_PATH || '/mbeditor').replace(/\/$/, '');
     return React.createElement(
       'div',
       { className: 'monaco-container', style: { display: 'flex', alignItems: 'center', justifyContent: 'center', background: '#1e1e1e' } },
-      React.createElement('img', { src: basePath + '/raw?path=' + encodeURIComponent(tab.path), style: { maxWidth: '90%', maxHeight: '90%', objectFit: 'contain' }, alt: tab.name })
+      React.createElement('img', { src: window.mbeditorBasePath() + '/raw?path=' + encodeURIComponent(tab.path), style: { maxWidth: '90%', maxHeight: '90%', objectFit: 'contain' }, alt: tab.name })
     );
   }
 
@@ -1241,6 +1392,28 @@ var EditorPanel = function EditorPanel(_ref) {
         React.createElement('i', { className: 'fas fa-history', style: { marginRight: editorPrefs.toolbarIconOnly ? 0 : '5px', flexShrink: 0 } }),
         !editorPrefs.toolbarIconOnly && React.createElement('span', { className: 'ide-toolbar-label' }, 'History')
       ),
+      isRubyFile && React.createElement(
+        'button',
+        {
+          ref: methodsBtnRef,
+          className: 'ide-icon-btn' + (methodsOpen ? ' active' : ''),
+          onClick: function() {
+            var nextOpen = !methodsOpen;
+            if (nextOpen) {
+              var model = monacoRef.current && monacoRef.current.getModel();
+              setMethodsList(model ? parseRubyMethods(model) : []);
+              if (methodsBtnRef.current) {
+                var rect = methodsBtnRef.current.getBoundingClientRect();
+                setMethodsDropdownPos({ top: rect.bottom + 4, right: window.innerWidth - rect.right });
+              }
+            }
+            setMethodsOpen(nextOpen);
+          },
+          title: 'Jump to Method'
+        },
+        React.createElement('i', { className: 'fas fa-list-ul', style: { marginRight: editorPrefs.toolbarIconOnly ? 0 : '5px', flexShrink: 0 } }),
+        !editorPrefs.toolbarIconOnly && React.createElement('span', { className: 'ide-toolbar-label' }, 'Methods')
+      ),
       gitAvailable && React.createElement(
         'button',
         {
@@ -1265,6 +1438,35 @@ var EditorPanel = function EditorPanel(_ref) {
       )
     ),
     React.createElement('div', { ref: editorRef, className: 'monaco-container', style: { flex: 1, minHeight: 0 } }),
+    methodsOpen && methodsDropdownPos && React.createElement(
+      'div',
+      {
+        className: 'ide-methods-dropdown',
+        style: { position: 'fixed', top: methodsDropdownPos.top + 'px', right: methodsDropdownPos.right + 'px', left: 'auto', zIndex: 9900 }
+      },
+      methodsList.length === 0
+        ? React.createElement('div', { className: 'ide-methods-dropdown-empty' }, 'No methods found')
+        : methodsList.map(function(m) {
+            return React.createElement(
+              'div',
+              {
+                key: m.line,
+                className: 'ide-methods-dropdown-item',
+                onMouseDown: function(e) {
+                  e.preventDefault();
+                  setMethodsOpen(false);
+                  if (monacoRef.current) {
+                    monacoRef.current.revealLineInCenter(m.line);
+                    monacoRef.current.setPosition({ lineNumber: m.line, column: 1 });
+                    monacoRef.current.focus();
+                  }
+                }
+              },
+              React.createElement('span', { className: 'ide-methods-dropdown-line' }, m.line),
+              m.name
+            );
+          })
+    ),
     React.createElement('div', { ref: vimStatusRef, className: 'vim-statusbar', style: { display: editorPrefs.vimMode ? 'flex' : 'none', height: '22px', alignItems: 'center', padding: '0 10px', fontFamily: "'JetBrains Mono', 'Fira Code', Consolas, monospace", fontSize: '12px', background: 'var(--ide-statusbar-bg, #1e1e2e)', color: 'var(--ide-statusbar-fg, #9cdcfe)', borderTop: '1px solid var(--ide-border, #3e3e3e)', flexShrink: 0, userSelect: 'none', letterSpacing: '0.02em' } })
   );
 };

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

@@ -14,8 +14,19 @@ var GitPanel = function GitPanel(_ref) {
   var _s1 = useState(true);  var localExpanded  = _s1[0]; var setLocalExpanded  = _s1[1];
   var _s2 = useState(true);  var branchExpanded = _s2[0]; var setBranchExpanded = _s2[1];
   var _s3 = useState(true);  var historyExpanded= _s3[0]; var setHistoryExpanded= _s3[1];
-  // { [hash]: true|false }
-  var _s4 = useState({});    var expandedCommits = _s4[0]; var setExpandedCommits = _s4[1];
+
+  // { [hash]: true|false } — persisted to localStorage keyed by root path so
+  // users don't need to re-expand commits on every page load.
+  var _lsKey = 'mbeditor_expanded_commits_' + (window.MBEDITOR_BASE_PATH || '');
+  var _lsInitial = (function() {
+    try { return JSON.parse(localStorage.getItem(_lsKey)) || {}; } catch(e) { return {}; }
+  })();
+  var _s4 = useState(_lsInitial); var expandedCommits = _s4[0]; var setExpandedCommits = _s4[1];
+
+  // Persist expandedCommits whenever it changes.
+  useEffect(function() {
+    try { localStorage.setItem(_lsKey, JSON.stringify(expandedCommits)); } catch(e) {}
+  }, [expandedCommits]);
   // { [hash]: { loading, files: [{status,path}], error } }
   var _s5 = useState({});    var commitFiles = _s5[0]; var setCommitFiles = _s5[1];
   var _s6 = useState(false); var refreshing = _s6[0]; var setRefreshing = _s6[1];
@@ -55,8 +66,7 @@ var GitPanel = function GitPanel(_ref) {
     setRedmineLoading(true);
     setRedmineIssue(null);
     setRedmineError(null);
-    var basePath = (window.MBEDITOR_BASE_PATH || '/mbeditor').replace(/\/$/, '');
-    axios.get(basePath + '/redmine/issue/' + redmineTicketId)
+    axios.get(window.mbeditorBasePath() + '/redmine/issue/' + redmineTicketId)
       .then(function (res) {
         setRedmineIssue(res.data);
         setRedmineLoading(false);