Add save without formatting; Allow toggling of formatting for autosave (

lapce#1722) * Add save without formatting * Allow disabling formatting on autosave
taraio · Nov 20, 2022 · 5b10fea · 5b10fea
1 parent 5a903c9
commit 5b10fea
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features/Changes
 - [#1720](https://github.com/lapce/lapce/pull/1720): Display signature/parameter information from LSP
 - [#1723](https://github.com/lapce/lapce/pull/1723): In the palette, display the keybind for a command adjacent to it
+- [#1722](https://github.com/lapce/lapce/pull/1722): Add 'Save without Formatting'; Add option to disable formatting on autosave
 
 ### Bug Fixes
 

diff --git a/defaults/settings.toml b/defaults/settings.toml
@@ -26,6 +26,7 @@ modal-mode-relative-line-numbers = true
 format-on-save = false
 highlight-matching-brackets = true
 autosave-interval = 0
+format-on-autosave = true
 enable-inlay-hints = true
 inlay-hint-font-family = ""
 inlay-hint-font-size = 0

diff --git a/lapce-core/src/command.rs b/lapce-core/src/command.rs
@@ -304,6 +304,9 @@ pub enum FocusCommand {
     #[strum(message = "Save")]
     #[strum(serialize = "save")]
     Save,
+    #[strum(message = "Save Without Formatting")]
+    #[strum(serialize = "save_without_format")]
+    SaveWithoutFormatting,
     #[strum(serialize = "save_and_exit")]
     SaveAndExit,
     #[strum(serialize = "force_exit")]

diff --git a/lapce-data/src/config.rs b/lapce-data/src/config.rs
@@ -421,6 +421,10 @@ pub struct EditorConfig {
         desc = "Set the auto save delay (in milliseconds), Set to 0 to completely disable"
     )]
     pub autosave_interval: u64,
+    #[field_names(
+        desc = "Whether the document should be formatted when an autosave is triggered (required Format on Save)"
+    )]
+    pub format_on_autosave: bool,
     #[field_names(
         desc = "If enabled the cursor treats leading soft tabs as if they are hard tabs."
     )]

diff --git a/lapce-data/src/editor.rs b/lapce-data/src/editor.rs
@@ -1342,7 +1342,7 @@ impl LapceEditorBufferData {
         }
     }
 
-    fn save(&mut self, ctx: &mut EventCtx, exit: bool) {
+    fn save(&mut self, ctx: &mut EventCtx, exit: bool, allow_formatting: bool) {
         if self.doc.buffer().is_pristine() && self.doc.content().is_file() {
             if exit {
                 ctx.submit_command(Command::new(
@@ -1358,7 +1358,8 @@ impl LapceEditorBufferData {
         }
 
         if let BufferContent::File(path) = self.doc.content() {
-            let format_on_save = self.config.editor.format_on_save;
+            let format_on_save =
+                allow_formatting && self.config.editor.format_on_save;
             let path = path.clone();
             let proxy = self.proxy.clone();
             let rev = self.doc.rev();
@@ -2278,10 +2279,13 @@ impl LapceEditorBufferData {
                 }
             }
             SaveAndExit => {
-                self.save(ctx, true);
+                self.save(ctx, true, true);
             }
             Save => {
-                self.save(ctx, false);
+                self.save(ctx, false, true);
+            }
+            SaveWithoutFormatting => {
+                self.save(ctx, false, false);
             }
             Rename => {
                 if let BufferContent::File(path) = self.doc.content() {

diff --git a/lapce-ui/src/editor/view.rs b/lapce-ui/src/editor/view.rs
@@ -628,10 +628,17 @@ impl Widget<LapceTabData> for LapceEditorView {
                         if ctx.is_focused() {
                             let doc = data.main_split.editor_doc(self.view_id);
                             if !doc.buffer().is_pristine() {
+                                let save_cmd =
+                                    if data.config.editor.format_on_autosave {
+                                        FocusCommand::Save
+                                    } else {
+                                        FocusCommand::SaveWithoutFormatting
+                                    };
+
                                 ctx.submit_command(Command::new(
                                     LAPCE_COMMAND,
                                     LapceCommand {
-                                        kind: CommandKind::Focus(FocusCommand::Save),
+                                        kind: CommandKind::Focus(save_cmd),
                                         data: None,
                                     },
                                     Target::Widget(editor.view_id),