mbeditor 0.3.8 → 0.4.0

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

@@ -76,6 +76,35 @@ var QuickOpenDialog = function QuickOpenDialog(_ref) {
     if (inputRef.current) inputRef.current.focus();
   };
 
+  // Priority tier for a file path: lower = shown first.
+  // Order: controller > model > helper > concern > view > job > other > noise
+  function getFilePriority(path) {
+    var p = (path || '').toLowerCase();
+    if (p.indexOf('/controllers/') >= 0) return 1;
+    if (p.indexOf('/models/')      >= 0) return 2;
+    if (p.indexOf('/helpers/')     >= 0) return 3;
+    if (p.indexOf('/concerns/')    >= 0) return 4;
+    if (p.indexOf('/views/')       >= 0) return 5;
+    if (p.indexOf('/jobs/')        >= 0) return 6;
+    // Deprioritise: migrations, schema, compiled assets, vendor, lock files
+    if (p.indexOf('/migrate/')  >= 0 || p.indexOf('schema.rb') >= 0) return 90;
+    if (p.indexOf('/public/')   >= 0 || p.indexOf('/vendor/')   >= 0) return 91;
+    if (p.slice(-7)  === '.min.js' || p.slice(-8) === '.min.css' ||
+        p.slice(-4)  === '.map'    || p.slice(-5) === '.lock')        return 92;
+    return 50;
+  }
+
+  // Match relevance within a priority tier: exact basename > prefix > substring > other.
+  function getMatchRelevance(result, q) {
+    if (!q) return 3;
+    var name = (result.name || (result.path || '').split('/').pop() || '').toLowerCase();
+    var lq = q.toLowerCase();
+    if (name === lq)            return 0;
+    if (name.slice(0, lq.length) === lq) return 1;
+    if (name.indexOf(lq) >= 0)  return 2;
+    return 3;
+  }
+
   var getQuickOpenIcon = function getQuickOpenIcon(path, name, type) {
     if (type === 'dir') {
       return React.createElement('i', { className: 'fas fa-folder quick-open-result-icon quick-open-folder-icon', 'aria-hidden': 'true' });
@@ -99,7 +128,16 @@ var QuickOpenDialog = function QuickOpenDialog(_ref) {
     var res = SearchService.searchFiles(query);
     // Filter by type: always include files; include dirs only when showFolders is on
     var filtered = showFolders ? res : res.filter(function(r) { return r.type !== 'dir'; });
-    setResults(filtered.slice(0, 20));
+    // Sort: files always beat dirs; within the same tier exact basename > prefix > substring > other.
+    // 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 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);
+    });
+    setResults(filtered.slice(0, 200));
     setSelectedIndex(0);
   }, [query, showFolders]);
 

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

