mbeditor 0.14.0 → 0.14.2

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/javascripts/mbeditor/tab_manager.js

@@ -620,6 +620,9 @@ var TabManager = (function () {
     var state = EditorStore.getState();
     var pane = state.panes.find(function(p) { return p.id === paneId; });
     var newActive = pane ? pane.activeTabId : null;
+    // Every click in a pane lands here; a no-op setState still re-renders the
+    // app, which mid-click resets controlled inputs (checkboxes) to their old value.
+    if (state.focusedPaneId === paneId && state.activeTabId === newActive) return;
     EditorStore.setState({ focusedPaneId: paneId, activeTabId: newActive });
   }
 

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 {
@@ -2363,6 +2367,8 @@ body.mbeditor-migration-pending .ide-statusbar {
 /* Nothing to click, so nothing that looks clickable. */
 .collapsible-header-static { cursor: default; }
 .collapsible-header-static:hover { background: none; }
+/* A sticky header still needs its own fill, or scrolled rows show through it. */
+.ide-sidebar-scrollable .collapsible-header-static:hover { background: var(--ide-panel-bg); }
 
 
 .collapsible-toggle {
@@ -4135,3 +4141,29 @@ 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-picker { max-height: 30vh; overflow-y: auto; padding: 4px 16px; font-size: 12px; border-bottom: 1px solid var(--ide-border, #333); }
+.combined-pick-file, .combined-pick-method { display: flex; align-items: center; gap: 6px; white-space: nowrap; cursor: pointer; }
+.combined-pick-method { padding-left: 22px; font-size: 11px; }
+.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

data/app/services/mbeditor/ruby_method_ranges_service.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+require "ripper"
+
+module Mbeditor
+  # Line ranges of every method (and enclosing class/module) in Ruby source.
+  #
+  # Ripper rather than Prism: it is stdlib on every Ruby this gem supports.
+  # Events fire bottom-up, so a node's end line is the last significant token
+  # the scanner produced before it reduced, and owners are resolved afterwards
+  # by range containment instead of a stack.
+  #
+  #   call(src) => { methods: [{ name:, singleton:, owner:, start_line:,
+  #                               doc_start_line:, end_line: }],
+  #                  owners:  [{ kind:, name:, start_line:, end_line: }] }
+  #               | { error: "..." }  (owners also hold `class << self` as kind "sclass")
+  class RubyMethodRangesService
+    MAX_BYTES = 200 * 1024
+
+    # Tokens that carry no code; a def never ends on one of these.
+    BLANK = %i[sp nl ignored_nl comment embdoc_beg embdoc embdoc_end words_sep ignored_sp].freeze
+
+    class Collector < Ripper::SexpBuilder
+      attr_reader :methods_found, :owners_found
+
+      def initialize(*)
+        super
+        @methods_found = []
+        @owners_found = []
+        @last_line = 1
+      end
+
+      (Ripper::SCANNER_EVENTS - BLANK).each do |ev|
+        define_method(:"on_#{ev}") do |tok|
+          @last_line = lineno
+          super(tok)
+        end
+      end
+
+      def on_def(name, *rest)
+        record(name, false)
+        super
+      end
+
+      def on_defs(target, period, name, *rest)
+        record(name, true)
+        super
+      end
+
+      def on_class(const, *rest)
+        owner(:class, const)
+        super
+      end
+
+      def on_sclass(target, *rest)
+        @owners_found << { kind: "sclass", name: "<< self", start_line: first_line(target), end_line: @last_line }
+        super
+      end
+
+      def on_module(const, *rest)
+        owner(:module, const)
+        super
+      end
+
+      private
+
+      def record(ident, singleton)
+        @methods_found << { name: ident[1], singleton: singleton, start_line: ident[2][0], end_line: @last_line }
+      end
+
+      def owner(kind, const)
+        @owners_found << { kind: kind.to_s, name: const_name(const), start_line: first_line(const), end_line: @last_line }
+      end
+
+      def const_name(node)
+        return "" unless node.is_a?(Array)
+
+        case node[0]
+        when :@const then node[1]
+        when :const_ref, :var_ref, :top_const_ref then const_name(node[1])
+        when :const_path_ref then "#{const_name(node[1])}::#{const_name(node[2])}"
+        else ""
+        end
+      end
+
+      def first_line(node)
+        return node[2][0] if node.is_a?(Array) && node[0].is_a?(Symbol) && node[0].to_s.start_with?("@")
+
+        node.each { |c| l = first_line(c) if c.is_a?(Array); return l if l } if node.is_a?(Array)
+        nil
+      end
+    end
+
+    def self.call(source)
+      source = source.to_s
+      return { error: "Source too large" } if source.bytesize > MAX_BYTES
+
+      parser = Collector.new(source)
+      parser.parse
+      return { error: "Syntax error" } if parser.error?
+
+      lines = source.lines
+      owners = parser.owners_found.sort_by { |o| [o[:start_line], -o[:end_line]] }
+      methods = parser.methods_found.sort_by { |m| m[:start_line] }.map do |m|
+        chain = owners.select { |o| o[:start_line] <= m[:start_line] && o[:end_line] >= m[:end_line] }
+        m.merge(singleton: m[:singleton] || chain.any? { |o| o[:kind] == "sclass" },
+                  owner: chain.reject { |o| o[:kind] == "sclass" }.map { |o| o[:name] }.join("::"), doc_start_line: doc_start(lines, m[:start_line]))
+      end
+      { methods: methods, owners: owners }
+    rescue StandardError, SystemStackError => e
+      { error: e.message }
+    end
+
+    def self.doc_start(lines, start_line)
+      line = start_line
+      line -= 1 while line > 1 && lines[line - 2].to_s.lstrip.start_with?("#")
+      line
+    end
+  end
+end

data/lib/mbeditor/rack/pending_migration_bypass.rb

@@ -33,6 +33,7 @@ module Mbeditor
     # is still told to migrate — they are just no longer prevented from working.
     class PendingMigrationBypass
       DEFAULT_ASSET_PREFIX = "/assets"
+      DEFAULT_CABLE_PATH = "/cable"
 
       def initialize(app, file_watcher: nil)
         @app = app
@@ -94,7 +95,21 @@ module Mbeditor
         prefix = Mbeditor::MountPath.resolve
         return true if path == prefix || path.start_with?("#{prefix}/")
 
-        path.start_with?("#{asset_prefix}/")
+        return true if path.start_with?("#{asset_prefix}/")
+
+        # The cable carries presence, collaboration and file-change push. Left
+        # blocked it 500s on every reconnect, and the client's status chips
+        # flicker for as long as the migration stays pending.
+        path == cable_path || path.start_with?("#{cable_path}/")
+      end
+
+      def cable_path
+        @cable_path ||= begin
+          configured = Rails.application.config.action_cable.mount_path if Rails.application.config.respond_to?(:action_cable)
+          (configured.presence || DEFAULT_CABLE_PATH).to_s.chomp("/")
+        rescue StandardError
+          DEFAULT_CABLE_PATH
+        end
       end
 
       def asset_prefix

data/lib/mbeditor/route_map.rb

@@ -37,6 +37,7 @@ module Mbeditor
     get    'js_program',      to: 'editors#js_program'
     post   'ruby_lsp',        to: 'editors#ruby_lsp'
   post   'ruby_rename',     to: 'editors#ruby_rename'
+  post   'ruby_methods',    to: 'editors#ruby_methods'
   get    'model_graph',     to: 'editors#model_graph'
   get    'exceptions',      to: 'editors#exceptions'
   delete 'exceptions',      to: 'editors#clear_exceptions'

data/lib/mbeditor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mbeditor
-  VERSION = "0.14.0"
+  VERSION = "0.14.2"
 end

data/public/monaco-editor/VERSIONS

@@ -1,3 +1,3 @@
-monaco-editor 0.55.1
+monaco-editor 0.57.0
 monaco-vim 0.4.4
 esbuild 0.28.0