Merge 459c9baa89069c6e5f2eb5238b87ff3d4e105fd9 into 40c3cecabb38a68064727368b5882196a59d34d9

CHANGELOG.md

@@ -1,13 +1,5 @@
 # 🎀 Changelog
 
-## [2.2.3] - 2024-04-27
-### Fixed
-- Highligher and hinter work now, since it was regressed from the previous minor release.
-- `cat` command no longer prints extra newline at end of each file
-
-### Added
-- `cat` command now reads files in chunks, allowing for reading large files
-
 ## [2.2.2] - 2024-04-16
 ### Fixed
 - Line refresh fixes (less flicker)

api.go

@@ -712,14 +712,5 @@ func hlhinter(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 // #example
 // #param line string
 func hlhighlighter(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
-	if err := c.Check1Arg(); err != nil {
-		return nil, err
-	}
-
-	line, err := c.StringArg(0)
-	if err != nil {
-		return nil, err
-	}
-
-	return c.PushingNext1(t.Runtime, rt.StringValue(line)), nil
+	return c.Next(), nil
 }

nature/commands/cat.lua

@@ -9,8 +9,6 @@ commander.register('cat', function(args, sinks)
 usage: cat [file]...]]
 	end
 
-	local chunkSize = 2^13 -- 8K buffer size
-
 	for _, fName in ipairs(args) do
 		local f = io.open(fName)
 		if f == nil then
@@ -19,11 +17,7 @@ usage: cat [file]...]]
 			goto continue
 		end
 
-		while true do
-			local block = f:read(chunkSize)
-			if not block then break end
-			sinks.out:write(block)
-		end
+		sinks.out:writeln(f:read '*a')
 		::continue::
 	end
 	io.flush()

nature/greenhouse/init.lua

@@ -271,15 +271,6 @@ end
 function Greenhouse:input(char)
 end
 
-local function read()
-	terminal.saveState()
-	terminal.setRaw()
-	local c = hilbish.editor.readChar()
-
-	terminal.restoreState()
-	return c
-end
-
 function Greenhouse:initUi()
 	local ansikit = require 'ansikit'
 	local bait = require 'bait'
@@ -289,17 +280,14 @@ function Greenhouse:initUi()
 	local Page = require 'nature.greenhouse.page'
 	local done = false
 
-	local function sigint()
+	bait.catch('signal.sigint', function()
 		ansikit.clear()
 		done = true
-	end
+	end)
 
-	local function resize()
+	bait.catch('signal.resize', function()
 		self:update()
-	end
-	bait.catch('signal.sigint', sigint)
-
-	bait.catch('signal.resize', resize)
+	end)
 
 	ansikit.screenAlt()
 	ansikit.clear(true)
@@ -323,10 +311,15 @@ function Greenhouse:initUi()
 
 	ansikit.showCursor()
 	ansikit.screenMain()
+end
 
-	self = nil
-	bait.release('signal.sigint', sigint)
-	bait.release('signal.resize', resize)
+function read()
+	terminal.saveState()
+	terminal.setRaw()
+	local c = hilbish.editor.readChar()
+
+	terminal.restoreState()
+	return c
 end
 
 return Greenhouse

rl.go

@@ -70,8 +70,11 @@ func newLineReader(prompt string, noHist bool) *lineReader {
 		hooks.Emit("hilbish.vimAction", actionStr, args)
 	}
 	rl.HintText = func(line []rune, pos int) []rune {
-		hinter := hshMod.Get(rt.StringValue("hinter"))
-		retVal, err := rt.Call1(l.MainThread(), hinter,
+		if hinter == nil {
+			return []rune{}
+		}
+
+		retVal, err := rt.Call1(l.MainThread(), rt.FunctionValue(hinter),
 		rt.StringValue(string(line)), rt.IntValue(int64(pos)))
 		if err != nil {
 			fmt.Println(err)
@@ -86,8 +89,10 @@ func newLineReader(prompt string, noHist bool) *lineReader {
 		return []rune(hintText)
 	}
 	rl.SyntaxHighlighter = func(line []rune) string {
-		highlighter := hshMod.Get(rt.StringValue("highlighter"))
-		retVal, err := rt.Call1(l.MainThread(), highlighter,
+		if highlighter == nil {
+			return string(line)
+		}
+		retVal, err := rt.Call1(l.MainThread(), rt.FunctionValue(highlighter),
 		rt.StringValue(string(line)))
 		if err != nil {
 			fmt.Println(err)

vars.go

@@ -11,7 +11,7 @@ var (
 
 // Version info
 var (
-	ver = "v2.2.3"
+	ver = "v2.2.2"
 	releaseName = "Poppy"
 
 	gitCommit string