@@ -18,6 +18,7 @@ var TabBar = function TabBar(_ref) {
   var onHardenTab = _ref.onHardenTab;
   var onShowHistory = _ref.onShowHistory;
   var onRevealInExplorer = _ref.onRevealInExplorer;
+  var tabDisplayMode = _ref.tabDisplayMode || 'scroll';
 
   var containerRef = useRef(null);
 
@@ -87,8 +88,8 @@ var TabBar = function TabBar(_ref) {
     null,
     React.createElement(
     'div',
-    { className: 'tab-bar', ref: containerRef, onWheel: function (e) {
-        if (containerRef.current) {
+    { className: 'tab-bar tab-bar-' + tabDisplayMode, ref: containerRef, onWheel: function (e) {
+        if (tabDisplayMode !== 'wrap' && containerRef.current) {
           containerRef.current.scrollLeft += e.deltaY;
         }
       } },

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

@@ -20,6 +20,7 @@ var EditorStore = (function () {
   };
 
   var _listeners = [];
+  var _statusTimer = null;
 
   function getState() { return _state; }
 
@@ -42,6 +43,9 @@ var EditorStore = (function () {
   // Subscribe to changes in a specific subset of state keys.
   // The listener is only called when at least one of the watched keys changes
   // by reference (===), preventing unnecessary re-renders for unrelated updates.
+  // IMPORTANT: all state updates MUST produce a new object reference for any
+  // nested value (use Object.assign / spread — never mutate in place), otherwise
+  // subscribeToSlice will not detect the change.
   function subscribeToSlice(keys, fn) {
     var prev = {};
     keys.forEach(function(k) { prev[k] = _state[k]; });
@@ -57,9 +61,13 @@ var EditorStore = (function () {
   function setStatus(text, kind) {
     kind = kind || "info";
     setState({ statusMessage: { text: text, kind: kind } });
-    // Auto-clear after 4s for non-error messages
+    if (_statusTimer !== null) {
+      clearTimeout(_statusTimer);
+      _statusTimer = null;
+    }
     if (kind !== "error") {
-      setTimeout(function () {
+      _statusTimer = setTimeout(function () {
+        _statusTimer = null;
         if (_state.statusMessage.text === text) {
           setState({ statusMessage: { text: "", kind: "info" } });
         }

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

@@ -2,6 +2,10 @@
 // The server uses this header to silence editor logs and guard non-GET requests.
 axios.defaults.headers.common['X-Mbeditor-Client'] = '1';
 
+// Cap all API calls at 30 s so a hung Rails server never blocks the UI forever.
+// The ping endpoint overrides this with a tighter 4 s timeout per-request.
+axios.defaults.timeout = 30000;
+
 // Surface pending-migration errors as a dismissible banner instead of silently failing.
 axios.interceptors.response.use(null, function(error) {
   if (error.response && error.response.data && error.response.data.pending_migration_error) {
@@ -28,16 +32,12 @@ axios.interceptors.response.use(null, function(error) {
 });
 
 var FileService = (function () {
-  function basePath() {
-    return (window.MBEDITOR_BASE_PATH || '/mbeditor').replace(/\/$/, '');
-  }
-
   function getWorkspace() {
-    return axios.get(basePath() + '/workspace').then(function(res) { return res.data; });
+    return axios.get(window.mbeditorBasePath() + '/workspace').then(function(res) { return res.data; });
   }
 
   function getTree() {
-    return axios.get(basePath() + '/files').then(function(res) { return res.data; });
+    return axios.get(window.mbeditorBasePath() + '/files').then(function(res) { return res.data; });
   }
 
   function getFile(path, options) {
@@ -45,72 +45,72 @@ var FileService = (function () {
     if (options && options.allowMissing) {
       params.allow_missing = '1';
     }
-    return axios.get(basePath() + '/file', { params: params }).then(function(res) { return res.data; });
+    return axios.get(window.mbeditorBasePath() + '/file', { params: params }).then(function(res) { return res.data; });
   }
 
   function saveFile(path, code) {
-    return axios.post(basePath() + '/file', { path: path, code: code }).then(function(res) { return res.data; });
+    return axios.post(window.mbeditorBasePath() + '/file', { path: path, code: code }).then(function(res) { return res.data; });
   }
 
   function createFile(path, code) {
-    return axios.post(basePath() + '/create_file', { path: path, code: code || '' }).then(function(res) { return res.data; });
+    return axios.post(window.mbeditorBasePath() + '/create_file', { path: path, code: code || '' }).then(function(res) { return res.data; });
   }
 
   function createDir(path) {
-    return axios.post(basePath() + '/create_dir', { path: path }).then(function(res) { return res.data; });
+    return axios.post(window.mbeditorBasePath() + '/create_dir', { path: path }).then(function(res) { return res.data; });
   }
 
   function renamePath(path, newPath) {
-    return axios.patch(basePath() + '/rename', { path: path, new_path: newPath }).then(function(res) { return res.data; });
+    return axios.patch(window.mbeditorBasePath() + '/rename', { path: path, new_path: newPath }).then(function(res) { return res.data; });
   }
 
   function deletePath(path) {
-    return axios.delete(basePath() + '/delete', { data: { path: path } }).then(function(res) { return res.data; });
+    return axios.delete(window.mbeditorBasePath() + '/delete', { data: { path: path } }).then(function(res) { return res.data; });
   }
 
   function lintFile(path, code) {
-    return axios.post(basePath() + '/lint', { path: path, code: code }).then(function(res) { return res.data; });
+    return axios.post(window.mbeditorBasePath() + '/lint', { path: path, code: code }).then(function(res) { return res.data; });
   }
 
   function quickFixOffense(path, code, copName) {
-    return axios.post(basePath() + '/quick_fix', { path: path, code: code, cop_name: copName }).then(function(res) { return res.data; });
+    return axios.post(window.mbeditorBasePath() + '/quick_fix', { path: path, code: code, cop_name: copName }).then(function(res) { return res.data; });
   }
 
   function formatFile(path, code) {
-    return axios.post(basePath() + '/format', { path: path, code: code }).then(function(res) { return res.data; });
+    return axios.post(window.mbeditorBasePath() + '/format', { path: path, code: code }).then(function(res) { return res.data; });
   }
 
   function runTests(path) {
-    return axios.post(basePath() + '/test', { path: path }).then(function(res) { return res.data; });
+    return axios.post(window.mbeditorBasePath() + '/test', { path: path }).then(function(res) { return res.data; });
   }
 
   function ping() {
-    return axios.get(basePath() + '/ping', { timeout: 4000 }).then(function(res) { return res.data; });
+    return axios.get(window.mbeditorBasePath() + '/ping', { timeout: 4000 }).then(function(res) { return res.data; });
   }
 
   function getState() {
-    return axios.get(basePath() + '/state').then(function(res) { return res.data; });
+    return axios.get(window.mbeditorBasePath() + '/state').then(function(res) { return res.data; });
   }
 
   function saveState(state) {
-    return axios.post(basePath() + '/state', { state: state }).then(function(res) { return res.data; });
+    return axios.post(window.mbeditorBasePath() + '/state', { state: state }).then(function(res) { return res.data; });
   }
 
   function getBranchState(branch) {
-    return axios.get(basePath() + '/branch_state', { params: { branch: branch } }).then(function(res) { return res.data; });
+    return axios.get(window.mbeditorBasePath() + '/branch_state', { params: { branch: branch } }).then(function(res) { return res.data; });
   }
 
   function saveBranchState(branch, state) {
-    return axios.post(basePath() + '/branch_state', { branch: branch, state: state }).then(function(res) { return res.data; });
+    return axios.post(window.mbeditorBasePath() + '/branch_state', { branch: branch, state: state }).then(function(res) { return res.data; });
   }
 
   function pruneBranchStates() {
-    return axios.post(basePath() + '/prune_branch_states').then(function(res) { return res.data; });
+    return axios.post(window.mbeditorBasePath() + '/prune_branch_states').then(function(res) { return res.data; });
   }
 
   function getDefinition(symbol, language, extraOptions) {
     var config = Object.assign({ params: { symbol: symbol, language: language }, timeout: 5000 }, extraOptions || {});
-    return axios.get(basePath() + '/definition', config).then(function(res) { return res.data; });
+    return axios.get(window.mbeditorBasePath() + '/definition', config).then(function(res) { return res.data; });
   }
 
   return {

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

@@ -1,8 +1,4 @@
 var GitService = (function () {
-  function basePath() {
-    return (window.MBEDITOR_BASE_PATH || '/mbeditor').replace(/\/$/, '');
-  }
-
   function applyGitInfo(data) {
     var files = data.workingTree || data.files || [];
     EditorStore.setState({
@@ -14,7 +10,7 @@ var GitService = (function () {
   }
 
   function fetchInfo() {
-    return axios.get(basePath() + '/git_info')
+    return axios.get(window.mbeditorBasePath() + '/git_info')
       .then(function(res) {
         if (res.data && res.data.ok) {
           applyGitInfo(res.data);
@@ -33,7 +29,7 @@ var GitService = (function () {
     return fetchInfo().then(function(data) {
       if (data && data.ok) return data;
 
-      return axios.get(basePath() + '/git_status')
+      return axios.get(window.mbeditorBasePath() + '/git_status')
       .then(function(res) {
         if (res.data.ok) {
           EditorStore.setState({
@@ -63,31 +59,31 @@ var GitService = (function () {
     if (baseSha) query += '&base=' + encodeURIComponent(baseSha);
     if (headSha) query += '&head=' + encodeURIComponent(headSha);
     
-    return axios.get(basePath() + '/git/diff' + query).then(function(res) {
+    return axios.get(window.mbeditorBasePath() + '/git/diff' + query).then(function(res) {
       return res.data;
     });
   }
 
   function fetchBlame(path) {
-    return axios.get(basePath() + '/git/blame?file=' + encodeURIComponent(path)).then(function(res) {
+    return axios.get(window.mbeditorBasePath() + '/git/blame?file=' + encodeURIComponent(path)).then(function(res) {
       return res.data;
     });
   }
 
   function fetchFileHistory(path) {
-    return axios.get(basePath() + '/git/file_history?file=' + encodeURIComponent(path)).then(function(res) {
+    return axios.get(window.mbeditorBasePath() + '/git/file_history?file=' + encodeURIComponent(path)).then(function(res) {
       return res.data;
     });
   }
 
   function fetchCommitGraph() {
-    return axios.get(basePath() + '/git/commit_graph').then(function(res) {
+    return axios.get(window.mbeditorBasePath() + '/git/commit_graph').then(function(res) {
       return res.data;
     });
   }
 
   function fetchCommitDetail(sha) {
-    return axios.get(basePath() + '/git/commit_detail?sha=' + encodeURIComponent(sha)).then(function(res) {
+    return axios.get(window.mbeditorBasePath() + '/git/commit_detail?sha=' + encodeURIComponent(sha)).then(function(res) {
       return res.data;
     });
   }

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

@@ -1,15 +1,14 @@
 var SearchService = (function () {
   var SEARCH_PAGE_SIZE = 50;
 
-  function basePath() {
-    return (window.MBEDITOR_BASE_PATH || '/mbeditor').replace(/\/$/, '');
-  }
-
   var _miniSearch = new MiniSearch({
     fields: ['path', 'name'],           // indexed fields
     storeFields: ['path', 'name', 'type'] // returned fields (type: 'file'|'dir')
   });
 
+  // Flat doc list kept in sync with _miniSearch so we can do substring lookups.
+  var _allDocs = [];
+
   function buildIndex(treeData) {
     // Capture the tree data immediately so a subsequent refresh doesn't
     // clobber us before the idle callback fires.
@@ -32,31 +31,46 @@ var SearchService = (function () {
       }
 
       traverse(snapshot);
+      _allDocs = docs.slice();
       _miniSearch.removeAll();
       _miniSearch.addAll(docs);
     });
   }
 
   // Search files (and optionally folders) in the local MiniSearch index.
-  // Returns raw MiniSearch results; caller can filter by .type.
+  // Also performs a case-insensitive substring scan so that partial-word
+  // queries like "project" reliably find "projects_controller.rb".
+  // Returns merged results; MiniSearch scored entries come first.
   function searchFiles(query) {
     if (!query) return [];
-    return _miniSearch.search(query, { prefix: true, fuzzy: 0.2 });
+    var msResults = _miniSearch.search(query, { prefix: true, fuzzy: 0.2 });
+    // Substring fallback — catch anything MiniSearch missed
+    var q = query.toLowerCase();
+    var msIds = new Set(msResults.map(function(r) { return r.id; }));
+    var subResults = _allDocs.filter(function(doc) {
+      if (msIds.has(doc.id)) return false;
+      return doc.path.toLowerCase().indexOf(q) >= 0 || doc.name.toLowerCase().indexOf(q) >= 0;
+    }).map(function(doc) {
+      return { id: doc.id, path: doc.path, name: doc.name, type: doc.type, score: 0 };
+    });
+    return msResults.concat(subResults);
   }
 
   // Fetch one page of project-wide full-text search results.
   // offset=0 replaces the EditorStore results list; offset>0 appends.
+  // The server includes total_count only on offset=0 (fast rg --count pass).
   function projectSearch(query, offset, limit) {
-    if (!query) return Promise.resolve({ results: [], hasMore: false });
+    if (!query) return Promise.resolve({ results: [], hasMore: false, totalCount: 0 });
     var off = (typeof offset === 'number') ? offset : 0;
     var lim = (typeof limit  === 'number') ? limit  : SEARCH_PAGE_SIZE;
 
-    return axios.get(basePath() + '/search', {
+    return axios.get(window.mbeditorBasePath() + '/search', {
       params: { q: query, offset: off, limit: lim }
     }).then(function(res) {
         var data = res.data;
-        var results = Array.isArray(data) ? data : (data && data.results || []);
-        var hasMore = !Array.isArray(data) && !!(data && data.has_more);
+        var results    = Array.isArray(data) ? data : (data && data.results || []);
+        var hasMore    = !Array.isArray(data) && !!(data && data.has_more);
+        var totalCount = (data && data.total_count != null) ? data.total_count : null;
 
         if (off === 0) {
           EditorStore.setState({ searchResults: results, searchHasMore: hasMore });
@@ -64,18 +78,37 @@ var SearchService = (function () {
           var prev = EditorStore.getState().searchResults || [];
           EditorStore.setState({ searchResults: prev.concat(results), searchHasMore: hasMore });
         }
-        return { results: results, hasMore: hasMore };
+        return { results: results, hasMore: hasMore, totalCount: totalCount };
       })
       .catch(function(err) {
         EditorStore.setStatus("Search failed: " + err.message, "error");
-        return { results: [], hasMore: false };
+        return { results: [], hasMore: false, totalCount: null };
       });
   }
 
+  // Fetch a specific page by index without touching EditorStore.
+  // Used by the random-access virtual scroll loader.
+  function fetchPage(query, pageIndex) {
+    if (!query) return Promise.resolve({ results: [], hasMore: false });
+    var offset = pageIndex * SEARCH_PAGE_SIZE;
+    return axios.get(basePath() + '/search', {
+      params: { q: query, offset: offset, limit: SEARCH_PAGE_SIZE }
+    }).then(function(res) {
+      var data = res.data;
+      var results = Array.isArray(data) ? data : (data && data.results || []);
+      var hasMore = !Array.isArray(data) && !!(data && data.has_more);
+      return { results: results, hasMore: hasMore };
+    }).catch(function(err) {
+      EditorStore.setStatus("Search failed: " + err.message, "error");
+      return { results: [], hasMore: false };
+    });
+  }
+
   return {
     buildIndex: buildIndex,
     searchFiles: searchFiles,
     projectSearch: projectSearch,
+    fetchPage: fetchPage,
     PAGE_SIZE: SEARCH_PAGE_SIZE
   };
 })();

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

@@ -257,11 +257,11 @@ var TabManager = (function () {
     });
     EditorStore.setState({ panes: newPanes, focusedPaneId: paneId, activeTabId: tabId });
 
-    var basePath = (window.MBEDITOR_BASE_PATH || '/mbeditor').replace(/\/$/, '');
-    axios.get(basePath + '/git/combined_diff', { params: { scope: scope || 'local' } })
+    axios.get(window.mbeditorBasePath() + '/git/combined_diff', { params: { scope: scope || 'local' } })
       .then(function(res) {
+        var data = res.data;
         _updateTab(paneId, tabId, {
-          combinedDiffText: typeof res.data === 'string' ? res.data : '',
+          combinedDiffText: typeof data === 'string' ? data : (data && data.diff) || '',
           combinedDiffLoaded: true
         });
       })

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

@@ -327,6 +327,18 @@ html, body, #mbeditor-root {
 .tab-bar::-webkit-scrollbar { height: 3px; }
 .tab-bar::-webkit-scrollbar-thumb { background: var(--ide-hover-bg); }
 
+/* Wrap (multi-row) tab layout */
+.tab-bar.tab-bar-wrap {
+  flex-wrap: wrap;
+  overflow-x: hidden;
+  overflow-y: visible;
+  height: auto;
+}
+.tab-bar.tab-bar-wrap .tab-item {
+  flex-shrink: 1;
+  flex-grow: 0;
+}
+
 .tab-item {
   display: flex;
   align-items: center;
@@ -475,16 +487,23 @@ html, body, #mbeditor-root {
 .welcome-tips li { font-size: 12px; color: var(--ide-text-muted); }
 .welcome-tips li i { color: var(--ide-text-muted); width: 14px; text-align: center; }
 
-/* ── Search results meta ─────────────────────────────────── */
-.search-results-meta {
-  padding: 4px 8px 6px;
+/* ── Search results header (fixed count above scroll area) ── */
+.search-results-header {
+  flex-shrink: 0;
+  padding: 4px 10px 5px;
   font-size: 11px;
   color: var(--ide-text-muted);
   border-bottom: 1px solid var(--ide-panel-bg-alt);
-  margin-bottom: 4px;
+  user-select: none;
 }
-.search-results-capped { color: #f0a040; }
 .search-results-empty { padding: 12px 8px; font-size: 12px; color: var(--ide-text-muted); }
+.search-loading-more {
+  padding: 10px;
+  font-size: 11px;
+  color: var(--ide-text-muted);
+  text-align: center;
+  user-select: none;
+}
 
 /* ── Shortcut Help Drawer ────────────────────────────────── */
 .shelp-backdrop {
@@ -785,7 +804,7 @@ html, body, #mbeditor-root {
 
 .statusbar-msg {
   margin-left: auto;
-  color: color-mix(in srgb, var(--ide-accent-text) 80%, transparent);
+  color: var(--ide-accent-text);
   font-size: 11px;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -1676,6 +1695,70 @@ html, body, #mbeditor-root {
   to   { opacity: 1; transform: translateY(0); }
 }
 
+/* ── Draft restore dialog ───────────────────────────────────── */
+.ide-draft-restore-overlay {
+  position: fixed;
+  inset: 0;
+  background: rgba(0,0,0,0.55);
+  z-index: 10001;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.ide-draft-restore-dialog {
+  background: var(--ide-panel-bg-alt);
+  border: 1px solid var(--ide-border-input);
+  border-radius: 8px;
+  padding: 20px 24px;
+  min-width: 320px;
+  max-width: 480px;
+  box-shadow: 0 8px 32px rgba(0,0,0,0.6);
+  color: var(--ide-text);
+  font-size: 13px;
+}
+.ide-draft-restore-title {
+  font-size: 14px;
+  font-weight: 600;
+  margin-bottom: 10px;
+  color: var(--ide-warning, #e5c07b);
+}
+.ide-draft-restore-body { margin-bottom: 8px; color: var(--ide-text-muted); }
+.ide-draft-restore-list {
+  list-style: none;
+  padding: 0;
+  margin: 0 0 16px 0;
+  max-height: 160px;
+  overflow-y: auto;
+}
+.ide-draft-restore-list li {
+  padding: 3px 0;
+  font-family: monospace;
+  font-size: 12px;
+  color: var(--ide-accent-fg, #9cdcfe);
+}
+.ide-draft-restore-actions {
+  display: flex;
+  gap: 8px;
+  justify-content: flex-end;
+}
+.ide-draft-restore-btn {
+  padding: 5px 14px;
+  border-radius: 4px;
+  border: 1px solid var(--ide-border-input);
+  background: var(--ide-input-bg);
+  color: var(--ide-text);
+  font-size: 12px;
+  cursor: pointer;
+  transition: background 0.1s;
+}
+.ide-draft-restore-btn:hover { background: var(--ide-hover-bg); }
+.ide-draft-restore-btn-primary {
+  background: var(--ide-accent);
+  color: var(--ide-accent-text);
+  border-color: var(--ide-accent);
+}
+.ide-draft-restore-btn-primary:hover { opacity: 0.9; }
+
 /* ── Settings panel ─────────────────────────────────────────── */
 .ide-settings-panel { display: flex; flex-direction: column; height: 100%; overflow-y: auto; }
 .ide-settings-body { padding: 8px 12px; display: grid; grid-template-columns: 1fr 1fr; gap: 4px 10px; align-items: start; }