mbeditor 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 414b42474453e80d58cfafbab5db7d5381dd8ebb22ba1e852a10e720eb246d8a
-  data.tar.gz: 0fbaffaedc1aed6196589975816fb9b009df7f4a810dcc41e3aa428d8e19ee37
+  metadata.gz: 706d2307424a25e3a1b19683326d62de74d98568f755971d6eeb592ad5bae1a4
+  data.tar.gz: 8cfb289f2cc0fd18eb2e8c55ae3a2f766712d68231e695b2e02a1e7778207c2d
 SHA512:
-  metadata.gz: 4bab09aab7ae92d7835838d3c4b240915d0c3ff0c3fc32516a69bdad24430246c86c0da3f508946e9c738ca94a0966d7457903ba9095000a4f01643ca298dbe7
-  data.tar.gz: 522f1e56c9c280ccf9078f9f960ad1c3e3f1d1f99fafc2e9d80c18d539cd6ba409d18cb596b434037e551403623b74c54c7f2f4dfe8c03c90760eebe8b51862c
+  metadata.gz: 8b691b32511249206e9af0e7ceeb6b26f9cf5bf63cd4b035e8b7fa9411ba05480b4c8795cdcf7a20ffefd536803a61e79c84edb7874fad7d7308aa4dca622b2f
+  data.tar.gz: 41c25d7ad6113629fd50267ceff4e9f07490627f9fc2a8eba2fc2804743e8ba7e3c3c6bedc30c4a225e6a177c3354b1282a88df874086bf2e969bced2d20ea65

data/README.md

