mbeditor 0.14.0 → 0.14.1

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

@@ -0,0 +1,329 @@
+'use strict';
+
+// Paste & Place (Ruby). The user pastes one or more methods (optionally inside
+// their `class Foo ... end`); each is matched to the method it should replace,
+// or offered as a new method. Nothing is written to disk: Apply pushes undoable
+// edits into the live Monaco buffer, which marks the tab dirty.
+//
+// Line ranges come from POST /ruby_methods (Ripper), computed on the *buffer*
+// text, so they match what the editor holds rather than what is on disk.
+
+var PastePlaceModal = (function () {
+  var useState = React.useState;
+  var useRef = React.useRef;
+  var useMemo = React.useMemo;
+
+  var MAX_CANDIDATE_FILES = 10;
+
+  function indentOf(line) { return /^[ \t]*/.exec(line || '')[0]; }
+
+  function escapeRegex(s) { return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); }
+
+  function activeRubyPath() {
+    var st = EditorStore.getState();
+    var pane = st.panes.find(function (p) { return p.id === st.focusedPaneId; }) || st.panes[0];
+    var tab = pane && pane.tabs.find(function (t) { return t.id === pane.activeTabId; });
+    return tab && tab.path && /\.rb$/.test(tab.path) && !/^[a-z-]+:\/\//.test(tab.path) ? tab.path : null;
+  }
+
+  // Live buffer when the file is open, disk otherwise.
+  function bufferText(path) {
+    var entry = window.__mbeditorModels && window.__mbeditorModels[path];
+    if (entry && entry.model && !entry.model.isDisposed()) return Promise.resolve(entry.model.getValue());
+    return FileService.getFile(path).then(function (d) {
+      if (!d || typeof d.content !== 'string') throw new Error('unreadable');
+      return d.content;
+    });
+  }
+
+  function ownerPath(owners, o) {
+    return owners.filter(function (x) {
+      return x.kind !== 'sclass' && x.start_line <= o.start_line && x.end_line >= o.end_line;
+    }).map(function (x) { return x.name; }).join('::');
+  }
+
+  function sameMethod(tm, m) {
+    return tm.name === m.name && tm.singleton === m.singleton &&
+      (!m.owner || tm.owner === m.owner || tm.owner.slice(-(m.owner.length + 2)) === '::' + m.owner);
+  }
+
+  // The class/module whose closing `end` receives a new method.
+  function insertionOwner(info, snippetOwner) {
+    var real = info.owners.filter(function (o) { return o.kind !== 'sclass'; });
+    if (snippetOwner) {
+      return real.filter(function (o) {
+        var full = ownerPath(info.owners, o);
+        return full === snippetOwner || full.slice(-(snippetOwner.length + 2)) === '::' + snippetOwner;
+      })[0] || null;
+    }
+    // ponytail: first top-level class/module; an owner-less snippet in a file with none is left unplaced.
+    return real.filter(function (o) { return o.kind === 'class'; })[0] || real[0] || null;
+  }
+
+  function reindent(snippetLines, base, target) {
+    return snippetLines.map(function (l) {
+      if (l.trim() === '') return '';
+      return target + (l.indexOf(base) === 0 ? l.slice(base.length) : l.replace(/^[ \t]+/, ''));
+    });
+  }
+
+  // Everything async: parse the snippet, then find targets for every method.
+  function findPlacement(code) {
+    var cache = {};
+    function rangesFor(path) {
+      if (!cache[path]) {
+        cache[path] = bufferText(path).then(function (text) {
+          return FileService.getRubyMethods(text).then(function (info) {
+            if (info.error) throw new Error(info.error);
+            return { text: text, info: info };
+          });
+        });
+      }
+      return cache[path];
+    }
+
+    return FileService.getRubyMethods(code).then(function (snip) {
+      if (snip.error) throw new Error('Snippet is not valid Ruby: ' + snip.error);
+      if (!snip.methods.length) throw new Error('No methods found in the pasted code.');
+      var lines = code.split('\n');
+      var active = activeRubyPath();
+
+      // One method at a time: /search supersedes (kills) a search still in flight.
+      var items = [];
+      return snip.methods.reduce(function (chain, m) { return chain.then(function () { return placeOne(m).then(function (item) { items.push(item); }); }); }, Promise.resolve())
+        .then(function () { return { items: items, texts: cache }; });
+
+      function placeOne(m) {
+        var item = {
+          m: m,
+          hasDoc: m.doc_start_line < m.start_line,
+          lines: lines.slice(m.doc_start_line - 1, m.end_line),
+          base: indentOf(lines[m.start_line - 1]),
+          options: []
+        };
+        var existing = [];
+        var step = Promise.resolve();
+        if (active) {
+          step = rangesFor(active).then(function (r) {
+            var t = r.info.methods.filter(function (tm) { return sameMethod(tm, m); })[0];
+            if (t) existing.push({ path: active, target: t });
+          }, function () {});
+        }
+        return step.then(function () {
+          if (existing.length || !m.name) return;
+          var q = 'def[[:space:]]+' + (m.singleton ? 'self\\.' : '') + escapeRegex(m.name);
+          return axios.get(window.mbeditorBasePath() + '/search', { params: { q: q, regex: 'true', limit: 50 } })
+            .then(function (res) {
+              var seen = {};
+              var files = ((res.data && res.data.results) || []).map(function (r) { return r.file; })
+                .filter(function (f) {
+                  if (!/\.rb$/.test(f) || f === active || seen[f]) return false;
+                  return (seen[f] = true);
+                }).slice(0, MAX_CANDIDATE_FILES);
+              return Promise.all(files.map(function (f) {
+                return rangesFor(f).then(function (r) {
+                  var t = r.info.methods.filter(function (tm) { return sameMethod(tm, m); })[0];
+                  if (t) existing.push({ path: f, target: t });
+                }, function () {});
+              }));
+            }, function () {});
+        }).then(function () {
+          item.options = existing.map(function (c) {
+            return { kind: 'replace', path: c.path, target: c.target, label: c.path + ':' + c.target.start_line };
+          });
+          var offerInsert = function (path) {
+            return rangesFor(path).then(function (r) {
+              var owner = insertionOwner(r.info, m.owner);
+              if (owner) item.options.push({ kind: 'insert', path: path, owner: owner, label: 'Insert as new method in ' + path });
+              return !!owner;
+            }, function () { return false; });
+          };
+          return (active ? offerInsert(active) : Promise.resolve(false)).then(function (placed) {
+            if (placed || !m.owner) return;
+            // A new method for a class that lives in another file goes into that file.
+            var q = '(class|module)[[:space:]]+' + escapeRegex(m.owner.split('::').pop()) + '([^A-Za-z0-9_]|$)';
+            return axios.get(window.mbeditorBasePath() + '/search', { params: { q: q, regex: 'true', limit: 20 } })
+              .then(function (res) {
+                var files = ((res.data && res.data.results) || []).map(function (r) { return r.file; })
+                  .filter(function (f, i, all) { return /\.rb$/.test(f) && f !== active && all.indexOf(f) === i; })
+                  .slice(0, MAX_CANDIDATE_FILES);
+                return Promise.all(files.map(offerInsert));
+              }, function () {});
+          });
+        }).then(function () {
+          item.options.push({ kind: 'skip', label: 'Skip' });
+          return item;
+        });
+      }
+    });
+  }
+
+  // Edits are expressed in 1-based line numbers against the text they were
+  // planned on: replace = lines start..end inclusive, insert = before line `at`.
+  function buildEdits(items, choices, texts) {
+    var byFile = {};
+    items.forEach(function (item, i) {
+      var opt = item.options[choices[i] == null ? 0 : choices[i]];
+      if (!opt || opt.kind === 'skip') return;
+      var entry = texts[opt.path];
+      var lines = entry.text.split('\n');
+      var f = byFile[opt.path] || (byFile[opt.path] = { text: entry.text, edits: [] });
+      if (opt.kind === 'replace') {
+        var t = opt.target;
+        f.edits.push({
+          start: item.hasDoc ? t.doc_start_line : t.start_line, end: t.end_line,
+          lines: reindent(item.lines, item.base, indentOf(lines[t.start_line - 1]))
+        });
+      } else {
+        var unit = /^\t/m.test(entry.text) ? '\t' : '  ';
+        var at = opt.owner.end_line;
+        var indent = indentOf(lines[at - 1]) + unit;
+        // Pasted methods are public: landing after `private` would hide a controller action.
+        for (var v = opt.owner.start_line; v < opt.owner.end_line - 1; v++) {
+          if (/^\s*(private|protected)\s*(#.*)?$/.test(lines[v])) { at = v + 1; indent = indentOf(lines[v]); break; }
+        }
+        var prev = lines[at - 2];
+        var body = reindent(item.lines, item.base, indent);
+        if (at !== opt.owner.end_line) body.push('');
+        if (at - 1 !== opt.owner.start_line && prev && prev.trim() !== '') body.unshift('');
+        f.edits.push({ start: at, end: at - 1, lines: body });
+      }
+    });
+    return byFile;
+  }
+
+  function applyToText(text, edits) {
+    var lines = text.split('\n');
+    edits.slice().sort(function (a, b) { return b.start - a.start; }).forEach(function (e) {
+      lines.splice.apply(lines, [e.start - 1, e.end - e.start + 1].concat(e.lines));
+    });
+    return lines.join('\n');
+  }
+
+  function waitForModel(path) {
+    var tries = 0;
+    return new Promise(function (resolve, reject) {
+      (function poll() {
+        var e = window.__mbeditorModels && window.__mbeditorModels[path];
+        if (e && e.model && !e.model.isDisposed() && e.cleanVersionId != null) return resolve(e.model);
+        if (++tries > 100) return reject(new Error('Could not open ' + path));
+        setTimeout(poll, 50);
+      })();
+    });
+  }
+
+  function applyEdits(byFile) {
+    var paths = Object.keys(byFile);
+    paths.forEach(function (p) { TabManager.openTab(p, p.split('/').pop()); });
+    return Promise.all(paths.map(waitForModel)).then(function (models) {
+      models.forEach(function (model, i) {
+        if (model.getValue().replace(/\r\n/g, '\n') !== byFile[paths[i]].text.replace(/\r\n/g, '\n')) {
+          throw new Error(paths[i] + ' changed since the preview. Run Find placement again.');
+        }
+      });
+      models.forEach(function (model, i) {
+        var eol = model.getEOL();
+        var ops = byFile[paths[i]].edits.map(function (e) {
+          var range = e.end < e.start
+            ? new window.monaco.Range(e.start, 1, e.start, 1)
+            : new window.monaco.Range(e.start, 1, e.end, model.getLineMaxColumn(e.end));
+          return { range: range, text: e.end < e.start ? e.lines.join(eol) + eol : e.lines.join(eol) };
+        });
+        model.pushStackElement();
+        model.pushEditOperations([], ops, function () { return null; });
+        model.pushStackElement();
+      });
+    });
+  }
+
+  var Modal = function PastePlaceModal(props) {
+    var modalRef = useRef(null);
+    var _c = useState('');
+    var code = _c[0]; var setCode = _c[1];
+    var _p = useState(null);
+    var plan = _p[0]; var setPlan = _p[1];
+    var _ch = useState({});
+    var choices = _ch[0]; var setChoices = _ch[1];
+    var _b = useState(false);
+    var busy = _b[0]; var setBusy = _b[1];
+    var _e = useState(null);
+    var error = _e[0]; var setError = _e[1];
+
+    window.useModalFocusTrap(modalRef, props.onClose);
+
+    var byFile = useMemo(function () {
+      return plan ? buildEdits(plan.items, choices, plan.texts) : {};
+    }, [plan, choices]);
+    var files = Object.keys(byFile);
+
+    var find = function () {
+      setBusy(true); setError(null);
+      findPlacement(code).then(function (p) {
+        // texts holds promises; settle them into { text, info } for synchronous use.
+        var paths = Object.keys(p.texts);
+        return Promise.all(paths.map(function (k) { return p.texts[k]; })).then(function (vals) {
+          var settled = {};
+          paths.forEach(function (k, i) { settled[k] = vals[i]; });
+          setPlan({ items: p.items, texts: settled });
+          setChoices({});
+        });
+      }).then(function () { setBusy(false); }, function (err) { setBusy(false); setError(err.message || 'Failed'); });
+    };
+
+    var apply = function () {
+      setBusy(true); setError(null);
+      applyEdits(Object.keys(byFile).reduce(function (acc, p) {
+        acc[p] = { text: byFile[p].text, edits: byFile[p].edits };
+        return acc;
+      }, {})).then(function () {
+        EditorStore.setStatus('Pasted into ' + files.length + ' file' + (files.length === 1 ? '' : 's') + ' (unsaved)', 'info');
+        props.onClose();
+      }, function (err) { setBusy(false); setError(err.message || 'Failed'); });
+    };
+
+    var h = React.createElement;
+    return h('div', { className: 'schema-modal-overlay', onClick: props.onClose },
+      h('div', {
+        ref: modalRef, className: 'schema-modal paste-place-modal', role: 'dialog', 'aria-modal': 'true',
+        'aria-label': 'Paste and place', tabIndex: -1, onClick: function (e) { e.stopPropagation(); }
+      },
+        h('div', { className: 'schema-modal-header' }, h('div', { className: 'schema-modal-title' }, 'Paste & Place')),
+        h('div', { className: 'schema-modal-body paste-place-body' },
+          !plan && h('textarea', {
+            className: 'paste-place-input', value: code, spellCheck: false, rows: 14,
+            placeholder: 'Paste Ruby methods here, or a class/module that wraps them.',
+            onChange: function (e) { setCode(e.target.value); }
+          }),
+          error && h('div', { className: 'paste-place-error' }, error),
+          plan && plan.items.map(function (item, i) {
+            return h('div', { key: i, className: 'paste-place-row' },
+              h('span', { className: 'paste-place-name' }, (item.m.owner ? item.m.owner : '') + (item.m.singleton ? '.' : '#') + item.m.name),
+              h('select', {
+                value: choices[i] == null ? 0 : choices[i],
+                onChange: function (e) { var v = +e.target.value; setChoices(function (prev) { var o = Object.assign({}, prev); o[i] = v; return o; }); }
+              }, item.options.map(function (o, k) { return h('option', { key: k, value: k }, o.label); }))
+            );
+          }),
+          plan && files.map(function (p) {
+            return h('div', { key: p, className: 'paste-place-diff' },
+              h(window.DiffViewer, {
+                path: p, original: byFile[p].text, modified: applyToText(byFile[p].text, byFile[p].edits),
+                isDark: props.isDark, editorPrefs: props.editorPrefs
+              }));
+          }),
+          plan && files.length === 0 && h('div', { className: 'combined-note' }, 'Nothing to apply.')
+        ),
+        h('div', { className: 'import-conflict-actions' },
+          h('button', { type: 'button', className: 'import-conflict-btn', onClick: plan ? function () { setPlan(null); setError(null); } : props.onClose }, plan ? 'Back' : 'Cancel'),
+          plan
+            ? h('button', { type: 'button', className: 'import-conflict-btn import-conflict-btn-primary', disabled: busy || files.length === 0, onClick: apply }, 'Apply to editor')
+            : h('button', { type: 'button', className: 'import-conflict-btn import-conflict-btn-primary', disabled: busy || !code.trim(), onClick: find }, busy ? 'Searching...' : 'Find placement')
+        )
+      )
+    );
+  };
+
+  return Modal;
+})();
+
+window.PastePlaceModal = PastePlaceModal;

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

@@ -182,6 +182,22 @@ var ShortcutHelp = function ShortcutHelp(_ref) {
                   ]
                 }
               )
