mbeditor 0.3.5 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ef99d6b248b955a0fd47470dc28646989bed626bede03c49f0cc8561a167eae
-  data.tar.gz: f9440c48c65d3050c5ba0c225d90bcb69d7e640f498d5bfc2d0e324d53b488cd
+  metadata.gz: caf178914c2be95307a23ee24744dabd50f12c8597c69eddf814f63895e17433
+  data.tar.gz: 0353fc7e791cf1fff4c739fddf59d0a1ba8259353a4147b738824275c4bca55f
 SHA512:
-  metadata.gz: 4abe3badb824dc0961c25e824339efe649c63f11a43985a580ae9df9d96e7b12bb92e8c401fe1e1fe3f3f5b5f6ee0d82b9ea4edbc75f7ea535fa60d0a20aa1f5
-  data.tar.gz: 2072b4c350db09d8bd29fc16e35429583fa258320a474b02de907ec82dbd04d81f0cd1933ca6cc82bd4f4673ecf8bc87d55a6e8f8e4dd0686e77d1fcdd0a3a8b
+  metadata.gz: 772a81a73df9b7ca2bd517193ee0178fb9843ea934c7bbc05157e84794596c62b98f34dbfa50004e2c8ee1abeda1e121e8936350826b1a213031952c1ef10563
+  data.tar.gz: 705bc59cb210934c909b35819d41c98ecd3e858a153a25efa6587e530c51faa0821aa39932c155c4860c7335a0c70d7f06302e4c6a5b7cb7f1214911bb1f7fbe

data/CHANGELOG.md

@@ -5,6 +5,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.8] - 2026-04-16
+
+### Fixed
+- Prevented Emmet's custom Tab action from intercepting selected text, so multi-line selections are no longer replaced when pressing Tab/Shift+Tab in markup editors.
+
+### Added
+- Added a system regression test to ensure multi-line selections in JSX are not collapsed by the Emmet Tab integration.
+
+## [0.3.7] - 2026-04-16
+
+### Fixed
+- Corrected the `destroy_path` missing-path controller test to expect `200 OK` for idempotent DELETE behavior, which unblocks the tag-based publish workflow for this release.
+
+## [0.3.6] - 2026-04-15
+
+### Fixed
+- Multi-file/folder delete now deduplicates child paths covered by a selected ancestor directory, preventing redundant requests and Rails 404 console errors.
+- Switched multi-delete from `Promise.all` to `Promise.allSettled` so all deletions complete before checking for failures rather than bailing on the first rejection.
+- `destroy_path` controller action is now idempotent — returns 200 when the path is already gone, matching correct REST DELETE semantics.
+
 ## [0.2.8] - 2026-04-15
 
 ### Changed

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

