mbeditor 0.4.0 → 0.4.2

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

@@ -31,6 +31,24 @@
     'or': true, not: true, require: true, include: true, extend: true
   };
 
+  // Ruby core / Kernel built-in methods that should never trigger a
+  // definition lookup — ctrl+click or F12 on these is a no-op.
+  var RUBY_CORE_METHODS = {
+    puts: true, print: true, p: true, pp: true, warn: true, printf: true,
+    fail: true, require_relative: true, prepend: true,
+    attr_accessor: true, attr_reader: true, attr_writer: true,
+    lambda: true, proc: true, 'loop': true, sleep: true,
+    exit: true, abort: true, rand: true, srand: true, gets: true,
+    sprintf: true, format: true, open: true,
+    Integer: true, Float: true, String: true, Array: true, Hash: true,
+    Rational: true, Complex: true,
+    readline: true, readlines: true,
+    system: true, exec: true, fork: true, spawn: true,
+    freeze: true, frozen: true, dup: true, clone: true, object_id: true,
+    respond_to: true, send: true, public_send: true, method: true,
+    tap: true, itself: true
+  };
+
   var globalsRegistered = false;
 
   function leadingWhitespace(line) {
@@ -287,6 +305,7 @@
         var wordInfo = model.getWordAtPosition(position);
         if (!wordInfo || !wordInfo.word || wordInfo.word.length < 2) return;
         if (RUBY_KEYWORDS[wordInfo.word]) return;
+        if (RUBY_CORE_METHODS[wordInfo.word]) return;
         if (typeof FileService === 'undefined' || !FileService.getDefinition) return;
 
         event.event.preventDefault();
@@ -315,6 +334,7 @@
           var wordInfo = model.getWordAtPosition(pos);
           if (!wordInfo || !wordInfo.word || wordInfo.word.length < 2) return;
           if (RUBY_KEYWORDS[wordInfo.word]) return;
+          if (RUBY_CORE_METHODS[wordInfo.word]) return;
           if (typeof FileService === 'undefined' || !FileService.getDefinition) return;
 
           FileService.getDefinition(wordInfo.word, 'ruby').then(function(data) {
@@ -707,6 +727,7 @@
         var word = wordInfo.word;
         if (!word || word.length < 2) return null;
         if (RUBY_KEYWORDS[word]) return null;
+        if (RUBY_CORE_METHODS[word]) return null;
         if (typeof FileService === 'undefined' || !FileService.getDefinition) return null;
 
         var currentFile = model._mbeditorPath || null;

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

@@ -93,6 +93,9 @@ var FileService = (function () {
   }
 
   function saveState(state) {
+    if (WebSocketService.isConnected() && WebSocketService.perform('save_state', { state: state })) {
+      return Promise.resolve({ ok: true });
+    }
     return axios.post(window.mbeditorBasePath() + '/state', { state: state }).then(function(res) { return res.data; });
   }
 
@@ -101,6 +104,9 @@ var FileService = (function () {
   }
 
   function saveBranchState(branch, state) {
+    if (WebSocketService.isConnected() && WebSocketService.perform('save_branch_state', { branch: branch, state: state })) {
+      return Promise.resolve({ ok: true });
+    }
     return axios.post(window.mbeditorBasePath() + '/branch_state', { branch: branch, state: state }).then(function(res) { return res.data; });
   }
 

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

@@ -43,7 +43,7 @@ var SearchService = (function () {
   // Returns merged results; MiniSearch scored entries come first.
   function searchFiles(query) {
     if (!query) return [];
-    var msResults = _miniSearch.search(query, { prefix: true, fuzzy: 0.2 });
+    var msResults = _miniSearch.search(query, { prefix: true, fuzzy: false, combineWith: 'AND' });
     // Substring fallback — catch anything MiniSearch missed
     var q = query.toLowerCase();
     var msIds = new Set(msResults.map(function(r) { return r.id; }));
@@ -59,13 +59,17 @@ var SearchService = (function () {
   // 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) {
+  // options.regex=true enables regex mode on the server.
+  function projectSearch(query, offset, limit, options) {
     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;
+    var useRegex = !!(options && options.regex);
+    var matchCase = !!(options && options.matchCase);
+    var wholeWord = !!(options && options.wholeWord);
 
     return axios.get(window.mbeditorBasePath() + '/search', {
-      params: { q: query, offset: off, limit: lim }
+      params: { q: query, offset: off, limit: lim, regex: useRegex ? 'true' : 'false', match_case: matchCase ? 'true' : 'false', whole_word: wholeWord ? 'true' : 'false' }
     }).then(function(res) {
         var data = res.data;
         var results    = Array.isArray(data) ? data : (data && data.results || []);

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

@@ -0,0 +1,126 @@
+// WebSocketService — wraps ActionCable when available.
+// Falls back gracefully when ActionCable is absent or the WebSocket connection
+// cannot be established (e.g. the host app does not mount /cable).
+//
+// The ping heartbeat is intentionally NOT routed through this service.
+// Polling keeps working as the authoritative "is the server reachable?" check
+// because WebSocket connections can survive DNS/network changes that would
+// otherwise prevent reconnection.
+var WebSocketService = (function () {
+  var _consumer = null;
+  var _subscription = null;
+  var _connected = false;
+  var _filesChangedCallbacks = [];
+
+  // ---------------------------------------------------------------------------
+  // Internal helpers
+  // ---------------------------------------------------------------------------
+
+  function _isActionCableAvailable() {
+    return typeof window.ActionCable !== 'undefined';
+  }
+
+  function _getConsumer() {
+    // Reuse an existing consumer the host app may have already created (App.cable
+    // is the Rails default).  Fall back to creating our own.
+    if (typeof window.App !== 'undefined' && window.App.cable) {
+      return window.App.cable;
+    }
+    var cableUrl = window.MBEDITOR_CABLE_URL || '/cable';
+    return window.ActionCable.createConsumer(cableUrl);
+  }
+
+  function _emitFilesChanged(data) {
+    _filesChangedCallbacks.forEach(function (fn) {
+      try { fn(data); } catch (e) { /* ignore */ }
+    });
+  }
+
+  // ---------------------------------------------------------------------------
+  // Public API
+  // ---------------------------------------------------------------------------
+
+  // Call once after the workspace response is received.
+  // serverSupportsWs: boolean from workspace.actionCableEnabled
+  function connect(serverSupportsWs) {
+    if (!serverSupportsWs || !_isActionCableAvailable()) {
+      return; // polling remains the only refresh mechanism
+    }
+
+    try {
+      _consumer = _getConsumer();
+      _subscription = _consumer.subscriptions.create(
+        { channel: 'Mbeditor::EditorChannel' },
+        {
+          connected: function () {
+            _connected = true;
+          },
+          disconnected: function () {
+            _connected = false;
+          },
+          rejected: function () {
+            _connected = false;
+            // Channel was rejected — unsubscribe so we stop trying.
+            if (_subscription) {
+              _subscription.unsubscribe();
+              _subscription = null;
+            }
+          },
+          received: function (data) {
+            if (data && data.type === 'files_changed') {
+              _emitFilesChanged(data);
+            }
+          }
+        }
+      );
+    } catch (e) {
+      // Any setup error means we silently stay in polling-only mode.
+      _connected = false;
+      _subscription = null;
+    }
+  }
+
+  function disconnect() {
+    if (_subscription) {
+      _subscription.unsubscribe();
+      _subscription = null;
+    }
+    _connected = false;
+  }
+
+  // Returns true only when the WebSocket is currently live.
+  function isConnected() {
+    return _connected;
+  }
+
+  // Register a callback to be invoked when the server broadcasts files_changed.
+  function onFilesChanged(fn) {
+    _filesChangedCallbacks.push(fn);
+  }
+
+  // Remove a previously registered callback.
+  function offFilesChanged(fn) {
+    _filesChangedCallbacks = _filesChangedCallbacks.filter(function (f) { return f !== fn; });
+  }
+
+  // Send a server-side channel action (e.g. 'save_state').
+  // Returns true if the message was dispatched, false if not connected.
+  function perform(action, data) {
+    if (!_subscription || !_connected) return false;
+    try {
+      _subscription.perform(action, data);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  return {
+    connect: connect,
+    disconnect: disconnect,
+    isConnected: isConnected,
+    perform: perform,
+    onFilesChanged: onFilesChanged,
+    offFilesChanged: offFilesChanged
+  };
+})();

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

@@ -1,6 +1,13 @@
 /* ── Mini Browser Editor Global Styles ──────────────────── */
 *, *::before, *::after { box-sizing: border-box; }
 
+/* Suppress all focus outlines / coloured glows inside the IDE shell */
+#mbeditor-root *:focus,
+#mbeditor-root *:focus-visible {
+  outline: none !important;
+  box-shadow: none !important;
+}
+
 html, body, #mbeditor-root {
   margin: 0; padding: 0;
   width: 100%; height: 100%;
@@ -822,6 +829,14 @@ html, body, #mbeditor-root {
   padding-left: 8px;
 }
 
+.statusbar-eol-btn {
+  font-size: 10px;
+  font-weight: 600;
+  letter-spacing: 0.04em;
+  opacity: 0.85;
+  padding: 0 6px;
+}
+
 /* ── Search Panel ─────────────────────────────────────────── */
 .search-panel {
   padding: 8px;
@@ -840,28 +855,64 @@ html, body, #mbeditor-root {
 }
 
 .search-input-shell {
-  flex: 1;
+  flex-shrink: 0;
   position: relative;
   display: flex;
   align-items: center;
   min-width: 0;
 }
 
+/* The input grows to fill; right padding makes room for adornments */
 .search-input-shell .search-input {
-  padding-right: 24px;
+  padding-right: 88px; /* 3 × 22px buttons + 4px clear + gaps */
 }
 
-/* search-clear-btn sits absolutely inside the input shell */
-.search-input-shell .search-clear-btn {
+/* Adornment container — absolutely positioned inside the shell */
+.search-input-adornments {
   position: absolute;
   right: 4px;
-  width: 16px;
-  height: 16px;
-  font-size: 10px;
-  color: var(--ide-text-muted);
+  top: 50%;
+  transform: translateY(-50%);
+  display: flex;
+  align-items: center;
+  gap: 1px;
+}
+
+/* Each small icon button inside the input */
+.search-adornment-btn {
+  width: 20px;
+  height: 20px;
+  padding: 0;
+  border: 1px solid transparent;
+  border-radius: 3px;
   background: transparent;
+  color: var(--ide-text-muted);
+  font-size: 13px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  flex-shrink: 0;
+  transition: color 0.1s, background 0.1s, border-color 0.1s;
+}
+
+.search-adornment-btn:hover {
+  color: var(--ide-text);
+  background: var(--ide-hover-bg);
+}
+
+.search-adornment-btn.active {
+  color: var(--ide-accent-fg);
+  background: rgba(88, 166, 255, 0.15);
+  border-color: var(--ide-accent-fg);
 }
 
+.search-adornment-clear {
+  font-size: 10px;
+}
+
+/* ── old .search-options-row / .search-option-btn removed ── */
+
 /* Use .search-panel ancestor for higher specificity than button:not(.pico-btn) */
 .search-panel .search-btn {
   flex-shrink: 0;
@@ -903,11 +954,50 @@ html, body, #mbeditor-root {
   box-sizing: border-box;
 }
 .search-input::placeholder { color: var(--ide-text-muted); }
-.search-input:focus { border-color: var(--ide-accent-fg); }
+.search-input:focus { border-color: var(--ide-border-input); }
+
+/* ── Results area wrapper (positions the loading overlay) ── */
+.search-results-area {
+  position: relative;
+  flex: 1;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+}
 
 .search-results {
   flex: 1;
   overflow-y: auto;
+  transition: filter 0.15s;
+}
+
+.search-results.search-results-blurred {
+  filter: blur(2px);
+  pointer-events: none;
+  user-select: none;
+}
+
+/* Centered circular loading overlay */
+.search-loading-overlay {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  pointer-events: none;
+}
+
+.search-loading-spinner {
+  width: 28px;
+  height: 28px;
+  border: 3px solid var(--ide-border-input);
+  border-top-color: var(--ide-accent-fg);
+  border-radius: 50%;
+  animation: search-spin 0.7s linear infinite;
+}
+
+@keyframes search-spin {
+  to { transform: rotate(360deg); }
 }
 
 .search-result-item {
@@ -1443,6 +1533,55 @@ html, body, #mbeditor-root {
   min-width: 0;
 }
 
+.ide-methods-dropdown {
+  background: #252526;
+  border: 1px solid #454545;
+  border-radius: 4px;
+  box-shadow: 0 4px 14px rgba(0,0,0,0.55);
+  min-width: 200px;
+  max-width: 340px;
+  max-height: 320px;
+  overflow-y: auto;
+  padding: 4px 0;
+}
+
+.ide-methods-dropdown-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 5px 12px;
+  cursor: pointer;
+  color: #ccc;
+  font-size: 12px;
+  font-family: 'JetBrains Mono', 'Fira Code', Consolas, monospace;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.ide-methods-dropdown-item:hover {
+  background: #094771;
+  color: #fff;
+}
+
+.ide-methods-dropdown-line {
+  color: #858585;
+  font-size: 11px;
+  min-width: 28px;
+  text-align: right;
+  flex-shrink: 0;
+  user-select: none;
+}
+
+.ide-methods-dropdown-empty {
+  padding: 8px 12px;
+  color: #858585;
+  font-size: 12px;
+  font-style: italic;
+}
+
+
+
 .project-action-btn {
   width: 24px;
   height: 24px;

data/app/channels/mbeditor/editor_channel.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require "fileutils"
+require "pathname"
+
+module Mbeditor
+  class EditorChannel < ActionCable::Channel::Base
+    STATE_MAX_BYTES    = 1 * 1024 * 1024
+    SAFE_BRANCH_NAME   = /\A[a-zA-Z0-9._\-\/]+\z/
+
+    def subscribed
+      stream_from "mbeditor_editor"
+    end
+
+    def unsubscribed
+      # no-op
+    end
+
+    # Called via WebSocketService.perform('save_state', { state: ... })
+    def save_state(data)
+      Rails.logger.silence do
+        payload = (data["state"] || data).to_json
+        return if payload.bytesize > STATE_MAX_BYTES
+
+        root = workspace_root
+        path = root.join("tmp", "mbeditor_workspace.json")
+        FileUtils.mkdir_p(root.join("tmp"))
+        File.open(path, File::RDWR | File::CREAT) do |f|
+          f.flock(File::LOCK_EX)
+          f.truncate(0)
+          f.rewind
+          f.write(payload)
+        end
+      end
+    rescue StandardError
+      # Never let a state-save failure crash the WebSocket connection
+    end
+
+    # Called via WebSocketService.perform('save_branch_state', { branch: ..., state: ... })
+    def save_branch_state(data)
+      Rails.logger.silence do
+        branch = data["branch"].to_s.strip
+        return unless branch.match?(SAFE_BRANCH_NAME)
+
+        state_data = data["state"]
+        payload_json = state_data.to_json
+        return if payload_json.bytesize > STATE_MAX_BYTES
+
+        root = workspace_root
+        path = root.join("tmp", "mbeditor_branch_states.json")
+        FileUtils.mkdir_p(root.join("tmp"))
+        File.open(path, File::RDWR | File::CREAT) do |f|
+          f.flock(File::LOCK_EX)
+          existing = f.size > 0 ? JSON.parse(f.read) : {}
+          existing[branch] = state_data
+          f.truncate(0)
+          f.rewind
+          f.write(existing.to_json)
+        end
+      end
+    rescue StandardError
+      # Never let a state-save failure crash the WebSocket connection
+    end
+
+    private
+
+    def workspace_root
+      configured = Mbeditor.configuration.workspace_root
+      return Pathname.new(configured.to_s) if configured.present?
+
+      # Fall back to git root, same logic as ApplicationController
+      rails_root = Rails.root.to_s
+      out, _err, status = Open3.capture3("git", "-C", rails_root, "rev-parse", "--show-toplevel")
+      Pathname.new(status.success? && out.strip.present? ? out.strip : rails_root)
+    rescue StandardError
+      Rails.root
+    end
+  end
+end

data/app/controllers/mbeditor/editors_controller.rb

@@ -38,7 +38,8 @@ module Mbeditor
         gitAvailable: git_available?,
         blameAvailable: git_blame_available?,
         redmineEnabled: Mbeditor.configuration.redmine_enabled == true,
-        testAvailable: test_available?
+        testAvailable: test_available?,
+        actionCableEnabled: defined?(ActionCable::Channel::Base) ? true : false
       }
     end
 
@@ -206,6 +207,7 @@ module Mbeditor
       return render_file_too_large(content.bytesize) if content.bytesize > MAX_OPEN_FILE_SIZE_BYTES
 
       File.write(path, content)
+      broadcast_files_changed
       render json: { ok: true, path: relative_path(path) }
     rescue StandardError => e
       render json: { error: e.message }, status: :unprocessable_content
@@ -223,6 +225,7 @@ module Mbeditor
 
       FileUtils.mkdir_p(File.dirname(path))
       File.write(path, content)
+      broadcast_files_changed
 
       render json: { ok: true, type: "file", path: relative_path(path), name: File.basename(path) }
     rescue StandardError => e
@@ -237,6 +240,7 @@ module Mbeditor
       return render json: { error: "Path already exists" }, status: :unprocessable_content if File.exist?(path)
 
       FileUtils.mkdir_p(path)
+      broadcast_files_changed
       render json: { ok: true, type: "folder", path: relative_path(path), name: File.basename(path) }
     rescue StandardError => e
       render json: { error: e.message }, status: :unprocessable_content
@@ -253,6 +257,7 @@ module Mbeditor
 
       FileUtils.mkdir_p(File.dirname(new_path))
       FileUtils.mv(old_path, new_path)
+      broadcast_files_changed
 
       render json: {
         ok: true,
@@ -274,9 +279,11 @@ module Mbeditor
 
       if File.directory?(path)
         FileUtils.rm_rf(path)
+        broadcast_files_changed
         render json: { ok: true, type: "folder", path: relative_path(path) }
       else
         File.delete(path)
+        broadcast_files_changed
         render json: { ok: true, type: "file", path: relative_path(path) }
       end
     rescue StandardError => e
@@ -312,20 +319,23 @@ module Mbeditor
       render json: { error: e.message }, status: :unprocessable_content
     end
 
-    # GET /mbeditor/search?q=...&offset=0&limit=50
+    # GET /mbeditor/search?q=...&offset=0&limit=50&regex=false&match_case=false&whole_word=false
     def search
-      query  = params[:q].to_s.strip
-      offset = [params[:offset].to_i, 0].max
-      limit  = [[params[:limit].to_i > 0 ? params[:limit].to_i : 50, 200].min, 1].max
-      needed = offset + limit + 1   # collect one extra to detect has_more
+      query      = params[:q].to_s.strip
+      offset     = [params[:offset].to_i, 0].max
+      limit      = [[params[:limit].to_i > 0 ? params[:limit].to_i : 50, 200].min, 1].max
+      use_regex  = params[:regex] == 'true'
+      match_case = params[:match_case] == 'true'
+      whole_word = params[:whole_word] == 'true'
+      needed     = offset + limit + 1   # collect one extra to detect has_more
 
       return render json: [] if query.blank?
       return render json: { error: "Query too long" }, status: :bad_request if query.length > 500
 
       # On first page, count total matches in parallel with fetching results.
-      count_thread = offset == 0 ? Thread.new { count_search_results(query) } : nil
+      count_thread = offset == 0 ? Thread.new { count_search_results(query, use_regex: use_regex, match_case: match_case, whole_word: whole_word) } : nil
 
-      results   = stream_search_results(query, needed)
+      results   = stream_search_results(query, needed, use_regex: use_regex, match_case: match_case, whole_word: whole_word)
       has_more  = results.length > offset + limit
       response  = { results: results[offset, limit] || [], has_more: has_more }
       if count_thread
@@ -666,6 +676,14 @@ module Mbeditor
 
     private
 
+    def broadcast_files_changed
+      return unless defined?(ActionCable.server)
+
+      ActionCable.server.broadcast("mbeditor_editor", { type: "files_changed" })
+    rescue StandardError
+      # Never let a broadcast failure affect the HTTP response
+    end
+
     def sanitize_branch_name(branch)
       return nil if branch.blank?
       str = branch.to_s.strip
@@ -701,11 +719,14 @@ module Mbeditor
     # Stream search results using popen so we can stop reading early once we
     # have collected `limit` matches (avoids buffering the entire rg/grep output
     # in memory when searching large codebases for common tokens).
-    def stream_search_results(query, limit)
+    def stream_search_results(query, limit, use_regex: false, match_case: false, whole_word: false)
       results = []
 
       if RG_AVAILABLE
         args = ["rg", "--json", "--no-ignore"]
+        args << "-F" unless use_regex
+        args << "--ignore-case" unless match_case
+        args << "--word-regexp" if whole_word
         excluded_paths.each { |p| args << "--glob=!#{p}" }
         args += ["--", query, workspace_root.to_s]
 
@@ -730,7 +751,10 @@ module Mbeditor
           end
         end
       else
-        args = ["grep", "-rn", "-F"]
+        base_flags = use_regex ? "-E" : "-F"
+        args = ["grep", "-rn", base_flags]
+        args << "-i" unless match_case
+        args << "-w" if whole_word
         excluded_dirnames.select { |d| d.match?(/\A[\w.\/-]+\z/) }.each { |d| args << "--exclude-dir=#{d}" }
         args += [query, workspace_root.to_s]
 
@@ -761,17 +785,23 @@ module Mbeditor
 
     # Count total matching lines across the workspace using rg --count (or grep -c).
     # Fast: rg just counts without extracting context. Runs in a background thread.
-    def count_search_results(query)
+    def count_search_results(query, use_regex: false, match_case: false, whole_word: false)
       total = 0
       if RG_AVAILABLE
         args = ["rg", "--count", "--no-ignore"]
+        args << "-F" unless use_regex
+        args << "--ignore-case" unless match_case
+        args << "--word-regexp" if whole_word
         excluded_paths.each { |p| args << "--glob=!#{p}" }
         args += ["--", query, workspace_root.to_s]
         IO.popen(args, err: File::NULL) do |io|
           io.each_line { |line| total += line.strip.split(":").last.to_i rescue 0 }
         end
       else
-        args = ["grep", "-rc", "-F"]
+        base_flags = use_regex ? "-E" : "-F"
+        args = ["grep", "-rc", base_flags]
+        args << "-i" unless match_case
+        args << "-w" if whole_word
         excluded_dirnames.each { |d| args << "--exclude-dir=#{d}" }
         args += [query, workspace_root.to_s]
         IO.popen(args, err: File::NULL) do |io|

data/app/views/layouts/mbeditor/application.html.erb

@@ -20,6 +20,10 @@
   <%= stylesheet_link_tag "fontawesome.min", media: "all", preload_links_header: false %>
   <%= stylesheet_link_tag "mbeditor/application", media: "all", preload_links_header: false %>
 
+  <!-- ── ActionCable (deferred — sets window.ActionCable for WebSocket service) ── -->
+  <% if defined?(ActionCable::Channel::Base) %>
+  <script defer src="<%= asset_path('actioncable.js') %>"></script>
+  <% end %>
   <!-- ── Vendor JS (deferred — only needed inside Monaco callback) ── -->
   <script defer src="<%= asset_path('react.min.js') %>"></script>
   <script defer src="<%= asset_path('react-dom.min.js') %>"></script>