Release v6.0.1 (#4016 )

* Update grammar submodule refs * Bump version to v.6.0.1
compiler: Allow loading grammars from syntaxes folder (#4015 )
2025-10-29 17:50:22 +00:00 · 2018-01-30 15:17:58 +00:00 · 2018-01-30 12:49:28 +01:00
9 changed files with 9 additions and 9 deletions
--- a/lib/linguist/version.rb
+++ b/lib/linguist/version.rb
@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "6.0.0"
+  VERSION = "6.0.1"
 end
--- a/tools/grammars/compiler/loader.go
+++ b/tools/grammars/compiler/loader.go
@@ -122,7 +122,7 @@ func isValidGrammar(path string, info os.FileInfo) bool {
 	case ".tmlanguage", ".yaml-tmlanguage":
 		return true
 	case ".cson", ".json":
-		return strings.HasSuffix(dir, "/grammars")
+		return strings.HasSuffix(dir, "/grammars") || strings.HasSuffix(dir, "/syntaxes")
 	default:
 		return false
 	}
--- a/vendor/CodeMirror
+++ b/vendor/CodeMirror
--- a/vendor/grammars/atom-language-julia
+++ b/vendor/grammars/atom-language-julia
--- a/vendor/grammars/atom-language-nextflow
+++ b/vendor/grammars/atom-language-nextflow
--- a/vendor/grammars/language-clojure
+++ b/vendor/grammars/language-clojure
--- a/vendor/grammars/language-css
+++ b/vendor/grammars/language-css
--- a/vendor/grammars/sublime-mask
+++ b/vendor/grammars/sublime-mask
--- a/vendor/grammars/vue-syntax-highlight
+++ b/vendor/grammars/vue-syntax-highlight
Author	SHA1	Message	Date
Colin Seymour	a18ad1d489	Release v6.0.1 (#4016 ) * Update grammar submodule refs * Bump version to v.6.0.1	2018-01-30 15:17:58 +00:00
Vicent Martí	25ac140d58	compiler: Allow loading grammars from `syntaxes` folder (#4015 )	2018-01-30 12:49:28 +01:00