@@ -451,9 +451,32 @@ var EditorPanel = function EditorPanel(_ref) {
     if (language === 'image') return;
 
     lastAppliedExternalVersionRef.current = -1;
+
+    // Look up or create a persistent Monaco model for this file path.
+    // Reusing the model across tab switches preserves the undo/redo history.
+    if (!window.__mbeditorModels) window.__mbeditorModels = {};
+    var _modelEntry = window.__mbeditorModels[tab.path];
+    var _reusingModel = false;
+    var modelObj;
+    if (_modelEntry && _modelEntry.model && !_modelEntry.model.isDisposed()) {
+      modelObj = _modelEntry.model;
+      _reusingModel = true;
+      // Re-apply language in case it changed (e.g. file renamed)
+      if (modelObj.getLanguageId() !== language) {
+        window.monaco.editor.setModelLanguage(modelObj, language);
+      }
+    } else {
+      modelObj = window.monaco.editor.createModel(tab.content, language);
+      window.__mbeditorModels[tab.path] = { model: modelObj, aviBase: null, aviMax: null };
+      _modelEntry = window.__mbeditorModels[tab.path];
+    }
+
+    // Sync latestContentRef from the actual model content so the onDidChangeContent
+    // handler doesn't fire a spurious onContentChange call on the first keystroke.
+    latestContentRef.current = _reusingModel ? modelObj.getValue() : (tab.content || '');
+
     var editor = window.monaco.editor.create(editorRef.current, {
-      value: tab.content,
-      language: language,
+      model: modelObj,
       theme: editorPrefs.theme || 'vs-dark',
       automaticLayout: true,
       minimap: { enabled: !!(editorPrefs.minimap) },
@@ -487,7 +510,6 @@ var EditorPanel = function EditorPanel(_ref) {
 
     // 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({
@@ -547,10 +569,17 @@ var EditorPanel = function EditorPanel(_ref) {
 
     // Track undo/redo availability via Monaco's alternativeVersionId.
     // AVI goes up on every edit, down on undo, back up on redo.
+    // When reusing an existing model, restore the saved AVI thresholds so the
+    // canUndo/canRedo buttons reflect the real state of the undo stack.
     var avi = modelObj.getAlternativeVersionId();
-    aviBaseRef.current = avi;
-    aviMaxRef.current = avi;
-    EditorStore.setState({ canUndo: false, canRedo: false });
+    if (_reusingModel && _modelEntry.aviBase !== null) {
+      aviBaseRef.current = _modelEntry.aviBase;
+      aviMaxRef.current = _modelEntry.aviMax !== null ? _modelEntry.aviMax : avi;
+    } else {
+      aviBaseRef.current = avi;
+      aviMaxRef.current = avi;
+    }
+    EditorStore.setState({ canUndo: avi > aviBaseRef.current, canRedo: avi < aviMaxRef.current });
 
     var contentDisposable = modelObj.onDidChangeContent(function (e) {
       var currentAvi = modelObj.getAlternativeVersionId();
@@ -599,6 +628,12 @@ var EditorPanel = function EditorPanel(_ref) {
       clearBlameZones(editor);
       clearTestZones(editor);
       TabManager.saveTabViewState(tab.id, editor.saveViewState());
+      // Persist AVI thresholds on the model entry so undo/redo state is correct on return.
+      var _me = window.__mbeditorModels && window.__mbeditorModels[tab.path];
+      if (_me) {
+        _me.aviBase = aviBaseRef.current;
+        _me.aviMax = aviMaxRef.current;
+      }
       if (window.__mbeditorActiveEditor === editor) {
         window.__mbeditorActiveEditor = null;
       }
@@ -607,6 +642,9 @@ var EditorPanel = function EditorPanel(_ref) {
       columnSelectDisposable.dispose();
       contentDisposable.dispose();
       EditorStore.setState({ canUndo: false, canRedo: false });
+      // Detach the model before disposing the editor so the model (and its undo
+      // history) survives for when the user returns to this tab.
+      editor.setModel(null);
       editor.dispose();
     };
   }, [tab.id, tab.isPreview]); // re-run ONLY on tab switch, not on content change (Monaco handles its own content state)

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

@@ -2000,6 +2000,15 @@ var MbeditorApp = function MbeditorApp() {
       return;
     }
 
+    // Remove paths that are already covered by a selected ancestor directory.
+    // This prevents redundant requests (and resulting 404s) when a folder and
+    // its children are both in the selection.
+    pathsToDelete = pathsToDelete.filter(function(p) {
+      return !pathsToDelete.some(function(other) {
+        return other !== p && p.startsWith(other.endsWith('/') ? other : other + '/');
+      });
+    });
+
     var label = pathsToDelete.length === 1 ? pathsToDelete[0] : pathsToDelete.length + ' items';
     var confirmed = window.confirm('Delete ' + label + '? This cannot be undone.');
     if (!confirmed) return;
@@ -2007,19 +2016,22 @@ var MbeditorApp = function MbeditorApp() {
     setLoading(function (prev) {
       return _extends({}, prev, { deletePath: true });
     });
-    Promise.all(pathsToDelete.map(function(p) {
+    Promise.allSettled(pathsToDelete.map(function(p) {
       return FileService.deletePath(p).then(function() {
         removeDeletedPathFromOpenTabs(p);
       });
-    })).then(function () {
-      handleNodeSelect(null);
-      EditorStore.setStatus('Deleted: ' + label, 'success');
+    })).then(function (results) {
+      var failures = results.filter(function(r) { return r.status === 'rejected'; });
+      if (failures.length === 0) {
+        handleNodeSelect(null);
+        EditorStore.setStatus('Deleted: ' + label, 'success');
+      } else {
+        var message = failures[0].reason && failures[0].reason.response && failures[0].reason.response.data && failures[0].reason.response.data.error || (failures[0].reason && failures[0].reason.message) || 'Unknown error';
+        EditorStore.setStatus('Delete failed: ' + message, 'error');
+      }
       return refreshProjectTree().then(function () {
         GitService.fetchStatus();
       });
-    })["catch"](function (err) {
-      var message = err && err.response && err.response.data && err.response.data.error || err.message;
-      EditorStore.setStatus('Delete failed: ' + message, 'error');
     })["finally"](function () {
       setLoading(function (prev) {
         return _extends({}, prev, { deletePath: false });

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

@@ -197,12 +197,12 @@
         id: 'mbeditor.emmet.expandAbbreviation',
         label: 'Emmet: Expand Abbreviation',
         keybindings: [window.monaco.KeyCode.Tab],
-        precondition: '!suggestWidgetVisible && !parameterHintsVisible',
+        precondition: '!suggestWidgetVisible && !parameterHintsVisible && !editorHasSelection',
         run: function(editor) {
           var selection = editor.getSelection();
-          // Only expand when the selection is collapsed (no range selected)
+          // Selection indentation should use Monaco defaults, not Emmet expansion.
           if (!selection.isEmpty()) {
-            editor.trigger('keyboard', 'type', { text: '\t' });
+            editor.trigger('keyboard', 'editor.action.indentLines', null);
             return;
           }
           var pos = editor.getPosition();

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

@@ -318,6 +318,21 @@ var TabManager = (function () {
       focusedPaneId: nextFocusedPaneId,
       activeTabId: maybeNewGlobalActiveTab
     });
+
+    // Dispose the cached Monaco model for this path if it is no longer open in
+    // any pane. This keeps the model registry clean and frees memory.
+    if (window.__mbeditorModels && window.__mbeditorModels[path]) {
+      var _stillOpen = newPanes.some(function(p) {
+        return p.tabs.some(function(t) { return t.path === path; });
+      });
+      if (!_stillOpen) {
+        var _entry = window.__mbeditorModels[path];
+        if (_entry.model && !_entry.model.isDisposed()) {
+          _entry.model.dispose();
+        }
+        delete window.__mbeditorModels[path];
+      }
+    }
   }
 
   function closeAllTabsInPane(paneId) {

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

@@ -816,6 +816,59 @@ html, body, #mbeditor-root {
 .search-input-wrap {
   display: flex;
   flex-shrink: 0;
+  align-items: center;
+  gap: 4px;
+}
+
+.search-input-shell {
+  flex: 1;
+  position: relative;
+  display: flex;
+  align-items: center;
+  min-width: 0;
+}
+
+.search-input-shell .search-input {
+  padding-right: 24px;
+}
+
+/* search-clear-btn sits absolutely inside the input shell */
+.search-input-shell .search-clear-btn {
+  position: absolute;
+  right: 4px;
+  width: 16px;
+  height: 16px;
+  font-size: 10px;
+  color: var(--ide-text-muted);
+  background: transparent;
+}
+
+/* Use .search-panel ancestor for higher specificity than button:not(.pico-btn) */
+.search-panel .search-btn {
+  flex-shrink: 0;
+  width: 26px;
+  height: 26px;
+  padding: 0;
+  margin: 0;
+  border: 1px solid var(--ide-border-input);
+  border-radius: 4px;
+  background: var(--ide-input-bg);
+  color: var(--ide-text-muted);
+  font-size: 12px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+
+.search-panel .search-btn:hover {
+  color: var(--ide-text);
+  border-color: var(--ide-accent-fg);
+}
+
+.search-panel .search-btn:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
 }
 
 .search-input {
@@ -872,6 +925,9 @@ html, body, #mbeditor-root {
   font-size: 11px;
   color: var(--ide-accent-fg);
   font-weight: 500;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .search-result-line-num {

data/app/controllers/mbeditor/editors_controller.rb

@@ -240,7 +240,8 @@ module Mbeditor
     def destroy_path
       path = resolve_path(params[:path])
       return render json: { error: "Forbidden" }, status: :forbidden unless path
-      return render json: { error: "Path not found" }, status: :not_found unless File.exist?(path)
+      # Idempotent: if already gone the desired state is already achieved.
+      return render json: { ok: true } unless File.exist?(path)
       return render json: { error: "Cannot delete this path" }, status: :forbidden if path_blocked_for_operations?(path)
 
       if File.directory?(path)

data/lib/mbeditor/version.rb

@@ -1,3 +1,3 @@
 module Mbeditor
-  VERSION = "0.3.5"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mbeditor
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.8
 platform: ruby
 authors:
 - Oliver Noonan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-15 00:00:00.000000000 Z
+date: 2026-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails