changes

1 files changed, 70 insertions, 46 deletions

diff --git a/src/Buffer.zig b/src/Buffer.zig
index f105c55..0c95e6e 100644
--- a/src/Buffer.zig
+++ b/src/Buffer.zig
@@ -6,6 +6,7 @@ const ArrayList = std.ArrayList;
 const Buffer = @This();
 const Config = @import("Config.zig");
 const File = std.fs.File;
+const files = @import("files.zig");
 const Editor = @import("Editor.zig");
 const Highlight = @import("highlight.zig").Highlight;
 const Row = @import("Row.zig");
@@ -13,8 +14,8 @@ const Syntax = @import("Syntax.zig");
 
 allocator: Allocator,
 
-// TODO: Short name & file name split
-name: []u8,
+file_path: ?[]u8,
+short_name: []u8,
 
 rows: ArrayList(Row),
 
@@ -26,7 +27,6 @@ rowoff: usize,
 coloff: usize,
 
 dirty: bool,
-has_file: bool,
 
 config: Config,
 syntax: ?Syntax,
@@ -41,7 +41,8 @@ pub fn init(allocator: Allocator, name: []const u8) !Buffer {
     return Buffer{
         .allocator = allocator,
 
-        .name = name_owned,
+        .file_path = null,
+        .short_name = name_owned,
 
         .rows = ArrayList(Row).init(allocator),
 
@@ -53,7 +54,6 @@ pub fn init(allocator: Allocator, name: []const u8) !Buffer {
         .coloff = 0,
 
         .dirty = false,
-        .has_file = false,
 
         .config = config,
         .syntax = null,
@@ -61,7 +61,11 @@ pub fn init(allocator: Allocator, name: []const u8) !Buffer {
 }
 
 pub fn deinit(self: Buffer) void {
-    self.allocator.free(self.name);
+    if (self.file_path) |file_path| {
+        self.allocator.free(file_path);
+    }
+
+    self.allocator.free(self.short_name);
 
     for (self.rows.items) |row| {
         row.deinit();
@@ -218,10 +222,14 @@ pub fn drawRows(self: Buffer, writer: anytype, screenrows: usize, screencols: us
 pub fn drawStatusBar(self: Buffer, writer: anytype, screencols: usize) !void {
     try writer.writeAll("\x1b[m\x1b[7m");
 
-    var name = if (self.name.len > 20)
-        try std.fmt.allocPrint(self.allocator, "{s}...", .{self.name[0..17]})
+    var name = if (self.short_name.len > 20)
+        try std.fmt.allocPrint(
+            self.allocator,
+            "...{s}",
+            .{self.short_name[self.short_name.len - 17 ..]},
+        )
     else
-        try self.allocator.dupe(u8, self.name);
+        try self.allocator.dupe(u8, self.short_name);
     defer self.allocator.free(name);
 
     const modified = if (self.dirty)
@@ -271,7 +279,7 @@ pub fn goToLine(self: *Buffer, editor: *Editor) !void {
             return;
         };
 
-        self.cy = std.math.min(line - 1, self.rows.items.len);
+        self.cy = std.math.clamp(line, 1, self.rows.items.len + 1) - 1;
         if (self.cy == self.rows.items.len) {
             self.cx = 0;
         } else {
@@ -422,54 +430,73 @@ pub fn recenterTopBottom(self: *Buffer, screenrows: usize) void {
 }
 
 pub fn save(self: *Buffer, editor: *Editor) !void {
-    if (!self.has_file) {
-        const fname = try editor.prompt("Save as");
-        if (fname == null) {
-            return;
-        }
+    if (self.file_path == null) {
+        // TODO: Editor.prompt should take an Allocator
+        const fname = (try editor.prompt("Save as")) orelse { return; };
+        defer self.allocator.free(fname);
+
+        const file_path = try files.resolvePath(self.allocator, fname);
+        errdefer self.allocator.free(file_path);
 
-        self.allocator.free(self.name);
-        self.name = fname.?;
-        self.has_file = true;
+        const file_name = std.fs.path.basename(file_path);
+        const short_name = try editor.getUniqueBufferName(self.allocator, file_name);
+        errdefer self.allocator.free(short_name);
 
-        try self.selectSyntaxHighlighting();
+        self.allocator.free(self.short_name);
+        self.short_name = short_name;
+        self.file_path = file_path;
+
+        // TODO: Do I want to do this?
+        // try self.selectSyntaxHighlighting();
     }
 
     // TODO: Add a config value for this
     try self.cleanWhiteSpace();
 
-    const tmpname = try std.fmt.allocPrint(self.allocator, "{s}~{}", .{ self.name, std.time.milliTimestamp() });
-    defer self.allocator.free(tmpname);
+    const file_path = self.file_path.?;
+
+    const tmp_path = try std.fmt.allocPrint(
+        self.allocator,
+        "{s}~{}",
+        .{ file_path, std.time.milliTimestamp() },
+    );
+    defer self.allocator.free(tmp_path);
 
-    const tmpfile = std.fs.cwd().createFile(tmpname, .{ .truncate = true }) catch |err| {
-        try editor.setStatusMessage("Cannot open tempfile '{s}' for writing: {}", .{ tmpname, err });
+    const tmp_file = std.fs.createFileAbsolute(tmp_path, .{ .truncate = true }) catch |err| {
+        try editor.setStatusMessage(
+            "Cannot open tempfile '{s}' for writing: {}",
+            .{ tmp_path, err },
+        );
         return;
     };
-    defer tmpfile.close();
+    defer tmp_file.close();
 
-    const stat = statFile(self.name) catch |err| {
-        try editor.setStatusMessage("Couldn't stat file '{s}': {}", .{ self.name, err });
+    const mode = statFileMode(file_path) catch |err| {
+        try editor.setStatusMessage("Couldn't stat file '{s}': {}", .{ file_path, err });
         return;
     };
 
-    tmpfile.chmod(stat.mode) catch |err| {
-        try editor.setStatusMessage("Couldn't chmod tempfile '{s}': {}", .{ tmpname, err });
+    tmp_file.chmod(mode) catch |err| {
+        try editor.setStatusMessage("Couldn't chmod tempfile '{s}': {}", .{ tmp_path, err });
         return;
     };
 
     // TODO: chown
 
-    self.writeToFile(tmpfile) catch |err| {
-        try editor.setStatusMessage("Couldn't write to tempfile '{s}': {}", .{ tmpname, err });
+    self.writeToFile(tmp_file) catch |err| {
+        try editor.setStatusMessage("Couldn't write to tempfile '{s}': {}", .{ tmp_path, err });
         return;
     };
 
-    std.fs.cwd().rename(tmpname, self.name) catch |err| {
-        try editor.setStatusMessage("Couldn't move '{s}' to '{s}': {}", .{ tmpname, self.name, err });
+    std.fs.renameAbsolute(tmp_path, file_path) catch |err| {
+        try editor.setStatusMessage(
+            "Couldn't move '{s}' to '{s}': {}",
+            .{ tmp_path, file_path, err },
+        );
         return;
     };
 
-    try editor.setStatusMessage("Saved to '{s}'", .{self.name});
+    try editor.setStatusMessage("Saved to '{s}'", .{file_path});
     self.dirty = false;
 }
 
@@ -494,12 +521,17 @@ pub fn scroll(self: *Buffer, screenrows: usize, screencols: usize) void {
 
 pub fn selectSyntaxHighlighting(self: *Buffer) !void {
     self.syntax = null;
+    const name = if (self.file_path) |file_path|
+        std.fs.path.basename(file_path)
+    else
+        self.short_name;
 
-    const ext = if (std.mem.lastIndexOfScalar(u8, self.name, '.')) |idx| self.name[idx..] else null;
+    const ext = if (std.mem.lastIndexOfScalar(u8, name, '.')) |idx| name[idx..] else null;
     for (Syntax.database) |syntax| {
         for (syntax.filematch) |filematch| {
             const is_ext = filematch[0] == '.';
-            if ((is_ext and ext != null and std.mem.eql(u8, ext.?, filematch)) or (!is_ext and std.mem.eql(u8, self.name, filematch))) {
+            if ((is_ext and ext != null and std.mem.eql(u8, ext.?, filematch))
+                or (!is_ext and std.mem.eql(u8, name, filematch))) {
                 self.syntax = syntax;
 
                 for (self.rows.items) |*row| {
@@ -529,22 +561,14 @@ fn printWithLeftPadding(
     try writer.writeAll(unpadded);
 }
 
-fn statFile(name: []const u8) !File.Stat {
+fn statFileMode(name: []const u8) !File.Mode {
     const file = std.fs.cwd().openFile(name, .{}) catch |err| switch (err) {
-        error.FileNotFound => return File.Stat{
-            .inode = 0,
-            .size = 0,
-            .mode = 0o644,
-            .kind = .File,
-            .atime = 0,
-            .mtime = 0,
-            .ctime = 0,
-        },
+        error.FileNotFound => return 0o644,
         else => return err,
     };
     defer file.close();
 
-    return file.stat();
+    return (try file.stat()).mode;
 }
 
 fn writeToFile(self: Buffer, file: File) !void {