Merge branch 'main' into feat/editor-gutter

.gitea/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +0,0 @@
-# Description
-
-Please write down a clear and concise description of this Merge Request.
-
-# Closes
-
-Please write down the issues that this MR closes.
-
-# Implementation Insight
-
-Please write down how did you implement this in a clear and concise manner.
-
-# TO-DOs
-
-A list of TO-DOs of things you have did before the MR is undrafted.

.gitlab/issue_templates/Bug.md

@@ -1,15 +1,3 @@
----
-
-name: Bug Report
-about: Report a bug affecting Echidna Code Editor
-title: bug: 
-ref: main
-labels:
-
-- bug
-- help needed
----
-
 ## Description
 
 Please write a clear and concise description of the issue you are getting.

.gitlab/issue_templates/Feature Request.md

@@ -1,15 +1,3 @@
----
-
-name: Feature Request
-about: Request a new feature or support that can be implemented into Echidna.
-title: "feat: "
-ref: main
-labels:
-
-- enhancement
-
----
-
 ## Description
 
 Please write a clear and concise description of the issue you are getting.

clippy.toml

@@ -0,0 +1 @@
+"clippy::style" = "deny"

src/components/editor/mod.rs

@@ -3,12 +3,9 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 pub mod imp;
-use gio::Cancellable;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
-use sourceview::{
-    prelude::*, Buffer, FileExt as SourceFileExt, FileLoader, FileSaver, LanguageManager,
-};
+use sourceview::{prelude::*, Buffer, FileExt as SourceFileExt, FileLoader, LanguageManager};
 
 glib::wrapper! {
     pub struct EchidnaCoreEditor(ObjectSubclass<imp::EchidnaCoreEditor>)
@@ -24,47 +21,47 @@ impl EchidnaCoreEditor {
         // Without cloning it, for some reasons the Rust compiler complains about &this.to_imp().sourceview not being IsA<sourceview::View>
         this_imp.minimap.set_view(&this_imp.sourceview.clone());
 
-        match file {
-            Some(file) => {
-                let file_location = file
-                    .location()
-                    .expect("file is required to have a location");
+        if file.is_some() {
+            let file = file.unwrap();
+            let file_location = file
+                .location()
+                .expect("file is required to have a location");
 
-                this.set_property("file", &file)
-                    .expect("Could not set the 'file' property of EchidnaCoreEditor");
+            this.set_property("file", &file)
+                .expect("Could not set the 'file' property of EchidnaCoreEditor");
 
-                let cancellable = gio::Cancellable::new();
-                let filepath = file_location.path().expect("No filepath");
-                let info = file_location
-                    .query_info("*", gio::FileQueryInfoFlags::NONE, Some(&cancellable))
-                    .expect("Could not query the info for file");
+            let cancellable = gio::Cancellable::new();
+            let filepath = file_location.path().expect("No filepath");
+            let info = file_location
+                .query_info("*", gio::FileQueryInfoFlags::NONE, Some(&cancellable))
+                .expect("Could not query the info for file");
 
-                let content_type = info
-                    .content_type()
-                    .expect(format!("It does not seem like {:?} has a type", filepath).as_str());
-                {
-                    println!(
-                        "Opened {} and found its content type is {}.",
-                        "file",
-                        content_type.to_string()
-                    );
-                    let buffer = this_imp.sourceview.buffer().downcast::<Buffer>().expect("Cannot downcast the sourceview's buffer. Maybe the sourceview's buffer is not IsA<sourceview::Buffer>.");
-                    let language_manager = LanguageManager::new();
-                    let language = language_manager.guess_language(
-                        Some(&info.name().to_str().expect(
-                            "Could not open the file because its name is not supported by Unicode.",
-                        )),
-                        None,
-                    );
+            let content_type = info
+                .content_type()
+                .expect(format!("It does not seem like {:?} has a type", filepath).as_str());
+            {
+                println!(
+                    "Opened {} and found its content type is {}.",
+                    "file",
+                    content_type.to_string()
+                );
+                let buffer = this_imp.sourceview.buffer().downcast::<Buffer>().expect("Cannot downcast the sourceview's buffer. Maybe the sourceview's buffer is not IsA<sourceview::Buffer>.");
+                let language_manager = LanguageManager::new();
+                let language = language_manager.guess_language(
+                    Some(&info.name().to_str().expect(
+                        "Could not open the file because its name is not supported by Unicode.",
+                    )),
+                    None,
+                );
 
-                    match language {
-                        Some(lang) => buffer.set_language(Some(&lang)),
-                        None => {}
-                    }
+                match language {
+                    Some(lang) => buffer.set_language(Some(&lang)),
+                    None => {}
+                }
 
-                    let file_loader: FileLoader = FileLoader::new(&buffer, &file);
+                let file_loader: FileLoader = FileLoader::new(&buffer, &file);
 
-                    file_loader.load_async(
+                file_loader.load_async(
                     glib::Priority::default(),
                     Some(&cancellable),
                     |_, _| {},
@@ -74,9 +71,7 @@ impl EchidnaCoreEditor {
                         }
                     },
                 );
-                }
             }
-            None => {}
         }
         this
     }
@@ -88,50 +83,4 @@ impl EchidnaCoreEditor {
     pub fn file(&self) -> sourceview::File {
         self.property("file").expect("Could not get property 'file' of EchidnaCoreEditor").get::<sourceview::File>().expect("Could not get property 'file' of EchidnaCoreEditor because its type is not IsA<sourceview::File>")
     }
-
-    pub fn save_file(&self, save_as: Option<&gio::File>) -> Result<(), &str> {
-        let window_imp = self.to_imp();
-        let buffer = self.to_imp().sourceview.buffer().downcast::<Buffer>();
-
-        match buffer {
-            Ok(buffer) => {
-                let cancellable = Cancellable::new();
-                let mut file_saver: Option<FileSaver> = None;
-                let result: Result<(), &str> = match save_as {
-                    Some(file) => {
-                        file_saver = Some(FileSaver::with_target(&buffer, &self.file(), file));
-                        Ok(())
-                    }
-                    None => match self.file().location() {
-                        Some(_) => {
-                            file_saver = Some(FileSaver::new(&buffer, &self.file()));
-                            Ok(())
-                        }
-                        None => Err("The file location must exist. Please do \"Save As\""),
-                    },
-                };
-
-                match result {
-                    Err(result) => Err(result),
-                    Ok(_) => {
-                        file_saver.unwrap().save_async(
-                            glib::Priority::default(),
-                            Some(&cancellable),
-                            |_, _| {},
-                            |result| {
-                                if result.is_err() {
-                                    panic!(
-                                        "Found an error while saving the file:\n{}",
-                                        result.err().expect("No error")
-                                    )
-                                }
-                            },
-                        );
-                        Ok(())
-                    }
-                }
-            }
-            Err(_) => Err("Can't downcast the buffer to GtkSourceBuffer."),
-        }
-    }
 }

src/components/sidebar/mod.rs

@@ -15,9 +15,3 @@ impl EchidnaSidebar {
         glib::Object::new(&[]).expect("Failed to create 'EchidnaSidebar' component.")
     }
 }
-
-impl Default for EchidnaSidebar {
-    fn default() -> Self {
-        Self::new()
-    }
-}

src/components/tab_label/imp.rs

@@ -36,9 +36,9 @@ impl BuildableImpl for TabLabel {
     fn add_child(
         &self,
         buildable: &Self::Type,
-        _builder: &gtk::Builder,
+        builder: &gtk::Builder,
         child: &glib::Object,
-        _type_: Option<&str>,
+        type_: Option<&str>,
     ) {
         buildable.prepend(child.downcast_ref::<gtk::Widget>().unwrap());
     }

src/components/tab_label/mod.rs

@@ -17,9 +17,8 @@ impl TabLabel {
     pub fn new<U: IsA<gtk::Widget>>(tab_label: Option<&U>) -> Self {
         let this: Self = glib::Object::new(&[]).expect("Failed to create 'TabLabel' component.");
 
-        match tab_label {
-            Some(tab_label) => this.prepend(tab_label),
-            None => {}
+        if tab_label.is_some() {
+            this.prepend(tab_label.unwrap());
         }
         this
     }

src/components/window/file.rs

@@ -2,20 +2,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use crate::components::editor::EchidnaCoreEditor;
 use crate::lib::prelude::*;
-use glib::clone;
+
+use crate::components::editor::EchidnaCoreEditor;
+use gio::Cancellable;
+use glib::{clone, Priority};
 use gtk::{
     prelude::*, subclass::prelude::*, FileChooserAction, FileChooserNative, Label, ResponseType,
 };
-use sourceview::{File, FileExt as SourceFileExt};
+use sourceview::{prelude::*, Buffer, File, FileSaver};
 
 pub trait FileImplementedEditor {
     fn action_open_file(&self);
     fn open_file(notebook: &gtk::Notebook, file: gio::File);
     fn action_save_file_as(&self);
-    fn action_new_file(&self);
-    fn action_save_file(&self);
 }
 
 impl FileImplementedEditor for super::EchidnaWindow {
@@ -67,7 +67,7 @@ impl FileImplementedEditor for super::EchidnaWindow {
         notebook.prepend_closable_page(
             &editor_page,
             Some(&Label::new(Some(
-                file_location
+                &file_location
                     .path()
                     .expect("The file's path is missing")
                     .file_name()
@@ -77,6 +77,7 @@ impl FileImplementedEditor for super::EchidnaWindow {
             ))),
         );
     }
+
     fn action_save_file_as(&self) {
         let dialog = FileChooserNative::new(
             Some("Save File As"),
@@ -94,32 +95,44 @@ impl FileImplementedEditor for super::EchidnaWindow {
         move |dialog, response| {
             if response == ResponseType::Accept {
                 let file = dialog.file().expect("");
-                let tab: EchidnaCoreEditor = window.get_current_tab().expect("error");
-                tab.save_file(Some(&file));
-            }
+                let window_imp = window.to_imp();
+                let page: EchidnaCoreEditor;
+
+                match window_imp.notebook
+                    .nth_page(
+                        Some(window_imp.notebook
+                            .current_page()
+                            .expect(
+                                "No tabs is the current tab, probably all tabs closed. No files to save"
+                            )
+                        )
+                    ).expect(
+                        "Couldn't get the page of the current index. Try again."
+                    ).downcast::<EchidnaCoreEditor>() {
+                    Ok(res) => page = res,
+                    Err(e) => panic!("We got an error when trying to downcast the current tab page into EchidnaCoreEditor:\n{}", e)
+                }
+
+                let buffer: Buffer = page.to_imp().sourceview.buffer().downcast().expect("Could not downcast the editor's buffer to GtkSourceBuffer.");
+                let cancellable = Cancellable::new();
+
+                let file_saver = FileSaver::with_target(
+                    &buffer,
+                     &page.file(), &file);
+                file_saver.save_async(
+                    Priority::default(),
+                    Some(&cancellable),
+                    |_, _| {},
+                    |result| {
+                        if result.is_err() {
+                            panic!("Found an error while saving the file:\n{}", result.err().expect("No error"))
+                        }
+                    });
+
+                }
 
                 dialog.destroy();
 
             }));
     }
-
-    fn action_new_file(&self) {
-        let editor_page = EchidnaCoreEditor::new(None);
-
-        self.to_imp()
-            .notebook
-            .prepend_closable_page(&editor_page, Some(&gtk::Label::new(Some(&"Untitled"))));
-    }
-
-    fn action_save_file(&self) {
-        let page: EchidnaCoreEditor = self
-            .get_current_tab()
-            .expect("Can't find the current tab because there are no tabs.");
-        match page.file().location() {
-            Some(_) => {
-                page.save_file(None);
-            }
-            None => self.action_save_file_as(),
-        }
-    }
 }

src/components/window/menubar.rs

@@ -122,26 +122,5 @@ impl MenubarImplementedEditor for EchidnaWindow {
                     window.action_save_file_as();
             }));
         }
-        {
-            let action_new_file = SimpleAction::new("new-file", None);
-
-            self.add_action(&action_new_file);
-
-            action_new_file.connect_activate(clone!(@weak self as window =>
-                move |_action, _variant| {
-                    window.action_new_file();
-            }));
-        }
-        {
-            let action_save = SimpleAction::new("save", None);
-
-            self.add_action(&action_save);
-
-            action_save.connect_activate(clone!(@weak self as window =>
-                move |_, _| {
-                    window.action_save_file();
-                }
-            ));
-        }
     }
 }

