Merge branch 'main' into main

Author: Kyza

Cargo.toml

@@ -24,7 +24,7 @@ debug = "full"              # No one needs an undebuggable release binary
 lto = true                  # reduces binary size by ~14%
 opt-level = "s"             # reduces binary size by ~25%
 panic = "abort"             # reduces binary size by ~50% in combination with -Zbuild-std-features=panic_immediate_abort
-split-debuginfo = "packed"  # generates a seperate *.dwp/*.dSYM so the binary can get stripped
+split-debuginfo = "packed"  # generates a separate *.dwp/*.dSYM so the binary can get stripped
 strip = "symbols"           # See split-debuginfo - allows us to drop the size by ~65%
 incremental = true          # Improves re-compile times
 

README.md

@@ -13,6 +13,14 @@ This editor pays homage to the classic [MS-DOS Editor](https://en.wikipedia.org/
 * Copy the `edit` binary to a directory in your `PATH`
 * You may delete any other files in the archive if you don't need them
 
+### WinGet (Windows)
+
+* Open up a terminal of your choice and run the following command:
+  ```powershell
+  winget install Microsoft.Edit
+  ```
+* `edit` will be automatically added to your `PATH`. If typing `edit` doesn't work, open a new terminal.
+
 ## Build Instructions
 
 * [Install Rust](https://www.rust-lang.org/tools/install)

src/bin/edit/documents.rs

@@ -32,7 +32,7 @@ impl Document {
             tb.write_file(&mut file)?;
         }
 
-        if let Ok(id) = sys::file_id(&file) {
+        if let Ok(id) = sys::file_id(None, path) {
             self.file_id = Some(id);
         }
 
@@ -52,7 +52,7 @@ impl Document {
             tb.read_file(&mut file, encoding)?;
         }
 
-        if let Ok(id) = sys::file_id(&file) {
+        if let Ok(id) = sys::file_id(None, path) {
             self.file_id = Some(id);
         }
 
@@ -156,10 +156,7 @@ impl DocumentManager {
             Err(err) => return Err(err),
         };
 
-        let file_id = match &file {
-            Some(file) => Some(sys::file_id(file)?),
-            None => None,
-        };
+        let file_id = if file.is_some() { Some(sys::file_id(file.as_ref(), &path)?) } else { None };
 
         // Check if the file is already open.
         if file_id.is_some() && self.update_active(|doc| doc.file_id == file_id) {

src/bin/edit/draw_filepicker.rs

@@ -116,7 +116,7 @@ pub fn draw_file_picker(ctx: &mut Context, state: &mut State) {
                 && let Some(path) = doit.as_deref()
                 && let Some(doc) = state.documents.active()
                 && let Some(file_id) = &doc.file_id
-                && sys::file_id_at(path).is_ok_and(|id| &id == file_id)
+                && sys::file_id(None, path).is_ok_and(|id| &id == file_id)
             {
                 state.file_picker_overwrite_warning = doit.take();
             }

src/bin/edit/draw_menubar.rs

@@ -14,9 +14,14 @@ pub fn draw_menubar(ctx: &mut Context, state: &mut State) {
     ctx.attr_background_rgba(state.menubar_color_bg);
     ctx.attr_foreground_rgba(state.menubar_color_fg);
     {
+        let contains_focus = ctx.contains_focus();
+
         if ctx.menubar_menu_begin(loc(LocId::File), 'F') {
             draw_menu_file(ctx, state);
         }
+        if !contains_focus && ctx.consume_shortcut(vk::F10) {
+            ctx.steal_focus();
+        }
         if state.documents.active().is_some() && ctx.menubar_menu_begin(loc(LocId::Edit), 'E') {
             draw_menu_edit(ctx, state);
         }

src/bin/edit/localization.rs

@@ -905,6 +905,22 @@ impl<'a> TryFrom<ArenaString<'a>> for LangId {
 }
 
 pub fn init() {
+    const LANG_MAP: &[(&str, LangId)] = &[
+        ("en", LangId::en),
+        // ----------------
+        ("de", LangId::de),
+        ("es", LangId::es),
+        ("fr", LangId::fr),
+        ("it", LangId::it),
+        ("ja", LangId::ja),
+        ("ko", LangId::ko),
+        ("pt-br", LangId::pt_br),
+        ("ru", LangId::ru),
+        ("zh-hant", LangId::zh_hant),
+        ("zh-tw", LangId::zh_hant),
+        ("zh", LangId::zh_hans),
+    ];
+
     let scratch = scratch_arena(None);
     let lang_strs = sys::preferred_languages(&scratch);
 

src/bin/edit/main.rs

@@ -497,7 +497,7 @@ impl Drop for RestoreModes {
     fn drop(&mut self) {
         // Same as in the beginning but in the reverse order.
         // It also includes DECSCUSR 0 to reset the cursor style and DECTCEM to show the cursor.
-        sys::write_stdout("\x1b[0 q\x1b[?25h\x1b]0;\x07\x1b[?1002;1006;2004l\x1b[?1049l");
+        sys::write_stdout("\x1b[0 q\x1b[?25h\x1b]0;\x07\x1b[?1036l\x1b[?1002;1006;2004l\x1b[?1049l");
     }
 }
 
@@ -509,7 +509,8 @@ fn setup_terminal(tui: &mut Tui, vt_parser: &mut vt::Parser) -> RestoreModes {
         // 1002: Cell Motion Mouse Tracking
         // 1006: SGR Mouse Mode
         // 2004: Bracketed Paste Mode
-        "\x1b[?1049h\x1b[?1002;1006;2004h",
+        // 1036: Xterm: "meta sends escape" (Alt keypresses should be encoded with ESC + char)
+        "\x1b[?1049h\x1b[?1002;1006;2004h\x1b[?1036h",
         // OSC 4 color table requests for indices 0 through 15 (base colors).
         "\x1b]4;0;?;1;?;2;?;3;?;4;?;5;?;6;?;7;?\x07",
         "\x1b]4;8;?;9;?;10;?;11;?;12;?;13;?;14;?;15;?\x07",

src/sys/mod.rs

@@ -3,11 +3,6 @@
 
 //! Platform abstractions.
 
-use std::fs::File;
-use std::path::Path;
-
-use crate::apperr;
-
 #[cfg(unix)]
 mod unix;
 #[cfg(windows)]
@@ -20,9 +15,3 @@ pub use std::fs::canonicalize;
 pub use unix::*;
 #[cfg(windows)]
 pub use windows::*;
-
-pub fn file_id_at(path: &Path) -> apperr::Result<FileId> {
-    let file = File::open(path)?;
-    let file_id = file_id(&file)?;
-    Ok(file_id)
-}

src/sys/unix.rs

@@ -10,6 +10,7 @@ use std::ffi::{CStr, c_int, c_void};
 use std::fs::{self, File};
 use std::mem::{self, ManuallyDrop, MaybeUninit};
 use std::os::fd::{AsRawFd as _, FromRawFd as _};
+use std::path::Path;
 use std::ptr::{self, NonNull, null_mut};
 use std::{thread, time};
 
@@ -350,8 +351,13 @@ pub struct FileId {
     st_ino: libc::ino_t,
 }
 
-/// Returns a unique identifier for the given file.
-pub fn file_id(file: &File) -> apperr::Result<FileId> {
+/// Returns a unique identifier for the given file by handle or path.
+pub fn file_id(file: Option<&File>, path: &Path) -> apperr::Result<FileId> {
+    let file = match file {
+        Some(f) => f,
+        None => &File::open(path)?,
+    };
+
     unsafe {
         let mut stat = MaybeUninit::<libc::stat>::uninit();
         check_int_return(libc::fstat(file.as_raw_fd(), stat.as_mut_ptr()))?;

src/sys/windows.rs

@@ -398,24 +398,40 @@ pub fn open_stdin_if_redirected() -> Option<File> {
 }
 
 /// A unique identifier for a file.
-#[derive(Clone)]
-#[repr(transparent)]
-pub struct FileId(FileSystem::FILE_ID_INFO);
+pub enum FileId {
+    Id(FileSystem::FILE_ID_INFO),
+    Path(PathBuf),
+}
 
 impl PartialEq for FileId {
     fn eq(&self, other: &Self) -> bool {
-        // Lowers to an efficient word-wise comparison.
-        const SIZE: usize = std::mem::size_of::<FileSystem::FILE_ID_INFO>();
-        let a: &[u8; SIZE] = unsafe { mem::transmute(&self.0) };
-        let b: &[u8; SIZE] = unsafe { mem::transmute(&other.0) };
-        a == b
+        match (self, other) {
+            (FileId::Id(left), FileId::Id(right)) => {
+                // Lowers to an efficient word-wise comparison.
+                const SIZE: usize = std::mem::size_of::<FileSystem::FILE_ID_INFO>();
+                let a: &[u8; SIZE] = unsafe { mem::transmute(left) };
+                let b: &[u8; SIZE] = unsafe { mem::transmute(right) };
+                a == b
+            }
+            (FileId::Path(left), FileId::Path(right)) => left == right,
+            _ => false,
+        }
     }
 }
 
 impl Eq for FileId {}
 
-/// Returns a unique identifier for the given file.
-pub fn file_id(file: &File) -> apperr::Result<FileId> {
+/// Returns a unique identifier for the given file by handle or path.
+pub fn file_id(file: Option<&File>, path: &Path) -> apperr::Result<FileId> {
+    let file = match file {
+        Some(f) => f,
+        None => &File::open(path)?,
+    };
+
+    file_id_from_handle(file).or_else(|_| Ok(FileId::Path(std::fs::canonicalize(path)?)))
+}
+
+fn file_id_from_handle(file: &File) -> apperr::Result<FileId> {
     unsafe {
         let mut info = MaybeUninit::<FileSystem::FILE_ID_INFO>::uninit();
         check_bool_return(FileSystem::GetFileInformationByHandleEx(
@@ -424,7 +440,7 @@ pub fn file_id(file: &File) -> apperr::Result<FileId> {
             info.as_mut_ptr() as *mut _,
             mem::size_of::<FileSystem::FILE_ID_INFO>() as u32,
         ))?;
-        Ok(FileId(info.assume_init()))
+        Ok(FileId::Id(info.assume_init()))
     }
 }
 

src/tui.rs

@@ -16,7 +16,7 @@
 //! set up callbacks for when it is clicked, and then stop worrying about it.
 //!
 //! The downside of immediate mode is that your UI code _may_ become cluttered.
-//! The upside however is that that you cannot leak UI elements, you don't need to
+//! The upside however is that you cannot leak UI elements, you don't need to
 //! worry about lifetimes nor callbacks, and that simple UIs are simple to write.
 //!
 //! More importantly though, the primary reason for this is that the
@@ -2410,8 +2410,13 @@ impl<'a> Context<'a, '_> {
                         // If the line has some indentation and the user pressed Home,
                         // the first time it'll stop at the indentation. The second time
                         // they press it, it'll move to the true start of the line.
-                        let indent_end = tb.indent_end_logical_pos();
-                        if logical_after.x == 0 && logical_before > indent_end {
+                        //
+                        // If the cursor is already at the start of the line,
+                        // we move it back to the end of the indentation.
+                        if logical_after.x == 0
+                            && let indent_end = tb.indent_end_logical_pos()
+                            && (logical_before > indent_end || logical_before.x == 0)
+                        {
                             if modifiers == kbmod::SHIFT {
                                 tb.selection_update_logical(indent_end);
                             } else {

src/unicode/measurement.rs

@@ -486,7 +486,7 @@ impl<'doc> MeasurementConfig<'doc> {
     }
 }
 
-/// Seeks forward to to the given line start.
+/// Seeks forward to the given line start.
 ///
 /// If given a piece of `text`, and assuming you're currently at `offset` which
 /// is on the logical line `line`, this will seek forward until the logical line