+            ),
+
+            React.createElement(
+              Section,
+              { title: 'Sharing code with a chat assistant' },
+              React.createElement(
+                Tips,
+                {
+                  items: [
+                    'Combined View: Ctrl/Cmd-click several files or folders, right-click, "Open in Combined View" — every file on one page with Copy and Download',
+                    'Pick methods: in Combined View, tick methods under a Ruby file to send only those; "Download .md" / "Copy .md" bundles everything into one attachment',
+                    'Paste & Place: right-click inside a Ruby file (or F1) → "Paste & Place Ruby Method...", paste the reply, "Find placement", check the diff, "Apply to editor" — then save; Ctrl+Z undoes',
+                    'Upload compare: drop or upload a file over an existing one and click "Compare" to see the diff before choosing Skip / Keep both / Overwrite'
+                  ]
+                }
+              )
             )
           )
         )

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

@@ -145,7 +145,7 @@
   var _discoveredFlushTimer = null;
   function flushDiscoveredGlobals() {
     _discoveredFlushTimer = null;
-    var mts = window.monaco && window.monaco.languages && window.monaco.languages.typescript;
+    var mts = window.monaco && window.monaco.typescript;
     if (!mts || !mts.javascriptDefaults) return;
     var decls = Object.keys(discoveredJsGlobals)
       .map(function(k) { return 'declare var ' + k + ': any;'; }).join('\n');
@@ -263,7 +263,7 @@
       entry.lib.dispose();
       entry.lib = null;
     } else if (!open && !entry.lib) {
-      entry.lib = monaco.languages.typescript.javascriptDefaults
+      entry.lib = monaco.typescript.javascriptDefaults
         .addExtraLib(entry.content, programUri(path));
     }
   }
