walles/moar
1
1
Fork 0
mirror of https://github.com/walles/moar.git synced 2024-11-22 21:50:43 +03:00
Code Issues Projects Releases Wiki Activity

Auto detect JSON for highlighting

Browse Source 
Resolves #240.
This commit is contained in:
Johan Walles 2024-09-10 16:54:53 +02:00
parent f885c873af
commit 6d3bf3dfd4
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
m/reader.go
View File

@ -3,6 +3,7 @@ package m
import (
"bufio"
"bytes"
"encoding/json"
"fmt"
"io"
"os"
@ -112,11 +113,9 @@ func (reader *Reader) preAllocLines() {
func (reader *Reader) readStream(stream io.Reader, formatter chroma.Formatter, lexer chroma.Lexer) {
reader.consumeLinesFromStream(stream)
if lexer != nil {
t0 := time.Now()
highlightFromMemory(reader, <-reader.highlightingStyle, formatter, lexer)
log.Debug("highlightFromMemory() took ", time.Since(t0))
}
t0 := time.Now()
highlightFromMemory(reader, <-reader.highlightingStyle, formatter, lexer)
log.Debug("highlightFromMemory() took ", time.Since(t0))
reader.done.Store(true)
select {
@ -534,10 +533,6 @@ func NewReaderFromFilename(filename string, style chroma.Style, formatter chroma
// We expect this to be executed in a goroutine
func highlightFromMemory(reader *Reader, style chroma.Style, formatter chroma.Formatter, lexer chroma.Lexer) {
if lexer == nil {
return
}
defer func() {
reader.highlightingDone.Store(true)
select {
@ -546,18 +541,20 @@ func highlightFromMemory(reader *Reader, style chroma.Style, formatter chroma.Fo
}
}()
// Is the buffer small enough?
var byteCount int64
reader.Lock()
for _, line := range reader.lines {
byteCount += int64(len(line.raw))
if byteCount > MAX_HIGHLIGHT_SIZE {
log.Debug("File too large for highlighting: ", byteCount)
reader.Unlock()
return
}
}
reader.Unlock()
if byteCount > MAX_HIGHLIGHT_SIZE {
log.Debug("File too large for highlighting: ", byteCount)
return
}
textBuilder := strings.Builder{}
reader.Lock()
for _, line := range reader.lines {
@ -565,8 +562,19 @@ func highlightFromMemory(reader *Reader, style chroma.Style, formatter chroma.Fo
textBuilder.WriteString("\n")
}
reader.Unlock()
text := textBuilder.String()
highlighted, err := highlight(textBuilder.String(), style, formatter, lexer)
if lexer == nil && json.Valid([]byte(text)) {
log.Debug("Buffer is valid JSON, highlighting as JSON")
lexer = lexers.Get("json")
}
if lexer == nil {
log.Debug("No lexer set for highlighting")
return
}
highlighted, err := highlight(text, style, formatter, lexer)
if err != nil {
log.Warn("Highlighting failed: ", err)
return