From db65ed6f61c704b6cc8ee39e83a91b26d1a6c131 Mon Sep 17 00:00:00 2001
From: Allan Blanchard <allan.blanchard@cea.fr>
Date: Tue, 19 May 2020 09:33:10 +0200
Subject: [PATCH] Lint: file_manager
---
.Makefile.lint | 1 -
src/plugins/gui/file_manager.ml | 40 ++++++++++++++++-----------------
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/.Makefile.lint b/.Makefile.lint
index 6e0882bf1a1..c2648ca66aa 100644
--- a/.Makefile.lint
+++ b/.Makefile.lint
@@ -198,7 +198,6 @@ ML_LINT_KO+=src/plugins/gui/analyses_manager.ml
ML_LINT_KO+=src/plugins/gui/book_manager.ml
ML_LINT_KO+=src/plugins/gui/book_manager.mli
ML_LINT_KO+=src/plugins/gui/design.mli
-ML_LINT_KO+=src/plugins/gui/file_manager.ml
ML_LINT_KO+=src/plugins/gui/filetree.mli
ML_LINT_KO+=src/plugins/gui/gtk_form.ml
ML_LINT_KO+=src/plugins/gui/gtk_form.mli
diff --git a/src/plugins/gui/file_manager.ml b/src/plugins/gui/file_manager.ml
index 26e2c27b833..f4155bc369f 100644
--- a/src/plugins/gui/file_manager.ml
+++ b/src/plugins/gui/file_manager.ml
@@ -54,20 +54,20 @@ let reparse (host_window: Design.main_window_extension_points) =
in
begin match old_helt, succeeded with
| None, _ -> (** no history available before reparsing *)
- host_window#reset ()
+ host_window#reset ()
| _, None -> (** the user stopped or an error occurred *)
- host_window#reset ()
+ host_window#reset ()
| Some old_helt, Some () ->
- let new_helt = History.translate_history_elt old_helt in
- Extlib.may History.push new_helt;
- host_window#reset ();
- (** The buffer is not ready yet, modification of its vadjustement
- is unreliable *)
- let set () =
- let adj = host_window#source_viewer_scroll#vadjustment in
- adj#set_value (old_scroll *. (adj#upper-.adj#lower) +. adj#lower)
- in
- Wutil.later set
+ let new_helt = History.translate_history_elt old_helt in
+ Extlib.may History.push new_helt;
+ host_window#reset ();
+ (** The buffer is not ready yet, modification of its vadjustement
+ is unreliable *)
+ let set () =
+ let adj = host_window#source_viewer_scroll#vadjustment in
+ adj#set_value (old_scroll *. (adj#upper-.adj#lower) +. adj#lower)
+ in
+ Wutil.later set
end
let save_in (host_window: Design.main_window_extension_points) parent name =
@@ -92,9 +92,9 @@ let save_file_as (host_window: Design.main_window_extension_points) =
(fun () ->
match dialog#run () with
| `SAVE ->
- Extlib.may
- (save_in host_window (dialog :> GWindow.window_skel))
- (Extlib.opt_map Filepath.Normalized.of_string dialog#filename)
+ Extlib.may
+ (save_in host_window (dialog :> GWindow.window_skel))
+ (Extlib.opt_map Filepath.Normalized.of_string dialog#filename)
| `DELETE_EVENT | `CANCEL -> ());
dialog#destroy ()
@@ -115,11 +115,11 @@ let load_file (host_window: Design.main_window_extension_points) =
host_window#protect ~cancelable:true ~parent:(dialog:>GWindow.window_skel)
(fun () -> match dialog#run () with
| `OPEN ->
- begin match dialog#filename with
- | None -> ()
- | Some f ->
- Project.load_all (Filepath.Normalized.of_string f)
- end
+ begin match dialog#filename with
+ | None -> ()
+ | Some f ->
+ Project.load_all (Filepath.Normalized.of_string f)
+ end
| `DELETE_EVENT | `CANCEL -> ());
dialog#destroy ()
--
GitLab