@@ -278,7 +278,7 @@
 
   function loadWorkspaceProgram(monaco) {
     if (typeof FileService === 'undefined') return;
-    var mts = monaco && monaco.languages && monaco.languages.typescript;
+    var mts = monaco && monaco.typescript;
     if (!mts || !mts.javascriptDefaults) return;
 
     var programLoaded = FileService.getJsProgram
@@ -301,7 +301,7 @@
 
   function loadWorkspaceGlobals(monaco) {
     if (typeof FileService === 'undefined' || !FileService.getJsGlobals) return;
-    var mts = monaco && monaco.languages && monaco.languages.typescript;
+    var mts = monaco && monaco.typescript;
     if (!mts || !mts.javascriptDefaults) return;
     FileService.getJsGlobals().then(function (data) {
       if (!data || !data.ok || !data.symbols) return;
@@ -335,7 +335,7 @@
   // tree. A workspace can be tens of MB, so re-fetching it on every save would
   // cost more than the feature is worth.
   function refreshProgramPaths(monaco, paths) {
-    var mts = monaco && monaco.languages && monaco.languages.typescript;
+    var mts = monaco && monaco.typescript;
     if (!mts || !mts.javascriptDefaults) return;
     if (typeof FileService === 'undefined' || !FileService.getJsProgramFile) return;
     var wanted = (paths || []).filter(function (path) {
@@ -1253,8 +1253,8 @@
   function registerJsProviders(monaco) {
     // JavaScript: enable semantic checking (off by default in Monaco) and JSX support.
     // checkJs catches undefined variables, noUnusedLocals catches dead assignments.
-    if (monaco.languages.typescript && monaco.languages.typescript.javascriptDefaults) {
-      monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({
+    if (monaco.typescript && monaco.typescript.javascriptDefaults) {
+      monaco.typescript.javascriptDefaults.setDiagnosticsOptions({
         noSemanticValidation: false,
         noSyntaxValidation: false,
         // Suggestion diagnostics are TypeScript's advice to a TypeScript
@@ -1271,12 +1271,12 @@
         // which is a closed rule rather than a list that grows by one code
         // every time a new false positive turns up.
       });
-      monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
-        target: monaco.languages.typescript.ScriptTarget.ES2020,
+      monaco.typescript.javascriptDefaults.setCompilerOptions({
+        target: monaco.typescript.ScriptTarget.ES2020,
         allowNonTsExtensions: true,
         allowJs: true,
         checkJs: true,
-        jsx: monaco.languages.typescript.JsxEmit.React,
+        jsx: monaco.typescript.JsxEmit.React,
         noUnusedLocals: true
       });
       // Hand JS formatting to Prettier alone.
@@ -1289,8 +1289,8 @@
       // two spaces and never adds semicolons, ignoring every preference. Only
       // formatting is switched off — completions, hovers, diagnostics, rename
       // and the rest of the JS intelligence still come from the worker.
-      monaco.languages.typescript.javascriptDefaults.setModeConfiguration(
-        Object.assign({}, monaco.languages.typescript.javascriptDefaults.modeConfiguration, {
+      monaco.typescript.javascriptDefaults.setModeConfiguration(
+        Object.assign({}, monaco.typescript.javascriptDefaults.modeConfiguration, {
           documentRangeFormattingEdits: false,
           onTypeFormattingEdits: false
         })
@@ -1401,15 +1401,15 @@
     // window globals from the host application. Common Sprockets globals
     // (React, ReactDOM, etc.) are declared explicitly. For additional globals
     // not auto-detected, add `/* global MyComponent */` at the top of the file.
-    if (monaco.languages.typescript && monaco.languages.typescript.javascriptDefaults) {
-      monaco.languages.typescript.javascriptDefaults.addExtraLib(
+    if (monaco.typescript && monaco.typescript.javascriptDefaults) {
+      monaco.typescript.javascriptDefaults.addExtraLib(
         REACT_MINI_UMD_DTS,
         'inmemory://mbeditor/react-mini-umd.d.ts'
       );
 
       var dynamicShim = buildWindowGlobalsShim();
       if (dynamicShim) {
-        monaco.languages.typescript.javascriptDefaults.addExtraLib(
+        monaco.typescript.javascriptDefaults.addExtraLib(
           dynamicShim,
           'inmemory://mbeditor/window-globals.d.ts'
         );
@@ -1725,11 +1725,11 @@
     }
 
     // TypeScript: enable JSX for .tsx files.
-    if (monaco.languages.typescript && monaco.languages.typescript.typescriptDefaults) {
-      monaco.languages.typescript.typescriptDefaults.setCompilerOptions({
-        target: monaco.languages.typescript.ScriptTarget.ES2020,
+    if (monaco.typescript && monaco.typescript.typescriptDefaults) {
+      monaco.typescript.typescriptDefaults.setCompilerOptions({
+        target: monaco.typescript.ScriptTarget.ES2020,
         allowNonTsExtensions: true,
-        jsx: monaco.languages.typescript.JsxEmit.React,
+        jsx: monaco.typescript.JsxEmit.React,
         noUnusedLocals: true
       });
     }
@@ -1932,7 +1932,7 @@
   function collectComponentProps(monaco, model, name) {
     var sources = [model.getValue()];
     try {
-      var libs = monaco.languages.typescript.javascriptDefaults.getExtraLibs();
+      var libs = monaco.typescript.javascriptDefaults.getExtraLibs();
       Object.keys(libs).forEach(function(uri) {
         if (libs[uri] && libs[uri].content) sources.push(libs[uri].content);
       });

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

@@ -304,6 +304,15 @@ var FileService = (function () {
       .then(function (res) { return res.data; });
   }
 
+  // Method line ranges of Ruby source (code).
+  // Resolves { methods, owners } or { error } — a syntax error is data, not a throw.
+  function getRubyMethods(code) {
+    return axios.post(window.mbeditorBasePath() + '/ruby_methods', { code: code }).then(function (res) { return res.data; }, function (err) {
+      if (err && err.response && err.response.data && err.response.data.error && err.response.status === 422) return { error: err.response.data.error };
+      throw err;
+    });
+  }
+
   function getState() {
     return axios.get(window.mbeditorBasePath() + '/state').then(function(res) { return res.data; });
   }
@@ -550,6 +559,7 @@ var FileService = (function () {
     runTests: runTests,
     ping: ping,
     getRoutes: getRoutes,
+    getRubyMethods: getRubyMethods,
     isServerReachable: ServerReachability.isOnline,
     onReachabilityChange: ServerReachability.onChange,
     getState: getState,

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

@@ -128,6 +128,10 @@ html, body, #mbeditor-root {
 }
 
 .ide-titlebar {
+  /* .statusbar-btn paints from --ide-accent-text, which is "text on the accent
+     fill" in the legacy themes. The title bar is panel-coloured in every theme,
+     so its buttons read the ordinary text colour instead. */
+  --ide-accent-text: var(--ide-text);
   display: flex;
   align-items: center;
   background: var(--ide-panel-bg);
@@ -1961,7 +1965,7 @@ body.mbeditor-migration-pending .ide-statusbar {
 .changelog-version-badge {
   font-size: 15px;
   font-weight: 700;
-  color: var(--ide-accent-text, #4fc1ff);
+  color: var(--ide-accent-fg);
   letter-spacing: -0.01em;
 }
 .changelog-version-date {
@@ -4135,3 +4139,28 @@ input.ide-model-graph-search[type="search"] {
 .mbeditor-collab-diag-label { font-weight: 500; }
 .mbeditor-collab-diag-detail { color: var(--ide-text-muted, #858585); margin-top: 3px; line-height: 1.5; }
 .mbeditor-collab-diag-foot { color: var(--ide-text-muted, #858585); margin-bottom: 12px; }
+
+.combined-view { height: 100%; overflow-y: auto; background: var(--ide-bg, #1e1e1e); color: var(--ide-text, #d4d4d4); }
+.combined-note { padding: 8px 16px; font-size: 12px; color: var(--ide-text-muted, #888); }
+.combined-file-header { position: sticky; top: 0; z-index: 1; display: flex; align-items: center; gap: 8px; padding: 6px 16px; background: var(--ide-bg-elevated, var(--ide-bg, #252526)); border-bottom: 1px solid var(--ide-border, #333); font-size: 12px; }
+.combined-file-path { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-weight: 600; }
+.combined-file-btn { font-size: 11px; padding: 2px 8px; cursor: pointer; color: inherit; background: transparent; border: 1px solid var(--ide-border, #444); border-radius: 3px; }
+.combined-file-btn:disabled { opacity: 0.4; cursor: default; }
+.combined-file-body { margin: 0; padding: 8px 16px 24px; overflow-x: auto; font: 12px/1.5 Menlo, Consolas, monospace; tab-size: 2; }
+
+/* Combined view: method picking + Markdown export; import Compare; Paste & Place */
+.combined-toolbar { display: flex; gap: 8px; padding: 6px 16px; border-bottom: 1px solid var(--ide-border, #333); }
+.combined-methods { display: flex; flex-wrap: wrap; gap: 2px 12px; max-height: 96px; overflow-y: auto; padding: 4px 16px; font-size: 11px; border-bottom: 1px solid var(--ide-border, #333); }
+.combined-method { display: inline-flex; align-items: center; gap: 4px; white-space: nowrap; cursor: pointer; }
+.import-conflict-compare { margin-left: 8px; padding: 0; background: none; border: 0; color: var(--ide-accent, #0e639c); font-size: 11px; cursor: pointer; }
+.import-conflict-compare:hover { text-decoration: underline; }
+.import-conflict-modal.import-conflict-wide { min-width: min(900px, 94vw); max-width: 94vw; }
+.import-conflict-diff { height: 360px; margin-top: 8px; }
+.paste-place-modal { min-width: min(900px, 94vw); max-width: 94vw; }
+.paste-place-body { padding: 8px 16px; }
+.paste-place-input { width: 100%; box-sizing: border-box; font: 12px/1.5 var(--ide-mono-font, monospace); color: var(--ide-text, #d4d4d4); background: var(--ide-input-bg, #3c3c3c); border: 1px solid var(--ide-border, #3c3c3c); border-radius: 3px; padding: 8px; resize: vertical; }
+.paste-place-error { color: var(--ide-error, #f48771); font-size: 12px; padding: 6px 0; }
+.paste-place-row { display: flex; align-items: center; gap: 8px; padding: 4px 0; font-size: 12px; }
+.paste-place-name { font-family: var(--ide-mono-font, monospace); min-width: 160px; }
+.paste-place-row select { flex: 1; min-width: 0; color: var(--ide-text, #d4d4d4); background: var(--ide-input-bg, #3c3c3c); border: 1px solid var(--ide-border, #3c3c3c); }
+.paste-place-diff { height: 260px; margin-top: 8px; border: 1px solid var(--ide-border, #3c3c3c); }

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

@@ -117,6 +117,17 @@ html[data-glass] .ide-editor-wrapper .monaco-editor .margin { background-color:
 /* Taller than Modern's 22px so the chips have room; the 6px gutter above it
    stays, matching the explorer gutter, and it eats 2px of shell padding below. */
 html[data-glass] .ide-statusbar { border-top: 1px solid var(--g-edge); height: 28px; margin: 0 0 -2px; }
+/* The bar is a panel-coloured card here, not the accent fill the legacy themes
+   paint flat, so its text is the ordinary text colour. While migrations are
+   pending it is amber instead, and the warn pair is what stays readable on it:
+   the base .ide-statusbar background is overridden by the glass surface above,
+   so the warn background has to be restated. */
+html[data-glass] .ide-statusbar { --ide-accent-text: var(--ide-text); }
+html[data-glass] body.mbeditor-migration-pending .ide-statusbar {
+  background: var(--ide-statusbar-warn-bg);
+  --ide-accent-text: var(--ide-statusbar-warn-text);
+  --ide-text-muted:  var(--ide-statusbar-warn-text);
+}
 /* The drawer-open handle lies over the 6px gutter between the editor card and
    the status bar rather than adding a strip of its own above it. */
 /* Sits in the shell's own 6px gap between the body and the status bar. */

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

@@ -162,7 +162,7 @@
 /* ══ DRACULA ════════════════════════════════════════════════════════════════ */
 [data-theme="dracula"] {
   color-scheme: dark;
-  --ide-accent-text:    #ffffff;
+  --ide-accent-text:    #282a36;
   --ide-statusbar-warn-bg:   #ffb86c;
   --ide-statusbar-warn-text: #282a36;
   --status-hover-bg:    rgba(255,255,255,0.08);
@@ -194,7 +194,7 @@
 /* ══ NIGHT OWL ══════════════════════════════════════════════════════════════ */
 [data-theme="night-owl"] {
   color-scheme: dark;
-  --ide-accent-text:    #ffffff;
+  --ide-accent-text:    #011627;
   --ide-statusbar-warn-bg:   #ffcb8b;
   --ide-statusbar-warn-text: #011627;
   --status-hover-bg:    rgba(255,255,255,0.08);
@@ -322,7 +322,7 @@
 /* ══ TOMORROW NIGHT ════════════════════════════════════════════════════════ */
 [data-theme="tomorrow-night"] {
   color-scheme: dark;
-  --ide-accent-text:    #ffffff;
+  --ide-accent-text:    #1d1f21;
   --ide-statusbar-warn-bg:   #de935f;
   --ide-statusbar-warn-text: #1d1f21;
   --status-hover-bg:    rgba(255,255,255,0.08);

data/app/controllers/mbeditor/editors_controller.rb

@@ -758,6 +758,13 @@ module Mbeditor
              status: :unprocessable_content
     end
 
+    # POST /mbeditor/ruby_methods {code:} — method line ranges of Ruby source.
+    # A syntax error is a 422 with {error:}, never a raise.
+    def ruby_methods
+      result = RubyMethodRangesService.call(params[:code].to_s)
+      render json: result, status: result[:error] ? :unprocessable_content : :ok
+    end
+
     # GET /mbeditor/exceptions — recorded host-app exceptions, newest first.
     #
     # The cable push is the live path; this seeds the panel on load and covers