mbeditor 0.3.8 → 0.4.2

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

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