Add the xoria theme

Author: xyproto

v2/cmenu.go

@@ -375,7 +375,8 @@ func (e *Editor) CommandMenu(c *vt.Canvas, tty *vt.TTY, status *StatusBar, undo
 				"Gray Mono      (O_THEME=graymono)",
 				"Amber Mono     (O_THEME=ambermono)",
 				"Green Mono     (O_THEME=greenmono)",
-				"Blue Mono      (O_THEME=bluemono)"}
+				"Blue Mono      (O_THEME=bluemono)",
+				"Xoria          (O_THEME=xoria)"}
 			menuChoices = append(menuChoices, "No colors      (NO_COLOR=1)")
 			useMenuIndex := 0
 			for i, menuChoiceText := range menuChoices {
@@ -462,6 +463,20 @@ func (e *Editor) CommandMenu(c *vt.Canvas, tty *vt.TTY, status *StatusBar, undo
 				envNoColor = false
 				e.setBlueTheme()
 				e.syntaxHighlight = false
+			case "xoria":
+				if termHas256Colors() {
+					envNoColor = false
+					registerXoria256Colors()
+					e.SetTheme(NewXoria256Theme())
+					e.syntaxHighlight = true
+				} else if envNoColor {
+					e.setNoColorTheme()
+					e.syntaxHighlight = false
+				} else {
+					envNoColor = false
+					e.SetTheme(NewXoria16Theme())
+					e.syntaxHighlight = true
+				}
 			case "nocolor":
 				envNoColor = true
 				e.setNoColorTheme()

v2/highlight.go

@@ -70,6 +70,8 @@ const (
 	TextAttrValue
 	TextTag
 	Type
+	CurlyBracket
+	IncludeSystem
 )
 
 // TextConfig holds the Text class configuration to be used by annotators when highlighting code.
@@ -79,8 +81,10 @@ type TextConfig struct {
 	AssemblyEnd   string
 	Class         string
 	Comment       string
+	CurlyBracket  string
 	Decimal       string
 	Dollar        string
+	IncludeSystem string
 	Keyword       string
 	Literal       string
 	Mut           string
@@ -118,8 +122,10 @@ var DefaultTextConfig = TextConfig{
 	AssemblyEnd:   "lightyellow",
 	Class:         "white",
 	Comment:       "darkgray",
+	CurlyBracket:  "red",
 	Decimal:       "red",
 	Dollar:        "white",
+	IncludeSystem: "red",
 	Keyword:       "red",
 	Literal:       "white",
 	Mut:           "magenta",
@@ -191,6 +197,10 @@ func (c TextConfig) GetClass(kind Kind) string {
 		return c.AssemblyEnd
 	case Mut:
 		return c.Mut
+	case CurlyBracket:
+		return c.CurlyBracket
+	case IncludeSystem:
+		return c.IncludeSystem
 	}
 	return ""
 }
@@ -259,9 +269,10 @@ func Print(s *scanner.Scanner, w io.Writer, p Printer, m mode.Mode) error {
 		}
 	}
 	inComment := false
+	inInclude := false
 	for tok := s.Scan(); tok != scanner.EOF; tok = s.Scan() {
 		tokText := s.TokenText()
-		if err := p.Print(w, tokenKind(tok, tokText, &inComment, m), tokText); err != nil {
+		if err := p.Print(w, tokenKind(tok, tokText, &inComment, &inInclude, m), tokText); err != nil {
 			return err
 		}
 	}
@@ -901,15 +912,15 @@ func (e *Editor) WriteLines(c *vt.Canvas, fromline, toline LineIndex, cx, cy uin
 								if inSelection {
 									c.WriteWideRuneBNoLock(tx, ty, e.NanoHelpForeground, e.NanoHelpBackground, letter)
 								} else if highlightCurrentLine && (e.highlightCurrentText || e.highlightCurrentLine) {
-									c.WriteWideRuneBNoLock(tx, ty, e.HighlightForeground, e.HighlightBackground, letter)
+									c.WriteWideRuneBNoLock(tx, ty, e.HighlightForeground, e.Background, letter)
 								} else {
 									c.WriteWideRuneBNoLock(tx, ty, fg, bg, letter)
 								}
 							} else if rw <= 1 {
 								if inSelection {
 									c.WriteRuneBNoLock(tx, ty, e.NanoHelpForeground, e.NanoHelpBackground, letter)
 								} else if highlightCurrentLine && (e.highlightCurrentText || e.highlightCurrentLine) {
-									c.WriteRuneBNoLock(tx, ty, e.HighlightForeground, e.HighlightBackground, letter)
+									c.WriteRuneBNoLock(tx, ty, e.HighlightForeground, e.Background, letter)
 								} else {
 									c.WriteRuneBNoLock(tx, ty, fg, bg, letter)
 								}
@@ -945,7 +956,7 @@ func (e *Editor) WriteLines(c *vt.Canvas, fromline, toline LineIndex, cx, cy uin
 		xp = cx + lineRuneCount
 		if int(cw-lineRuneCount) > 0 {
 			if highlightCurrentLine && e.highlightCurrentLine {
-				c.WriteRunesB(xp, yp, e.HighlightForeground, e.HighlightBackground, ' ', cw-lineRuneCount)
+				c.WriteRunesB(xp, yp, e.HighlightForeground, e.Background, ' ', cw-lineRuneCount)
 			} else {
 				c.WriteRunesB(xp, yp, e.Foreground, bg, ' ', cw-lineRuneCount)
 			}

v2/neweditor.go

@@ -457,6 +457,14 @@ func NewEditor(tty *vt.TTY, c *vt.Canvas, fnord FilenameOrData, lineNumber LineN
 		e.setBlueTheme()
 		e.syntaxHighlight = false
 		themeWasSet = true
+	case "xoria":
+		if termHas256Colors() {
+			registerXoria256Colors()
+			e.SetTheme(NewXoria256Theme(), assumeLightBackground)
+		} else if !envNoColor {
+			e.SetTheme(NewXoria16Theme(), assumeLightBackground)
+		}
+		themeWasSet = true
 	case "default":
 		themeWasSet = true
 	}

v2/syntax.go

@@ -10,22 +10,42 @@ import (
 )
 
 // tokenKind determines the Kind of a token for syntax highlighting.
-func tokenKind(tok rune, tokText string, inComment *bool, m mode.Mode) Kind {
+func tokenKind(tok rune, tokText string, inComment *bool, inInclude *bool, m mode.Mode) Kind {
 	// Detect single-line comment start/end.
 	if (m == mode.Assembly && tok == ';') ||
 		(m != mode.Assembly && m != mode.GoAssembly && m != mode.Clojure && m != mode.Lisp && m != mode.C && m != mode.Cpp && m != mode.Lua && tok == '#') ||
 		((m == mode.ABC || m == mode.Lilypond || m == mode.Perl || m == mode.Prolog) && tok == '%') {
 		*inComment = true
 	} else if tok == '\n' {
 		*inComment = false
+		*inInclude = false
 	}
 
 	// C-style preprocessor directives.
 	if (m == mode.C || m == mode.Cpp) && (tokText == "include" || tokText == "define" || tokText == "ifdef" || tokText == "ifndef" || tokText == "endif" || tokText == "else" || tokText == "elif") {
 		*inComment = false
+		if tokText == "include" {
+			*inInclude = true
+		}
 		return Keyword
 	}
 
+	// If we are inside a #include <...> directive, color tokens as IncludeSystem
+	if *inInclude && (m == mode.C || m == mode.Cpp) {
+		if tok == scanner.Char || tok == scanner.String || tok == scanner.RawString {
+			// #include "..." gets String color (local include)
+			*inInclude = false
+			return String
+		}
+		if unicode.IsSpace(tok) {
+			return Whitespace
+		}
+		if tok == '>' {
+			*inInclude = false
+		}
+		return IncludeSystem
+	}
+
 	if *inComment {
 		return Comment
 	}
@@ -91,6 +111,8 @@ func tokenKind(tok rune, tokText string, inComment *bool, m mode.Mode) Kind {
 		return Dollar
 	} else if tok == '<' || tok == '>' {
 		return AngleBracket
+	} else if tok == '{' || tok == '}' {
+		return CurlyBracket
 	}
 
 	if unicode.IsSpace(tok) {