mirror of
https://github.com/rwinkhart/go-highlite.git
synced 2026-09-05 08:27:19 -04:00
following gofmt -s
This commit is contained in:
+3
-3
@@ -4,9 +4,9 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
"log"
|
|
||||||
|
|
||||||
"github.com/fatih/color"
|
"github.com/fatih/color"
|
||||||
"github.com/jessp01/highlight"
|
"github.com/jessp01/highlight"
|
||||||
@@ -23,13 +23,13 @@ func main() {
|
|||||||
var syn_dir string
|
var syn_dir string
|
||||||
if gopath == "" {
|
if gopath == "" {
|
||||||
syn_dir = "/etc/highlight"
|
syn_dir = "/etc/highlight"
|
||||||
}else{
|
} else {
|
||||||
syn_dir = gopath + "/src/github.com/jessp01/highlight/syntax_files"
|
syn_dir = gopath + "/src/github.com/jessp01/highlight/syntax_files"
|
||||||
}
|
}
|
||||||
|
|
||||||
syn_dir = os.Getenv("SYNDIR")
|
syn_dir = os.Getenv("SYNDIR")
|
||||||
var defs []*highlight.Def
|
var defs []*highlight.Def
|
||||||
err := highlight.ParseSyntaxFiles (syn_dir, &defs)
|
err := highlight.ParseSyntaxFiles(syn_dir, &defs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-5
@@ -1,11 +1,11 @@
|
|||||||
package highlight
|
package highlight
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"io/ioutil"
|
||||||
|
"path/filepath"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
"unicode/utf8"
|
"unicode/utf8"
|
||||||
"path/filepath"
|
|
||||||
"io/ioutil"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// RunePos returns the rune index of a given byte index
|
// RunePos returns the rune index of a given byte index
|
||||||
@@ -62,14 +62,14 @@ func NewHighlighter(def *Def) *Highlighter {
|
|||||||
// color's group (represented as one byte)
|
// color's group (represented as one byte)
|
||||||
type LineMatch map[int]Group
|
type LineMatch map[int]Group
|
||||||
|
|
||||||
func ParseSyntaxFiles (dir string, defs *[]*Def) error{
|
func ParseSyntaxFiles(dir string, defs *[]*Def) error {
|
||||||
pattern := "*.yaml"
|
pattern := "*.yaml"
|
||||||
files, err := filepath.Glob(dir + "/" + pattern)
|
files, err := filepath.Glob(dir + "/" + pattern)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, file_path := range(files){
|
for _, file_path := range files {
|
||||||
file, err := ioutil.ReadFile(file_path)
|
file, err := ioutil.ReadFile(file_path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -228,7 +228,6 @@ func (h *Highlighter) highlightEmptyRegion(highlights LineMatch, start int, canM
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if len(line) == 0 {
|
if len(line) == 0 {
|
||||||
if canMatchEnd {
|
if canMatchEnd {
|
||||||
h.lastRegion = nil
|
h.lastRegion = nil
|
||||||
|
|||||||
Reference in New Issue
Block a user