Ctrl-W to exit without saving

Author: Jeadie

colour.go

@@ -1,71 +1,71 @@
 package main
 
 import (
-    "encoding/json"
-    "fmt"
-    "os"
+	"encoding/json"
+	"fmt"
+	"os"
 )
 
 const (
-    Reset       Colour = "\033[0m"
-    Default            = "\033[39m"
-    Black              = "\033[30m"
-    Red                = "\033[91m"
-    DarkRed            = "\033[31m"
-    Green              = "\033[92m"
-    DarkGreen          = "\033[32m"
-    DarkYellow         = "\033[33m"
-    Orange             = "\033[38:5:202m" // "\033[93m"
-    Blue               = "\033[94m"
-    DarkBlue           = "\033[34m"
-    Cyan               = "\033[96m"
-    Magenta            = "\033[95m"
-    DarkMagenta        = "\033[35m"
-    DarkCyan           = "\033[36m"
-    LightGray          = "\033[37m"
-    DarkGray           = "\033[90m"
-    White              = "\033[97m"
+	Reset       Colour = "\033[0m"
+	Default            = "\033[39m"
+	Black              = "\033[30m"
+	Red                = "\033[91m"
+	DarkRed            = "\033[31m"
+	Green              = "\033[92m"
+	DarkGreen          = "\033[32m"
+	DarkYellow         = "\033[33m"
+	Orange             = "\033[38:5:202m" // "\033[93m"
+	Blue               = "\033[94m"
+	DarkBlue           = "\033[34m"
+	Cyan               = "\033[96m"
+	Magenta            = "\033[95m"
+	DarkMagenta        = "\033[35m"
+	DarkCyan           = "\033[36m"
+	LightGray          = "\033[37m"
+	DarkGray           = "\033[90m"
+	White              = "\033[97m"
 )
 
 type ColourScheme struct {
-    Keyword  Colour `json:"Keyword"`
-    Strings  Colour `json:"Strings"`
-    Comments Colour `json:"Comments"`
-    Numbers  Colour `json:"Numbers"`
-    Todos    Colour `json:"Todos"`
-    Name     string `json:"Name"`
+	Keyword  Colour `json:"Keyword"`
+	Strings  Colour `json:"Strings"`
+	Comments Colour `json:"Comments"`
+	Numbers  Colour `json:"Numbers"`
+	Todos    Colour `json:"Todos"`
+	Name     string `json:"Name"`
 }
 
 var defaultColourScheme = ColourScheme{
-    Keyword: Orange, Strings: Green, Comments: DarkGray, Numbers: Blue, Todos: DarkYellow, Name: "Default",
+	Keyword: Orange, Strings: Green, Comments: DarkGray, Numbers: Blue, Todos: DarkYellow, Name: "Default",
 }
 
 func GetColourScheme() ColourScheme {
-    v, exists := os.LookupEnv("GRAM_COLOUR_SCHEME")
-    if !exists {
-        return defaultColourScheme
-    }
-    colours := LoadColourSchemesFromFile("colours.json")
-    for _, c := range colours {
-        if c.Name == v {
-            // TODO: Refactor hor colours are stored to allow for better colour scheme formats
-            // TODO: Also, can't natively store \033 in file. More reason to migrate colour format
-            return defaultColourScheme
-        }
-    }
-    return defaultColourScheme
+	v, exists := os.LookupEnv("GRAM_COLOUR_SCHEME")
+	if !exists {
+		return defaultColourScheme
+	}
+	colours := LoadColourSchemesFromFile("colours.json")
+	for _, c := range colours {
+		if c.Name == v {
+			// TODO: Refactor hor colours are stored to allow for better colour scheme formats
+			// TODO: Also, can't natively store \033 in file. More reason to migrate colour format
+			return defaultColourScheme
+		}
+	}
+	return defaultColourScheme
 }
 
 func LoadColourSchemesFromFile(file string) []ColourScheme {
-    bytes, err := os.ReadFile(file)
-    if err != nil {
-        return []ColourScheme{}
-    }
+	bytes, err := os.ReadFile(file)
+	if err != nil {
+		return []ColourScheme{}
+	}
 
-    var colours []ColourScheme
-    err = json.Unmarshal(bytes, &colours)
-    if err != nil {
-        panic(fmt.Errorf("%w", err))
-    }
-    return colours
+	var colours []ColourScheme
+	err = json.Unmarshal(bytes, &colours)
+	if err != nil {
+		panic(fmt.Errorf("%w", err))
+	}
+	return colours
 }

editor.go

@@ -25,14 +25,16 @@ const (
 	SHIFT_LEFT      = 1010
 
 	// Specific ANSI mappings
-	BACKSPACE  = 127
-	ENTER      = 13
-	SEARCH     = 6  // Ctrl-F on Mac OS
-	UNDO       = 26 // Ctrl-X on Mac OS
-	COPY       = 3  // Ctrl-C on Mac OS
-	PASTE      = 22 // Ctrl-V on Mac OS
-	DELETE_ROW = 4  // Ctrl-D on Mac OS
-	SAVE       = 19 // Ctrl-S on Mac OS
+	BACKSPACE     = 127
+	ENTER         = 13
+	SEARCH        = 6  // Ctrl-F on Mac OS
+	UNDO          = 26 // Ctrl-X on Mac OS
+	COPY          = 3  // Ctrl-C on Mac OS
+	PASTE         = 22 // Ctrl-V on Mac OS
+	DELETE_ROW    = 4  // Ctrl-D on Mac OS
+	SAVE          = 19 // Ctrl-S on Mac OS
+	SAVE_AND_EXIT = 17 // Ctrl-Q on Mac OS
+	EXIT          = 23 // Ctrl-W on Mac OS
 )
 
 type Editor struct {
@@ -182,8 +184,14 @@ func (e *Editor) ReadCharBlock() byte {
 func (e *Editor) KeyPress() bool {
 	x := e.ReadChar()
 	switch x {
-	case Ctrl('q'):
+
+	case SAVE_AND_EXIT:
+		e.Save()
 		return true
+
+	case EXIT:
+		return true
+
 	case '\x1b':
 		c := e.HandleEscapeCode()
 		e.HandleMoveCursor(c)
@@ -416,15 +424,14 @@ func (e *Editor) DrawStatusBar() {
 }
 
 func (e *Editor) Close() error {
-	saveErr := e.Save()
 	err := RevertTerminalMode(e.originalTermios)
 	if err != nil {
 		fmt.Println(fmt.Errorf(
 			"Error on terminal close when disabling raw mode. Error: %w\n", err,
 		).Error())
 	}
 	e.filename = ""
-	return saveErr
+	return err
 }
 
 func (e *Editor) Save() error {