NeonXP/micro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correctly detect synatx ft from header

Browse source
This commit is contained in:
Zachary Yedidia 2017-05-03 11:04:56 -04:00
parent d3f32b5bc3
commit 67ec0d3c80
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/micro/highlight/ftdetect.go
View file

@ -6,7 +6,9 @@ import "regexp"
// to determine the filetype of the file
// It will return the corresponding syntax definition for the filetype
func MatchFiletype(ftdetect [2]*regexp.Regexp, filename string, firstLine []byte) bool {
return ftdetect[0].MatchString(filename)
if ftdetect[0].MatchString(filename) {
return true
}
if ftdetect[1] != nil {
return ftdetect[1].Match(firstLine)

9
cmd/micro/micro.go
View file

@ -84,13 +84,14 @@ func LoadInput() []*Buffer {
var filename string
var input []byte
var err error
var buffers []*Buffer
args := flag.Args()
buffers := make([]*Buffer, 0, len(args))
if len(flag.Args()) > 0 {
if len(args) > 0 {
// Option 1
// We go through each file and load it
for i := 0; i < len(flag.Args()); i++ {
filename = flag.Args()[i]
for i := 0; i < len(args); i++ {
filename = args[i]
// Check that the file exists
var input *os.File