mbeditor 0.3.8 → 0.3.9

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

@@ -475,16 +475,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 {