src/components/window/mod.rs

@@ -6,7 +6,7 @@ pub mod file;
 pub mod imp;
 pub mod menubar;
 
-use glib::object::{Cast, IsA};
+use glib::object::IsA;
 use gtk::subclass::prelude::*;
 
 glib::wrapper! {
@@ -28,25 +28,4 @@ impl EchidnaWindow {
     pub fn to_imp(&self) -> &imp::EchidnaWindow {
         imp::EchidnaWindow::from_instance(self)
     }
-
-    pub fn get_current_tab<A: IsA<gtk::Widget>>(&self) -> Result<A, &str> {
-        let window_imp = self.to_imp();
-        let nth = window_imp.notebook.current_page();
-
-        match nth {
-            None => Err("No tabs are currently opened, maybe there are no tabs."),
-            Some(nth) => {
-                let page = window_imp
-                    .notebook
-                    .nth_page(Some(nth))
-                    .expect("Couldn't get the page of the current index.");
-
-                match page.downcast::<A>()
-                {
-                    Ok(page) => Ok(page),
-                    Err(e) => Err("Cannot downcast to type parameter A. Maybe it's not in the type you are looking for."),
-                }
-            }
-        }
-    }
 }

src/lib/closeable_tab.rs

@@ -4,7 +4,7 @@
 
 use crate::components::tab_label::TabLabel;
 use glib::IsA;
-use gtk::{prelude::*, Widget};
+use gtk::{prelude::*, Box, Button, Widget};
 
 pub trait ClosableTabImplementedNotebook {
     fn prepend_closable_page<T: IsA<Widget>, U: IsA<Widget>>(