@@ -47,7 +47,7 @@ mount Mbeditor::Engine, at: "/mbeditor"
 Use a single initializer to set the engine options you need:
 
 ```ruby
-MBEditor.configure do |config|
+Mbeditor.configure do |config|
   config.allowed_environments = [:development]
   # config.workspace_root = Rails.root
   config.excluded_paths = %w[.git tmp log node_modules .bundle coverage vendor/bundle]
@@ -70,6 +70,17 @@ Available options:
 - `redmine_url` sets the Redmine base URL. Required when `redmine_enabled` is `true`.
 - `redmine_api_key` sets the Redmine API key. Required when `redmine_enabled` is `true`.
 
+## Keyboard Shortcuts
+
+| Shortcut | Action |
+|----------|--------|
+| `Ctrl+P` | Quick-open file by name |
+| `Ctrl+S` | Save the active file |
+| `Ctrl+Shift+S` | Save all dirty files |
+| `Alt+Shift+F` | Format the active file |
+| `Ctrl+Shift+G` | Toggle the git panel |
+| `Ctrl+Z` / `Ctrl+Y` | Undo / Redo (Monaco built-in) |
+
 ## Host Requirements (Optional)
 The gem keeps host/tooling responsibilities in the host app:
 - `rubocop` and `rubocop-rails` gems (optional, required for Ruby lint/format endpoints)
@@ -99,6 +110,10 @@ The gem includes syntax highlighting for common Rails and React development file
 
 These language modules are packaged locally with the gem for true offline operation. No network fallback is needed—all highlighting works without internet connectivity.
 
+## Asset Pipeline
+
+Mbeditor requires **Sprockets** (`sprockets-rails >= 3.4`). Host apps using **Propshaft** as their asset pipeline are not supported — the engine depends on Sprockets directives to load its JavaScript and CSS assets.
+
 ## Development
 
 A minimal dummy Rails app is included for local development and testing:

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

@@ -15,9 +15,12 @@ var EditorPanel = function EditorPanel(_ref) {
   var onContentChange = _ref.onContentChange;
   var markers = _ref.markers;
   var gitAvailable = _ref.gitAvailable === true;
+  var onFormat = _ref.onFormat;
+  var editorPrefs = _ref.editorPrefs || {};
 
   var editorRef = useRef(null);
   var monacoRef = useRef(null);
+  var latestContentRef = useRef('');
 
   var _useState = useState('');
   var _useState2 = _slicedToArray(_useState, 2);
@@ -42,6 +45,9 @@ var EditorPanel = function EditorPanel(_ref) {
   var blameDecorationsRef = useRef([]);
   var blameZoneIdsRef = useRef([]);
 
+  var onFormatRef = useRef(onFormat);
+  onFormatRef.current = onFormat;
+
   var clearBlameZones = function clearBlameZones(editor) {
     if (!editor) return;
     if (blameZoneIdsRef.current.length === 0) return;
@@ -116,15 +122,15 @@ var EditorPanel = function EditorPanel(_ref) {
     var editor = window.monaco.editor.create(editorRef.current, {
       value: tab.content,
       language: language,
-      theme: 'vs-dark',
+      theme: editorPrefs.theme || 'vs-dark',
       automaticLayout: true,
       minimap: { enabled: false },
       renderLineHighlight: 'none',
       bracketPairColorization: { enabled: true },
-      fontFamily: "'JetBrains Mono', 'Fira Code', Consolas, 'Courier New', monospace",
-      fontSize: 13,
-      tabSize: 4,
-      insertSpaces: true,
+      fontFamily: editorPrefs.fontFamily || "'JetBrains Mono', 'Fira Code', Consolas, 'Courier New', monospace",
+      fontSize: editorPrefs.fontSize || 13,
+      tabSize: editorPrefs.tabSize || 4,
+      insertSpaces: typeof editorPrefs.insertSpaces === 'boolean' ? editorPrefs.insertSpaces : false,
       wordWrap: 'on',
       linkedEditing: true, // Enables Auto-Rename Tag natively!
       fixedOverflowWidgets: true,
@@ -143,7 +149,20 @@ var EditorPanel = function EditorPanel(_ref) {
     monacoRef.current = editor;
     window.__mbeditorActiveEditor = editor;
 
+    // Stash the workspace-relative path on the model so code-action providers
+    // can identify which file they are operating on without needing React state.
     var modelObj = editor.getModel();
+    if (modelObj) modelObj._mbeditorPath = tab.path;
+
+    var formatActionDisposable = editor.addAction({
+      id: 'mbeditor.formatDocument',
+      label: 'Format Document',
+      contextMenuGroupId: '1_modification',
+      contextMenuOrder: 1.5,
+      run: function() {
+        if (onFormatRef.current) onFormatRef.current();
+      }
+    });
 
     var editorPluginDisposable = null;
     if (window.MbeditorEditorPlugins && window.MbeditorEditorPlugins.attachEditorFeatures) {
@@ -153,7 +172,7 @@ var EditorPanel = function EditorPanel(_ref) {
     // Change listener
     var contentDisposable = modelObj.onDidChangeContent(function (e) {
       var val = editor.getValue();
-      var currentContent = monacoRef.current._latestContent || '';
+      var currentContent = latestContentRef.current;
 
       // Normalize before comparing to prevent false positive dirty edits
       var vNorm = val.replace(/\r\n/g, '\n');
@@ -171,6 +190,7 @@ var EditorPanel = function EditorPanel(_ref) {
         window.__mbeditorActiveEditor = null;
       }
       if (editorPluginDisposable) editorPluginDisposable.dispose();
+      formatActionDisposable.dispose();
       contentDisposable.dispose();
       editor.dispose();
     };
@@ -179,7 +199,7 @@ var EditorPanel = function EditorPanel(_ref) {
   // Listen for external content changes (e.g. after Format/Save/Load)
   useEffect(function () {
     var editor = monacoRef.current;
-    if (editor) editor._latestContent = tab.content; // update ref for closure
+    if (editor) latestContentRef.current = tab.content; // keep ref in sync for closure
 
     if (editor && editor.getValue() !== tab.content) {
       if (typeof tab.content !== 'string') return;
@@ -207,6 +227,21 @@ var EditorPanel = function EditorPanel(_ref) {
     }
   }, [tab.content]);
 
+  // Apply editorPrefs changes to a running editor without remounting
+  useEffect(function () {
+    if (!window.monaco) return;
+    var theme = editorPrefs.theme || 'vs-dark';
+    window.monaco.editor.setTheme(theme);
+    if (monacoRef.current) {
+      monacoRef.current.updateOptions({
+        fontSize: editorPrefs.fontSize || 13,
+        fontFamily: editorPrefs.fontFamily || "'JetBrains Mono', 'Fira Code', Consolas, 'Courier New', monospace",
+        tabSize: editorPrefs.tabSize || 4,
+        insertSpaces: typeof editorPrefs.insertSpaces === 'boolean' ? editorPrefs.insertSpaces : false
+      });
+    }
+  }, [editorPrefs]);
+
   // Jump to line if specified
   useEffect(function () {
     if (tab.gotoLine && monacoRef.current) {
@@ -230,8 +265,13 @@ var EditorPanel = function EditorPanel(_ref) {
       var model = monacoRef.current.getModel();
       if (model) {
         var monacoMarkers = markers.map(function (m) {
+          var sev = m.severity === 'error'
+            ? window.monaco.MarkerSeverity.Error
+            : window.monaco.MarkerSeverity.Warning;
           return {
-            severity: m.severity === 'error' ? window.monaco.MarkerSeverity.Error : window.monaco.MarkerSeverity.Warning,
+            severity: sev,
+            source: 'rubocop',
+            code: m.copName || '',
             message: m.message,
             startLineNumber: m.startLine,
             startColumn: m.startCol,
@@ -240,6 +280,11 @@ var EditorPanel = function EditorPanel(_ref) {
           };
         });
         window.monaco.editor.setModelMarkers(model, 'rubocop', monacoMarkers);
+        // Track which cops are autocorrectable so the quick-fix provider can
+        // skip lightbulbs for cops that can never be machine-fixed.
+        model._mbeditorCorrectableCops = new Set(
+          markers.filter(function(m) { return m.correctable && m.copName; }).map(function(m) { return m.copName; })
+        );
       }
     }
   }, [markers, tab.id]);
@@ -393,7 +438,7 @@ var EditorPanel = function EditorPanel(_ref) {
   }, [markdownContent, isMarkdown]);
 
   if (tab.isDiff) {
-    var isDiffDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches || true;
+    var isDiffDark = (editorPrefs.theme || 'vs-dark') !== 'vs' && (editorPrefs.theme || 'vs-dark') !== 'hc-light';
     return React.createElement(window.DiffViewer || DiffViewer, {
       path: tab.repoPath || tab.path,
       original: tab.diffOriginal || "",

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

@@ -1,6 +1,7 @@
 var GitPanel = function GitPanel(_ref) {
   var gitInfo = _ref.gitInfo;
   var error = _ref.error;
+  var redmineEnabled = _ref.redmineEnabled;
   var onOpenFile = _ref.onOpenFile;
   var onOpenDiff = _ref.onOpenDiff;
   var onOpenAllChanges = _ref.onOpenAllChanges;
@@ -8,6 +9,7 @@ var GitPanel = function GitPanel(_ref) {
   var onClose = _ref.onClose;
 
   var useState = React.useState;
+  var useEffect = React.useEffect;
 
   var _s1 = useState(true);  var localExpanded  = _s1[0]; var setLocalExpanded  = _s1[1];
   var _s2 = useState(true);  var branchExpanded = _s2[0]; var setBranchExpanded = _s2[1];
@@ -18,6 +20,12 @@ var GitPanel = function GitPanel(_ref) {
   var _s5 = useState({});    var commitFiles = _s5[0]; var setCommitFiles = _s5[1];
   var _s6 = useState(false); var refreshing = _s6[0]; var setRefreshing = _s6[1];
 
+  // ── Redmine state ───────────────────────────────────────────────────────────
+  var _sr1 = useState(null);   var redmineIssue   = _sr1[0]; var setRedmineIssue   = _sr1[1];
+  var _sr2 = useState(null);   var redmineError   = _sr2[0]; var setRedmineError   = _sr2[1];
+  var _sr3 = useState(false);  var redmineLoading = _sr3[0]; var setRedmineLoading = _sr3[1];
+  var _sr4 = useState(true);   var redmineExpanded = _sr4[0]; var setRedmineExpanded = _sr4[1];
+
   var workingTree     = gitInfo && gitInfo.workingTree     || [];
   var unpushedFiles   = gitInfo && gitInfo.unpushedFiles   || [];
   var unpushedCommits = gitInfo && gitInfo.unpushedCommits || [];
@@ -32,6 +40,39 @@ var GitPanel = function GitPanel(_ref) {
     return Object.assign({}, c, { isLocal: !!localHashes[c.hash] });
   });
 
+  // Extract the first Redmine ticket ID (#123) from recent branch commit messages
+  var redmineTicketId = null;
+  if (redmineEnabled) {
+    for (var ci = 0; ci < branchCommits.length; ci++) {
+      var titleMatch = branchCommits[ci] && branchCommits[ci].title && branchCommits[ci].title.match(/#(\d+)/);
+      if (titleMatch) { redmineTicketId = titleMatch[1]; break; }
+    }
+  }
+
+  // Fetch Redmine issue whenever the ticket ID changes
+  useEffect(function () {
+    if (!redmineEnabled) return;
+    if (!redmineTicketId) {
+      setRedmineIssue(null);
+      setRedmineError(null);
+      return;
+    }
+    setRedmineLoading(true);
+    setRedmineIssue(null);
+    setRedmineError(null);
+    var basePath = (window.MBEDITOR_BASE_PATH || '/mbeditor').replace(/\/$/, '');
+    axios.get(basePath + '/redmine/issue/' + redmineTicketId)
+      .then(function (res) {
+        setRedmineIssue(res.data);
+        setRedmineLoading(false);
+      })
+      .catch(function (err) {
+        var msg = (err.response && err.response.data && err.response.data.error) || err.message || 'Failed to load Redmine issue.';
+        setRedmineError(msg);
+        setRedmineLoading(false);
+      });
+  }, [redmineEnabled, redmineTicketId]);
+
   var statusMeta = function statusMeta(rawStatus) {
     var raw = (rawStatus || '').trim();
     if (raw === '??') return { badge: 'NEW', cssKey: 'A', description: 'Untracked' };
@@ -307,6 +348,59 @@ var GitPanel = function GitPanel(_ref) {
 
     error && React.createElement('div', { className: 'git-error' }, error),
 
+    // ── Redmine Issue Section ───────────────────────────────────────────────
+    redmineEnabled && React.createElement(
+      'div',
+      { className: 'git-section ' + (redmineExpanded ? 'expanded' : '') + ' git-section--redmine' },
+      React.createElement(
+        'div',
+        { className: 'git-section-title' },
+        React.createElement(
+          'div',
+          { className: 'git-section-title-main hoverable', onClick: function () { setRedmineExpanded(!redmineExpanded); } },
+          React.createElement(
+            'span',
+            { className: 'git-redmine-section-label' },
+            React.createElement('i', { className: 'fas ' + (redmineExpanded ? 'fa-chevron-down' : 'fa-chevron-right'), style: { width: '14px', fontSize: '10px' } }),
+            '\u2002Redmine',
+            redmineTicketId && React.createElement('span', { className: 'git-section-count', style: { marginLeft: '4px' } }, '#' + redmineTicketId)
+          ),
+          redmineIssue && React.createElement('span', { className: 'redmine-badge redmine-badge--section' }, redmineIssue.status)
+        )
+      ),
+      redmineExpanded && React.createElement(
+        'div',
+        { className: 'git-redmine-content' },
+        redmineLoading
+          ? React.createElement('div', { className: 'git-empty' },
+              React.createElement('i', { className: 'fas fa-spinner fa-spin', style: { marginRight: '6px' } }),
+              'Loading issue\u2026'
+            )
+          : !redmineTicketId
+            ? React.createElement('div', { className: 'git-empty' }, 'No matching ticket found in branch commits.')
+            : redmineError
+              ? React.createElement('div', { className: 'git-redmine-error' },
+                  React.createElement('i', { className: 'fas fa-exclamation-circle', style: { marginRight: '6px', color: '#f48771' } }),
+                  redmineError
+                )
+              : redmineIssue
+                ? React.createElement(
+                      'div',
+                      { className: 'git-redmine-issue' },
+                      React.createElement('div', { className: 'git-redmine-title' }, redmineIssue.title),
+                      redmineIssue.description
+                        ? React.createElement('div', { className: 'git-redmine-desc' }, redmineIssue.description)
+                        : null,
+                      React.createElement(
+                        'div',
+                        { className: 'git-redmine-footer' },
+                        redmineIssue.author || ''
+                      )
+                  )
+                : null
+        )
+    ),
+
     // ── Section 1: Local Changes ────────────────────────────────────────────
     React.createElement(
       'div',

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

@@ -18,6 +18,14 @@ var GIT_PANEL_MIN_WIDTH = 280;
 var PANE_MIN_WIDTH_PERCENT = 20;
 var PANE_MAX_WIDTH_PERCENT = 80;
 
+var DEFAULT_EDITOR_PREFS = {
+  theme: 'vs-dark',
+  fontSize: 13,
+  fontFamily: "'JetBrains Mono', 'Fira Code', Consolas, 'Courier New', monospace",
+  tabSize: 4,
+  insertSpaces: false
+};
+
 var SidebarActionButton = function SidebarActionButton(_ref) {
   var title = _ref.title;
   var iconClass = _ref.iconClass;
@@ -247,6 +255,16 @@ var MbeditorApp = function MbeditorApp() {
   var gitAvailable = _useState18e2[0];
   var setGitAvailable = _useState18e2[1];
 
+  var _useState18f = useState(false);
+  var _useState18f2 = _slicedToArray(_useState18f, 2);
+  var redmineEnabled = _useState18f2[0];
+  var setRedmineEnabled = _useState18f2[1];
+
+  var _useState18p = useState(DEFAULT_EDITOR_PREFS);
+  var _useState18p2 = _slicedToArray(_useState18p, 2);
+  var editorPrefs = _useState18p2[0];
+  var setEditorPrefs = _useState18p2[1];
+
   var _useState19 = useState({
     openEditors: false,
     projects: false
@@ -461,6 +479,7 @@ var MbeditorApp = function MbeditorApp() {
       }
       if (workspace && typeof workspace.rubocopAvailable === 'boolean') {
         setRubocopAvailable(workspace.rubocopAvailable);
+        window.MBEDITOR_RUBOCOP_AVAILABLE = workspace.rubocopAvailable;
       }
       if (workspace && typeof workspace.hamlLintAvailable === 'boolean') {
         setHamlLintAvailable(workspace.hamlLintAvailable);
@@ -468,6 +487,9 @@ var MbeditorApp = function MbeditorApp() {
       if (workspace && typeof workspace.gitAvailable === 'boolean') {
         setGitAvailable(workspace.gitAvailable);
       }
+      if (workspace && typeof workspace.redmineEnabled === 'boolean') {
+        setRedmineEnabled(workspace.redmineEnabled);
+      }
     });
     GitService.fetchStatus();
 
@@ -521,6 +543,9 @@ var MbeditorApp = function MbeditorApp() {
           if (typeof savedState.gitPanelWidth === 'number') {
             setGitPanelWidth(savedState.gitPanelWidth);
           }
+          if (savedState.editorPrefs && typeof savedState.editorPrefs === 'object') {
+            setEditorPrefs(Object.assign({}, DEFAULT_EDITOR_PREFS, savedState.editorPrefs));
+          }
         });
       }
     });
@@ -546,6 +571,18 @@ var MbeditorApp = function MbeditorApp() {
           }
         })();
       }
+      if ((e.ctrlKey || e.metaKey) && e.shiftKey && e.key === 'S') {
+        e.preventDefault();
+        handleSaveAll();
+      }
+      if (e.altKey && e.shiftKey && e.key === 'F') {
+        e.preventDefault();
+        handleFormat();
+      }
+      if ((e.ctrlKey || e.metaKey) && e.shiftKey && e.key === 'G') {
+        e.preventDefault();
+        toggleGitPanel();
+      }
       if (e.key === 'Escape') {
         setContextMenu(null);
         setShowHelp(false);
@@ -790,7 +827,7 @@ var MbeditorApp = function MbeditorApp() {
         return {
           id: p.id,
           activeTabId: p.activeTabId,
-          tabs: p.tabs.filter(function(t) { return !t.isCombinedDiff; }).map(function (t) {
+          tabs: p.tabs.filter(function(t) { return !t.isCombinedDiff && !t.isSettings; }).map(function (t) {
             return {
               id: t.id,
               path: t.path,
@@ -807,17 +844,21 @@ var MbeditorApp = function MbeditorApp() {
           })
         };
       });
-      FileService.saveState({ panes: lightweightPanes, focusedPaneId: st.focusedPaneId, collapsedSections: collapsedSections, expandedDirs: expandedDirs, showGitPanel: showGitPanel, gitPanelWidth: gitPanelWidth });
+      FileService.saveState({ panes: lightweightPanes, focusedPaneId: st.focusedPaneId, collapsedSections: collapsedSections, expandedDirs: expandedDirs, showGitPanel: showGitPanel, gitPanelWidth: gitPanelWidth, editorPrefs: editorPrefs });
     }, 1000);
     return function () {
       return clearTimeout(timeoutId);
     };
-  }, [state.panes, state.focusedPaneId, collapsedSections, expandedDirs, showGitPanel, gitPanelWidth]);
+  }, [state.panes, state.focusedPaneId, collapsedSections, expandedDirs, showGitPanel, gitPanelWidth, editorPrefs]);
+
+  useEffect(function() {
+    document.documentElement.setAttribute('data-theme', editorPrefs.theme || 'vs-dark');
+  }, [editorPrefs.theme]);
 
   var focusedPane = state.panes.find(function (p) {
     return p.id === state.focusedPaneId;
-  }) || state.panes[0];
-  var activeTab = focusedPane.tabs.find(function (t) {
+  }) || state.panes[0] || null;
+  var activeTab = focusedPane && focusedPane.tabs.find(function (t) {
     return t.id === focusedPane.activeTabId;
   });
 
@@ -851,12 +892,12 @@ var MbeditorApp = function MbeditorApp() {
     if (isRubyPath(activeTab.path) && !rubocopAvailable) return;
     if (activeTab.path.endsWith('.haml') && !hamlLintAvailable) return;
 
-    _debouncedAutoLint(activeTab, focusedPane.id);
+    _debouncedAutoLint(activeTab, focusedPane ? focusedPane.id : null);
 
     return function () {
       _debouncedAutoLint.cancel();
     };
-  }, [focusedPane.id, activeTab ? activeTab.id : null, activeTab ? activeTab.content : null, rubocopAvailable, hamlLintAvailable]);
+  }, [focusedPane ? focusedPane.id : null, activeTab ? activeTab.id : null, activeTab ? activeTab.content : null, rubocopAvailable, hamlLintAvailable]);
 
   var handleOpenCommitGraph = function handleOpenCommitGraph() {
     var paneId = state.focusedPaneId || 1;
@@ -1072,6 +1113,9 @@ var MbeditorApp = function MbeditorApp() {
     }
   };
 
+  var onFormatRef = useRef(handleFormat);
+  onFormatRef.current = handleFormat;
+
   var _debouncedSearch = useRef(window._.debounce(function (q) {
     if (!q.trim()) {
       searchRequestIdRef.current += 1;
@@ -1084,7 +1128,8 @@ var MbeditorApp = function MbeditorApp() {
     EditorStore.setStatus("Searching project...", "info");
     SearchService.projectSearch(q).then(function (res) {
       if (searchRequestIdRef.current === requestId) {
-        EditorStore.setStatus("Found " + res.length + " results", "success");
+        var count = res && res.results ? res.results.length : (Array.isArray(res) ? res.length : 0);
+        EditorStore.setStatus("Found " + count + " result" + (count !== 1 ? "s" : ""), "success");
       }
     }).finally(function () {
       if (searchRequestIdRef.current === requestId) {
@@ -1514,6 +1559,36 @@ var MbeditorApp = function MbeditorApp() {
     });
   };
 
+  function openSettingsTab() {
+    var st = EditorStore.getState();
+    var foundPaneId = null;
+    var foundTab = null;
+    st.panes.forEach(function(p) {
+      if (!foundTab) {
+        var t = p.tabs.find(function(tab) { return tab.path === '__settings__'; });
+        if (t) { foundTab = t; foundPaneId = p.id; }
+      }
+    });
+    if (foundTab) {
+      var newPanes = st.panes.map(function(p) {
+        if (p.id === foundPaneId) return Object.assign({}, p, { activeTabId: '__settings__' });
+        return p;
+      });
+      EditorStore.setState({ panes: newPanes, focusedPaneId: foundPaneId, activeTabId: '__settings__' });
+      return;
+    }
+    var paneId = st.focusedPaneId;
+    var pane = st.panes.find(function(p) { return p.id === paneId; }) || st.panes[0];
+    if (!pane) return;
+    paneId = pane.id;
+    var newTab = { id: '__settings__', path: '__settings__', name: 'Settings', dirty: false, content: '', isSettings: true };
+    var newPanes2 = st.panes.map(function(p) {
+      if (p.id === paneId) return Object.assign({}, p, { tabs: p.tabs.concat(newTab), activeTabId: '__settings__' });
+      return p;
+    });
+    EditorStore.setState({ panes: newPanes2, focusedPaneId: paneId, activeTabId: '__settings__' });
+  }
+
   return React.createElement(
     "div",
     { className: "ide-shell" },
@@ -1603,6 +1678,11 @@ var MbeditorApp = function MbeditorApp() {
                 return setActiveSidebarTab('search');
               } },
             "SEARCH"
+          ),
+          React.createElement(
+            "button",
+            { type: "button", className: "ide-sidebar-tab ide-sidebar-tab-icon", title: "Editor Preferences", onClick: openSettingsTab },
+            React.createElement("i", { className: "fas fa-cog" })
           )
         ),
         activeSidebarTab === 'explorer' && React.createElement(
@@ -1825,7 +1905,7 @@ var MbeditorApp = function MbeditorApp() {
               { className: "search-results-meta" },
               state.searchResults.length,
               " result" + (state.searchResults.length !== 1 ? "s" : ""),
-              state.searchResults.length >= 30 && React.createElement(
+              state.searchCapped && React.createElement(
                 "span",
                 { className: "search-results-capped" },
                 " — refine query to see more"
@@ -1944,13 +2024,94 @@ var MbeditorApp = function MbeditorApp() {
                   commits: pActiveTab.commits || [],
                   onSelectCommit: handleSelectCommit
                 });
+              } else if (pActiveTab.isSettings) {
+                content = React.createElement(
+                  'div',
+                  { className: 'ide-settings-tab-content' },
+                  React.createElement(
+                    'div',
+                    { className: 'ide-settings-body' },
+                    React.createElement(
+                      'label', { className: 'ide-settings-row' },
+                      React.createElement('span', { className: 'ide-settings-label' }, 'Theme'),
+                      React.createElement(
+                        'select', {
+                          className: 'ide-settings-select',
+                          value: editorPrefs.theme || 'vs-dark',
+                          onChange: function(e) { setEditorPrefs(function(p) { return Object.assign({}, p, { theme: e.target.value }); }); }
+                        },
+                        React.createElement('option', { value: 'vs-dark' }, 'Dark (vs-dark)'),
+                        React.createElement('option', { value: 'vs' }, 'Light (vs)'),
+                        React.createElement('option', { value: 'hc-black' }, 'High Contrast Dark'),
+                        React.createElement('option', { value: 'hc-light' }, 'High Contrast Light')
+                      )
+                    ),
+                    React.createElement(
+                      'label', { className: 'ide-settings-row' },
+                      React.createElement('span', { className: 'ide-settings-label' }, 'Font size'),
+                      React.createElement('input', {
+                        type: 'number', min: '8', max: '32', step: '1',
+                        className: 'ide-settings-input',
+                        value: editorPrefs.fontSize || 13,
+                        onChange: function(e) {
+                          var v = parseInt(e.target.value, 10);
+                          if (v >= 8 && v <= 32) setEditorPrefs(function(p) { return Object.assign({}, p, { fontSize: v }); });
+                        }
+                      })
+                    ),
+                    React.createElement(
+                      'label', { className: 'ide-settings-row' },
+                      React.createElement('span', { className: 'ide-settings-label' }, 'Tab size'),
+                      React.createElement('input', {
+                        type: 'number', min: '1', max: '8', step: '1',
+                        className: 'ide-settings-input',
+                        value: editorPrefs.tabSize || 1,
+                        onChange: function(e) {
+                          var v = parseInt(e.target.value, 10);
+                          if (v >= 1 && v <= 8) setEditorPrefs(function(p) { return Object.assign({}, p, { tabSize: v }); });
+                        }
+                      })
+                    ),
+                    React.createElement(
+                      'label', { className: 'ide-settings-row ide-settings-row-check' },
+                      React.createElement('span', { className: 'ide-settings-label' }, 'Use spaces'),
+                      React.createElement('input', {
+                        type: 'checkbox',
+                        className: 'ide-settings-checkbox',
+                        checked: !!(editorPrefs.insertSpaces),
+                        onChange: function(e) { setEditorPrefs(function(p) { return Object.assign({}, p, { insertSpaces: e.target.checked }); }); }
+                      })
+                    ),
+                    React.createElement(
+                      'label', { className: 'ide-settings-row' },
+                      React.createElement('span', { className: 'ide-settings-label' }, 'Font family'),
+                      React.createElement('input', {
+                        type: 'text',
+                        className: 'ide-settings-input ide-settings-input-wide',
+                        value: editorPrefs.fontFamily || "'JetBrains Mono', 'Fira Code', Consolas, 'Courier New', monospace",
+                        onChange: function(e) { setEditorPrefs(function(p) { return Object.assign({}, p, { fontFamily: e.target.value }); }); }
+                      })
+                    ),
+                    React.createElement(
+                      'button',
+                      {
+                        className: 'ide-settings-reset-btn',
+                        type: 'button',
+                        onClick: function() { setEditorPrefs(Object.assign({}, DEFAULT_EDITOR_PREFS)); }
+                      },
+                      React.createElement('i', { className: 'fas fa-undo', style: { marginRight: 6 } }),
+                      'Reset to defaults'
+                    )
+                  )
+                );
               } else if (pActiveTab.isDiff) {
+                var isDiffDark = (editorPrefs.theme || 'vs-dark') !== 'vs' && (editorPrefs.theme || 'vs-dark') !== 'hc-light';
                 content = React.createElement(window.DiffViewer || DiffViewer, {
                   key: pActiveTab.id,
                   path: pActiveTab.path,
                   original: pActiveTab.diffOriginal || '',
                   modified: pActiveTab.diffModified || '',
-                  isDark: true,
+                  isDark: isDiffDark,
                   onClose: function() { requestCloseTab(pane.id, pActiveTab.id); }
                 });
               } else {
@@ -1960,6 +2121,8 @@ var MbeditorApp = function MbeditorApp() {
                   paneId: pane.id,
                   markers: markers[pActiveTab.id] || [],
                   gitAvailable: gitAvailable,
+                  editorPrefs: editorPrefs,
+                  onFormat: function() { onFormatRef.current(); },
                   onContentChange: function onContentChange(val) {
                     var st = EditorStore.getState();
                     var cp = st.panes.find(function(p) { return p.id === pane.id; });
@@ -2069,6 +2232,18 @@ var MbeditorApp = function MbeditorApp() {
                             React.createElement("td", null, React.createElement("kbd", null, "Ctrl+S")),
                             React.createElement("td", null, "Save the active file")
                           ),
+                          React.createElement("tr", null,
+                            React.createElement("td", null, React.createElement("kbd", null, "Ctrl+Shift+S")),
+                            React.createElement("td", null, "Save all dirty files")
+                          ),
+                          React.createElement("tr", null,
+                            React.createElement("td", null, React.createElement("kbd", null, "Alt+Shift+F")),
+                            React.createElement("td", null, "Format the active file")
+                          ),
+                          React.createElement("tr", null,
+                            React.createElement("td", null, React.createElement("kbd", null, "Ctrl+Shift+G")),
+                            React.createElement("td", null, "Toggle git panel")
+                          ),
                           React.createElement("tr", null,
                             React.createElement("td", null, React.createElement("kbd", null, "Ctrl+Z\u00a0/\u00a0Ctrl+Y")),
                             React.createElement("td", null, "Undo / Redo")
@@ -2123,6 +2298,7 @@ var MbeditorApp = function MbeditorApp() {
         React.createElement(window.GitPanel || GitPanel, {
           gitInfo: state.gitInfo,
           error: state.gitInfoError,
+          redmineEnabled: redmineEnabled,
           onRefresh: function () { return GitService.fetchInfo(); },
           onClose: function () { return setShowGitPanel(false); },
           onOpenFile: openFileFromGitPanel,