fix(buffers/#3521): Add 'save without formatting' command (#3539)

Fixes #3521

Author: bryphe

CHANGES_CURRENT.md

@@ -15,6 +15,7 @@
 - #3506 - Theme: Add 'workbench.colorCustomizations' setting (related #3495)
 - #3526 - Explorer: Enable auto-refresh by default (fixes #3399)
 - #3529 - Keybindings: Allow remaps to be defined in keybindings.json
+- #3539 - Buffers: Add Save without formatting commaaand (fixes #3521)
 
 ### Bug Fixes
 

src/Core/SaveReason.re

@@ -1,4 +1,4 @@
 [@deriving show]
 type t =
-  | UserInitiated
+  | UserInitiated({allowFormatting: bool})
   | AutoSave;

src/Feature/Buffers/Feature_Buffers.re

@@ -154,7 +154,8 @@ type command =
   | ChangeFiletype({maybeBufferId: option(int)})
   | ConvertIndentationToTabs
   | ConvertIndentationToSpaces
-  | DetectIndentation;
+  | DetectIndentation
+  | SaveWithoutFormatting;
 
 [@deriving show({with_path: false})]
 type msg =
@@ -554,7 +555,9 @@ let update = (~activeBufferId, ~config, msg: msg, model: model) => {
   | Saved(bufferId) =>
     let saveReason =
       model.pendingSaveReason
-      |> Option.value(~default=SaveReason.UserInitiated);
+      |> Option.value(
+           ~default=SaveReason.UserInitiated({allowFormatting: true}),
+         );
     let model' =
       update(bufferId, Option.map(Buffer.incrementSaveTick), model);
     let eff =
@@ -725,6 +728,19 @@ let update = (~activeBufferId, ~config, msg: msg, model: model) => {
         let updatedBuffer = Buffer.setIndentation(indentation, buffer);
         (add(updatedBuffer, model), Nothing);
       };
+
+    | SaveWithoutFormatting => (
+        {
+          ...model,
+          pendingSaveReason:
+            Some(SaveReason.UserInitiated({allowFormatting: false})),
+        },
+        Effect(
+          Service_Vim.Effects.save(~bufferId=activeBufferId, () =>
+            Saved(activeBufferId)
+          ),
+        ),
+      )
     }
 
   | LargeFileOptimizationsApplied({buffer}) =>
@@ -933,6 +949,14 @@ module Commands = {
       "workbench.action.editor.changeLanguageMode",
       Command(ChangeFiletype({maybeBufferId: None})),
     );
+
+  let saveWithoutFormatting =
+    define(
+      ~category="File",
+      ~title="Save without formatting",
+      "workbench.action.files.saveWithoutFormatting",
+      Command(SaveWithoutFormatting),
+    );
 };
 
 let sub = (~isWindowFocused, ~maybeFocusedBuffer, model) => {
@@ -992,6 +1016,7 @@ module Contributions = {
       detectIndentation,
       indentUsingSpaces,
       indentUsingTabs,
+      saveWithoutFormatting,
     ]
     |> Command.Lookup.fromList;
 

src/Feature/LanguageSupport/Feature_LanguageSupport.re

@@ -608,7 +608,8 @@ let bufferSaved =
       ~activeBufferId,
       model,
     ) =>
-  if (reason == Oni_Core.SaveReason.AutoSave) {
+  if (reason == Oni_Core.SaveReason.AutoSave
+      || reason == Oni_Core.SaveReason.UserInitiated({allowFormatting: false})) {
     (model, Isolinear.Effect.none);
   } else {
     let (formatting', formattingEffect) =

src/Service/Vim/Service_Vim.re

@@ -245,12 +245,21 @@ module Effects = {
   };
 
   let saveAll = toMsg => {
-    Isolinear.Effect.createWithDispatch(~name="loadBuffer", dispatch => {
+    Isolinear.Effect.createWithDispatch(~name="saveAll", dispatch => {
       let (_: Vim.Context.t, _effects: list(Vim.Effect.t)) =
         Vim.command("wa!");
       dispatch(toMsg());
     });
   };
+
+  let save = (~bufferId, toMsg) => {
+    Isolinear.Effect.createWithDispatch(~name="saveBuffer", dispatch => {
+      let context = {...Vim.Context.current(), bufferId};
+      let (_: Vim.Context.t, _effects: list(Vim.Effect.t)) =
+        Vim.command(~context, "w!");
+      dispatch(toMsg());
+    });
+  };
 };
 
 module Sub = {

src/Service/Vim/Service_Vim.rei

@@ -39,6 +39,8 @@ module Effects: {
   let loadBuffer:
     (~filePath: string, (~bufferId: int) => 'msg) => Isolinear.Effect.t('msg);
 
+  let save: (~bufferId: int, unit => 'msg) => Isolinear.Effect.t('msg);
+
   let saveAll: (unit => 'msg) => Isolinear.Effect.t('msg);
 
   let applyCompletion: