mbeditor 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a73400b5400313c994fbd40ebae5000cc776f07eebeb9790380a622a193ba73
-  data.tar.gz: bdd3a1d8825e5ff23eef4fab724a33e3f48a0ab8ce3be316652c822f378ceffa
+  metadata.gz: d378fdda8fc933a3c3d1f5b1fc5eb1622ca4ebee91db435378dd069827f708e2
+  data.tar.gz: 2c58b8db51c1df5e7f746af61550dc2ccf62ba33a515cb374c79931aefed1beb
 SHA512:
-  metadata.gz: af01460ee4ece9edf319dfd84da74e0a4d6016cdc96c73c8f7bd1a1a421de254b7abcf157ec81c182591e94dff9b44a437b274f48c02129c6099a67f89dc6af2
-  data.tar.gz: 84d1af77774b4676e193db1800ba33401df62893491a134de11c84e6e3f17f26d2a7cc8b19c99bbdc05bbb9af018f079017ba1466680b29a00a065173399c572
+  metadata.gz: 43753349cc14d328dbb45c4d6413cb0a56b9ac49979e7cd0bafe884de0889ede353decdd8552da38d872c278fa3c70162a1730df5827f45d0f629aa0d44a1f6f
+  data.tar.gz: 3547eec20751a3c7279765e79429dda30398dfd6aa64c7b70d7e2f70cda6e8de6d9ae8c30a0c671a9750dcce1422d115d2b42f1a3d35b6679e81d795ba134c3e

data/CHANGELOG.md

@@ -5,6 +5,19 @@ 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

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/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;
 
@@ -514,6 +531,46 @@ var EditorPanel = function EditorPanel(_ref) {
       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);
@@ -644,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;
       }
@@ -1172,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) {
@@ -1204,6 +1284,36 @@ var EditorPanel = function EditorPanel(_ref) {
     }
   }, [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',
@@ -1282,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',
         {
@@ -1306,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/MbeditorApp.js

@@ -61,7 +61,8 @@ var DEFAULT_EDITOR_PREFS = {
   vimMode: false,
   fileTreeTypeahead: true,
   quickOpenShowFolders: false,
-  tabDisplayMode: 'scroll'
+  tabDisplayMode: 'scroll',
+  persistFindState: true
 };
 
 var SidebarActionButton = function SidebarActionButton(_ref) {
@@ -196,7 +197,25 @@ var MbeditorApp = function MbeditorApp() {
   var searchOffsetRef       = useRef(0);
   var searchLoadingMoreRef  = useRef(false);
 
+  var _useStateRx = useState(false);
+  var _useStateRx2 = _slicedToArray(_useStateRx, 2);
+  var searchUseRegex = _useStateRx2[0];
+  var setSearchUseRegex = _useStateRx2[1];
+
+  var _useStateMC = useState(false);
+  var _useStateMC2 = _slicedToArray(_useStateMC, 2);
+  var searchMatchCase = _useStateMC2[0];
+  var setSearchMatchCase = _useStateMC2[1];
+
+  var _useStateWW = useState(false);
+  var _useStateWW2 = _slicedToArray(_useStateWW, 2);
+  var searchWholeWord = _useStateWW2[0];
+  var setSearchWholeWord = _useStateWW2[1];
+
   var searchQueryRef = useRef('');
+  var searchUseRegexRef = useRef(false);
+  var searchMatchCaseRef = useRef(false);
+  var searchWholeWordRef = useRef(false);
   var searchResultsContainerRef = useRef(null);
 
   var _useState8 = useState("explorer");
@@ -665,6 +684,9 @@ var MbeditorApp = function MbeditorApp() {
       if (workspace && typeof workspace.testAvailable === 'boolean') {
         setTestAvailable(workspace.testAvailable);
       }
+      if (workspace && typeof workspace.actionCableEnabled === 'boolean') {
+        WebSocketService.connect(workspace.actionCableEnabled);
+      }
     });
 
     // Helper: load tab content for a set of panes and restore them into EditorStore
@@ -990,11 +1012,33 @@ var MbeditorApp = function MbeditorApp() {
     if (offers.length > 0) setDraftRestoreOffer(offers);
   }, [serverOnline]);
 
+  // WebSocket push — when the server broadcasts files_changed, refresh the tree
+  // and git status immediately (same work as the 10s poll below does).
+  useEffect(function () {
+    function handleFilesChanged() {
+      if (document.hidden) return;
+      GitService.fetchStatus()["catch"](function () {});
+      FileService.getTree().then(function (data) {
+        var newData = data || [];
+        setTreeData(function (prevData) {
+          if (JSON.stringify(newData) === JSON.stringify(prevData)) return prevData;
+          SearchService.buildIndex(newData);
+          return newData;
+        });
+      })["catch"](function () {});
+    }
+    WebSocketService.onFilesChanged(handleFilesChanged);
+    return function () { WebSocketService.offFilesChanged(handleFilesChanged); };
+  }, []);
+
   // 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.
   // Uses functional setTreeData to skip the re-render when nothing has changed.
   useEffect(function () {
     var intervalId = setInterval(function () {
       if (document.hidden) return;
+      if (WebSocketService.isConnected()) return; // WebSocket is handling refreshes
       // Refresh tree and check for git branch changes (to trigger per-branch tab state swap)
       GitService.fetchStatus()["catch"](function () {});
       FileService.getTree().then(function (data) {
@@ -1198,6 +1242,12 @@ var MbeditorApp = function MbeditorApp() {
   var activeFileCommit = _useState32[0];
   var setActiveFileCommit = _useState32[1];
 
+  // EOL indicator — tracks current line-ending style of the active file
+  var _useState31e = useState(null);
+  var _useState31e2 = _slicedToArray(_useState31e, 2);
+  var activeEOL = _useState31e2[0];
+  var setActiveEOL = _useState31e2[1];
+
   useEffect(function () {
     if (!gitAvailable || !activeTab || activeTab.isDiff || activeTab.isCombinedDiff || activeTab.isCommitGraph || !activeTab.path || activeTab.path.indexOf('diff://') === 0 || activeTab.path.indexOf('combined-diff://') === 0) {
       setActiveFileCommit(null);
@@ -1216,6 +1266,22 @@ var MbeditorApp = function MbeditorApp() {
     });
   }, [activeTab ? activeTab.id : null, gitAvailable]);
 
+  // Update EOL indicator whenever active tab or its content changes
+  useEffect(function () {
+    if (!activeTab || typeof activeTab.content !== 'string' ||
+        activeTab.isDiff || activeTab.isCombinedDiff || activeTab.isCommitGraph || activeTab.isPreview) {
+      setActiveEOL(null);
+      return;
+    }
+    if (activeTab.content.indexOf('\r\n') !== -1) {
+      setActiveEOL('CRLF');
+    } else if (activeTab.content.indexOf('\r') !== -1) {
+      setActiveEOL('CR');
+    } else {
+      setActiveEOL('LF');
+    }
+  }, [activeTab ? activeTab.id : null, activeTab ? activeTab.content : null]);
+
   useEffect(function () {
     if (!activeTab || typeof activeTab.content !== 'string') return;
     if (activeTab.isDiff || activeTab.isCombinedDiff || activeTab.isCommitGraph) return;
@@ -1381,6 +1447,21 @@ var MbeditorApp = function MbeditorApp() {
     clearDragState();
   };
 
+  var handleChangeEOL = function handleChangeEOL(newEOL) {
+    var ed = window.__mbeditorActiveEditor;
+    if (!ed || !window.monaco) return;
+    var model = ed.getModel();
+    if (!model || !activeTab || !focusedPane) return;
+    var seq = newEOL === 'CRLF'
+      ? window.monaco.editor.EndOfLineSequence.CRLF
+      : window.monaco.editor.EndOfLineSequence.LF;
+    model.setEOL(seq);
+    var newContent = model.getValue();
+    TabManager.markDirty(focusedPane.id, activeTab.path, newContent);
+    setActiveEOL(newEOL);
+    EditorStore.setStatus('Line endings changed to ' + newEOL, 'info');
+  };
+
   var handleFormat = function handleFormat() {
     if (!activeTab) return;
 
@@ -1578,7 +1659,7 @@ var MbeditorApp = function MbeditorApp() {
     searchQueryRef.current = q;
     EditorStore.setState({ searchResults: [], searchHasMore: false });
     EditorStore.setStatus("Searching project...", "info");
-    SearchService.projectSearch(q, 0, SearchService.PAGE_SIZE).then(function (res) {
+    SearchService.projectSearch(q, 0, SearchService.PAGE_SIZE, { regex: searchUseRegexRef.current, matchCase: searchMatchCaseRef.current, wholeWord: searchWholeWordRef.current }).then(function (res) {
       if (searchRequestIdRef.current !== requestId) return;
       var hasMore = !!(res && res.hasMore);
       setSearchHasMore(hasMore); searchHasMoreRef.current = hasMore;
@@ -1596,7 +1677,7 @@ var MbeditorApp = function MbeditorApp() {
     if (!q || searchLoadingMoreRef.current || !searchHasMoreRef.current) return;
     searchLoadingMoreRef.current = true;
     var offset = searchOffsetRef.current;
-    SearchService.projectSearch(q, offset, SearchService.PAGE_SIZE).then(function(res) {
+    SearchService.projectSearch(q, offset, SearchService.PAGE_SIZE, { regex: searchUseRegexRef.current, matchCase: searchMatchCaseRef.current, wholeWord: searchWholeWordRef.current }).then(function(res) {
       if (searchQueryRef.current !== q) { searchLoadingMoreRef.current = false; return; }
       var hasMore = !!(res && res.hasMore);
       searchHasMoreRef.current = hasMore;
@@ -1615,6 +1696,33 @@ var MbeditorApp = function MbeditorApp() {
     _debouncedSearch(val);
   };
 
+  var handleSearchRegexToggle = function handleSearchRegexToggle() {
+    var next = !searchUseRegexRef.current;
+    searchUseRegexRef.current = next;
+    setSearchUseRegex(next);
+    if (searchQueryRef.current) {
+      _debouncedSearch(searchQueryRef.current);
+    }
+  };
+
+  var handleSearchMatchCaseToggle = function handleSearchMatchCaseToggle() {
+    var next = !searchMatchCaseRef.current;
+    searchMatchCaseRef.current = next;
+    setSearchMatchCase(next);
+    if (searchQueryRef.current) {
+      _debouncedSearch(searchQueryRef.current);
+    }
+  };
+
+  var handleSearchWholeWordToggle = function handleSearchWholeWordToggle() {
+    var next = !searchWholeWordRef.current;
+    searchWholeWordRef.current = next;
+    setSearchWholeWord(next);
+    if (searchQueryRef.current) {
+      _debouncedSearch(searchQueryRef.current);
+    }
+  };
+
   var clearSearch = function clearSearch() {
     searchRequestIdRef.current += 1;
     if (_debouncedSearch.cancel) _debouncedSearch.cancel();
@@ -2564,32 +2672,57 @@ var MbeditorApp = function MbeditorApp() {
           { className: "search-panel" },
           React.createElement(
             "div",
-            { className: "search-input-wrap" },
+            { className: "search-input-shell" },
+            React.createElement("input", {
+              className: "search-input",
+              placeholder: "Find in files…",
+              value: searchQuery,
+              onChange: handleSearchChange
+            }),
             React.createElement(
               "div",
-              { className: "search-input-shell" },
-              React.createElement("input", {
-                className: "search-input",
-                placeholder: "Find in files…",
-                value: searchQuery,
-                onChange: handleSearchChange
-              }),
+              { className: "search-input-adornments" },
+              React.createElement(
+                "button",
+                {
+                  type: "button",
+                  className: "search-adornment-btn" + (searchMatchCase ? " active" : ""),
+                  onClick: handleSearchMatchCaseToggle,
+                  title: "Match Case"
+                },
+                React.createElement("i", { className: "codicon codicon-case-sensitive" })
+              ),
+              React.createElement(
+                "button",
+                {
+                  type: "button",
+                  className: "search-adornment-btn" + (searchWholeWord ? " active" : ""),
+                  onClick: handleSearchWholeWordToggle,
+                  title: "Match Whole Word"
+                },
+                React.createElement("i", { className: "codicon codicon-whole-word" })
+              ),
+              React.createElement(
+                "button",
+                {
+                  type: "button",
+                  className: "search-adornment-btn" + (searchUseRegex ? " active" : ""),
+                  onClick: handleSearchRegexToggle,
+                  title: "Use Regular Expression"
+                },
+                React.createElement("i", { className: "codicon codicon-regex" })
+              ),
               searchQuery && React.createElement(
                 "button",
                 {
                   type: "button",
-                  className: "search-clear-btn",
+                  className: "search-adornment-btn search-adornment-clear",
                   onClick: clearSearch,
                   title: "Clear search",
                   "aria-label": "Clear search"
                 },
                 React.createElement("i", { className: "fas fa-times" })
               )
-            ),
-            React.createElement(
-              "button",
-              { type: "submit", className: "search-btn", disabled: searchLoading, title: searchLoading ? "Searching..." : "Search" },
-              React.createElement("i", { className: searchLoading ? "fas fa-spinner fa-spin" : "fas fa-search" })
             )
           ),
           (function() {
@@ -2608,38 +2741,47 @@ var MbeditorApp = function MbeditorApp() {
                   ? (total + (searchHasMore ? '+' : '') + " result" + (total !== 1 ? "s" : ""))
                   : "No results"
               ),
-              hasAny && React.createElement(
+              React.createElement(
                 "div",
-                {
-                  className: "search-results",
-                  ref: searchResultsContainerRef,
-                  onScroll: handleSearchResultsScroll
-                },
-                allResults.map(function(res, i) {
-                  var fileName = res.file.split('/').pop();
-                  return React.createElement(
-                    "div",
-                    {
-                      key: i,
-                      className: "search-result-item",
-                      onClick: (function(r) { return function() { handleSelectFile(r.file, r.file.split('/').pop(), r.line); }; })(res)
-                    },
-                    React.createElement("i", { className: (window.getFileIcon ? window.getFileIcon(fileName) : 'far fa-file-code') + " search-result-icon" }),
-                    React.createElement(
-                      "div", { className: "search-result-body" },
+                { className: "search-results-area" },
+                hasAny && React.createElement(
+                  "div",
+                  {
+                    className: "search-results" + (searchLoading ? " search-results-blurred" : ""),
+                    ref: searchResultsContainerRef,
+                    onScroll: handleSearchResultsScroll
+                  },
+                  allResults.map(function(res, i) {
+                    var fileName = res.file.split('/').pop();
+                    return React.createElement(
+                      "div",
+                      {
+                        key: i,
+                        className: "search-result-item",
+                        onClick: (function(r) { return function() { handleSelectFile(r.file, r.file.split('/').pop(), r.line); }; })(res)
+                      },
+                      React.createElement("i", { className: (window.getFileIcon ? window.getFileIcon(fileName) : 'far fa-file-code') + " search-result-icon" }),
                       React.createElement(
-                        "div", { className: "search-result-file" },
-                        fileName,
-                        React.createElement("span", { className: "search-result-line-num" }, " ", res.file, ":", res.line)
-                      ),
-                      React.createElement("div", { className: "search-result-text" }, res.text)
-                    )
-                  );
-                }),
-                searchHasMore && React.createElement(
-                  "div", { className: "search-loading-more" },
-                  React.createElement("i", { className: "fas fa-spinner fa-spin" }),
-                  " Loading more\u2026"
+                        "div", { className: "search-result-body" },
+                        React.createElement(
+                          "div", { className: "search-result-file" },
+                          fileName,
+                          React.createElement("span", { className: "search-result-line-num" }, " ", res.file, ":", res.line)
+                        ),
+                        React.createElement("div", { className: "search-result-text" }, res.text)
+                      )
+                    );
+                  }),
+                  searchHasMore && React.createElement(
+                    "div", { className: "search-loading-more" },
+                    React.createElement("i", { className: "fas fa-spinner fa-spin" }),
+                    " Loading more\u2026"
+                  )
+                ),
+                searchLoading && React.createElement(
+                  "div",
+                  { className: "search-loading-overlay" },
+                  React.createElement("div", { className: "search-loading-spinner" })
                 )
               )
             );
@@ -3228,6 +3370,17 @@ var MbeditorApp = function MbeditorApp() {
                       })
                     ),
 
+                    React.createElement(
+                      'label', { className: 'ide-settings-row ide-settings-row-check' },
+                      React.createElement('span', { className: 'ide-settings-label' }, 'Persist find state across files'),
+                      React.createElement('input', {
+                        type: 'checkbox',
+                        className: 'ide-settings-checkbox',
+                        checked: editorPrefs.persistFindState !== false,
+                        onChange: function(e) { var v = e.target.checked; setEditorPrefs(function(p) { return Object.assign({}, p, { persistFindState: v }); }); }
+                      })
+                    ),
+
                     /* ── RuboCop ─────────────────────────────────── */
                     React.createElement('div', { className: 'ide-settings-section-header' }, 'RuboCop'),
                     React.createElement(
@@ -3538,6 +3691,16 @@ var MbeditorApp = function MbeditorApp() {
         { className: "statusbar-msg " + state.statusMessage.kind },
         state.statusMessage.text
       ),
+      activeEOL && React.createElement(
+        "button",
+        {
+          type: "button",
+          className: "statusbar-btn statusbar-eol-btn",
+          title: "Line endings: " + activeEOL + " — click to change",
+          onClick: function() { handleChangeEOL(activeEOL === 'CRLF' ? 'LF' : 'CRLF'); }
+        },
+        activeEOL
+      ),
       React.createElement(
         "div",
         { className: "statusbar-version" },

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

@@ -132,10 +132,12 @@ var QuickOpenDialog = function QuickOpenDialog(_ref) {
     // JS sort is stable in modern engines so MiniSearch relevance score order is the tiebreaker
     // when match relevance is equal.
     filtered.sort(function(a, b) {
+      var aRelevance = getMatchRelevance(a, query);
+      var bRelevance = getMatchRelevance(b, query);
+      if (aRelevance !== bRelevance) return aRelevance - bRelevance;
       var aPriority = getFilePriority(a.path) + (a.type === 'dir' ? 100 : 0);
       var bPriority = getFilePriority(b.path) + (b.type === 'dir' ? 100 : 0);
-      if (aPriority !== bPriority) return aPriority - bPriority;
-      return getMatchRelevance(a, query) - getMatchRelevance(b, query);
+      return aPriority - bPriority;
     });
     setResults(filtered.slice(0, 200));
     setSelectedIndex(0);