github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-30 06:37:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #433 from ilius/pr03.python_syntax

Browse Source 
Fixes in Python 2.7 syntax, add Python 3.x syntax
This commit is contained in:
Zachary Yedidia
2016-10-29 10:20:41 -04:00
committed by GitHub
parent a83ecd477e 418720f6df
commit b4b0eda7d9
5 changed files with 131 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/micro/highlighter.go
View File

@@ -259,13 +259,16 @@ func LoadRulesFromFile(text, filename string) []SyntaxRule {
// FindFileType finds the filetype for the given buffer
func FindFileType(buf *Buffer) string {
for r := range syntaxFiles {
if r[1] != nil && r[1].MatchString(buf.Line(0)) {
// The header statement matches the first line
return syntaxFiles[r].filetype
}
}
for r := range syntaxFiles {
if r[0] != nil && r[0].MatchString(buf.Path) {
// The syntax statement matches the extension
return syntaxFiles[r].filetype
} else if r[1] != nil && r[1].MatchString(buf.Line(0)) {
// The header statement matches the first line
return syntaxFiles[r].filetype
}
}
return "Unknown"

43
cmd/micro/runtime.go
View File

File diff suppressed because one or more lines are too long