Merge a24bca3258 into d46c079afb

.github/workflows/build.yml

@@ -1,12 +1,8 @@
 name: Build
 
 on:
-  push:
+  - push
-    branches:
+  - pull_request
-    - master
-  pull_request:
-    branches:
-    - master
 
 jobs:
   build:
@@ -23,18 +19,18 @@ jobs:
             goos: windows
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           submodules: true
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2
         with:
           go-version: '1.18.8'
       - name: Download Task
         run: 'sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d'
       - name: Build
         run: GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} ./bin/task
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v2
         if: matrix.goos == 'windows'
         with:
           name: hilbish-${{ matrix.goos }}-${{ matrix.goarch }}
@@ -48,7 +44,7 @@ jobs:
             libs
             docs
             emmyLuaDocs
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v2
         if: matrix.goos != 'windows'
         with:
           name: hilbish-${{ matrix.goos }}-${{ matrix.goarch }}

.github/workflows/codeql-analysis.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/docs.yml

@@ -9,8 +9,8 @@ jobs:
   gen:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v2
       - name: Run docgen
         run: go run cmd/docgen/docgen.go
       - name: Commit new docs

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
   create-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - uses: taiki-e/create-gh-release-action@v1
         with:
           title: Hilbish $tag
@@ -30,7 +30,7 @@ jobs:
           - goarch: arm64
             goos: windows
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         submodules: true
         fetch-depth: 0

.github/workflows/website.yml

@@ -1,26 +1,22 @@
 name: Build website
 
 on:
-  push:
+  - push
-    branches:
+  - pull_request
-    - master
-  pull_request:
-    branches:
-    - master
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: true
           fetch-depth: 0
 
       - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v3
+        uses: peaceiris/actions-hugo@v2
         with:
-          hugo-version: '0.111.3'
+          hugo-version: 'latest'
           extended: true
 
       - name: Set branch name
@@ -36,14 +32,14 @@ jobs:
 
       - name: Deploy
         if: env.BRANCH_NAME == 'master' && github.repository_owner == 'Rosettea'
-        uses: peaceiris/actions-gh-pages@v4
+        uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./website/public
           keep_files: true
       - name: Deploy
         if: env.BRANCH_NAME != 'master' && github.repository_owner == 'Rosettea'
-        uses: peaceiris/actions-gh-pages@v4
+        uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./website/public

CHANGELOG.md

@@ -28,9 +28,6 @@ hilbish.run('wc -l', {
 })
 ```
 
-### Fixed
-- Fix ansi attributes causing issues with text when cut off in greenhouse
-
 ## [2.2.3] - 2024-04-27
 ### Fixed
 - Highligher and hinter work now, since it was regressed from the previous minor release.

nature/doc.lua

@@ -17,8 +17,8 @@ function M.renderCodeBlock(text)
 	end
 
 	for i, line in ipairs(lines) do
-		lines[i] = lunacolors.format('{greyBg}' .. ' ' .. M.highlight(line:sub(0, longest))
+		lines[i] = ' ' .. M.highlight(line:sub(0, longest))
-		.. string.rep(' ', longest - line:len()) .. ' ')
+		.. string.rep(' ', longest - line:len()) .. ' '
 	end
 
 	return '\n' .. lunacolors.format('{greyBg}' .. table.concat(lines, '\n')) .. '\n'

nature/greenhouse/init.lua

@@ -61,24 +61,17 @@ function Greenhouse:updateCurrentPage(text)
 	page:setText(text)
 end
 
-local ansiPatters = {
-	'\x1b%[%d+;%d+;%d+;%d+;%d+%w',
-	'\x1b%[%d+;%d+;%d+;%d+%w',
-	'\x1b%[%d+;%d+;%d+%w',
-	'\x1b%[%d+;%d+%w',
-	'\x1b%[%d+%w'
-}
-
 function Greenhouse:sub(str, offset, limit)
 	local overhead = 0
 	local function addOverhead(s)
 		overhead = overhead + string.len(s)
 	end
 
-	local s = str
+	local s = str:gsub('\x1b%[%d+;%d+;%d+;%d+;%d+%w', addOverhead)
-	for _, pat in ipairs(ansiPatters) do
+     :gsub('\x1b%[%d+;%d+;%d+;%d+%w', addOverhead)
-		s = s:gsub(pat, addOverhead)
+     :gsub('\x1b%[%d+;%d+;%d+%w',addOverhead)
-	end
+     :gsub('\x1b%[%d+;%d+%w', addOverhead)
+     :gsub('\x1b%[%d+%w', addOverhead)
 
 	return s:sub(offset, utf8.offset(str, limit + overhead) or limit + overhead)
 	--return s:sub(offset, limit + overhead)
@@ -101,40 +94,14 @@ function Greenhouse:draw()
 	self.sink:write(ansikit.getCSI(2, 'J'))
 
 	local writer = self.sink.writeln
-	self.attributes = {}
 	for i = offset, offset + self.region.height - 1 do
-		local resetEnd = false
 		if i > #lines then break end
 
 		if i == offset + self.region.height - 1 then writer = self.sink.write end
 
 		self.sink:write(ansikit.getCSI(self.start + i - offset .. ';1', 'H'))
 		local line = lines[i]:gsub('{separator}', function() return self.separator:rep(self.region.width - 1) end)
-		for _, pat in ipairs(ansiPatters) do
+		writer(self.sink, self:sub(line:gsub('\t', '        '), self.horizOffset, self.region.width))
-			line:gsub(pat, function(s)
-				if s == lunacolors.formatColors.reset then
-					self.attributes = {}
-					resetEnd = true
-				else
-					--resetEnd = false
-					--table.insert(self.attributes, s)
-				end
-			end)
-		end
-
---[[
-		if #self.attributes ~= 0 then
-			for _, attr in ipairs(self.attributes) do
-				--writer(self.sink, attr)
-			end
-		end
-]]--
-
-		self.sink:write(lunacolors.formatColors.reset)
-		writer(self.sink, self:sub(line:gsub('\t', '        '), self.horizOffset, self.region.width + self.horizOffset))
-		if resetEnd then
-			self.sink:write(lunacolors.formatColors.reset)
-		end
 	end
 	writer(self.sink, '\27[0m')
 	self:render()