Update modeline patterns to use github-linguist/linguist#5271

CHANGELOG.md

@@ -9,6 +9,9 @@ This project adheres to [Semantic Versioning](http://semver.org).
 [Unpublished]
 ------------------------------------------------------------------------
 * __Added:__ Comment highlighting for interpreter directives (hashbangs)
+* __Fixed:__ [Various inaccuracies][1] related to modeline matching
+
+[1]: https://github.com/github/linguist/pull/5271
 
 
 

grammars/emacs-lisp.cson

@@ -21,16 +21,18 @@ firstLineMatch: """(?x)
 	(?:$|\\s)
 	|
 	# Modeline
-	(?i:
+	(?:
 		# Emacs
-		-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)
-			emacs-lisp
-		(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-
+		-\\*-(?i:[ \\t]*(?=[^:;\\s]+[ \\t]*-\\*-)|(?:.*?[ \\t;]|(?<=-\\*-))[ \\t]*mode[ \\t]*:[ \\t]*)
+			(?i:emacs-lisp)
+		(?=[ \\t;]|(?<![-*])-\\*-).*?-\\*-
 		|
 		# Vim
-		(?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=
-			(?:emacs-lisp|elisp)
-		(?=\\s|:|$)
+		(?:(?:^|[ \\t])(?:vi|Vi(?=m))(?:m[<=>]?[0-9]+|m)?|[ \\t]ex)(?=:(?=[ \\t]*set?[ \\t][^\\r\\n:]+:)|:(?![ \\t]*set?[ \\t]))
+		(?:(?:[ \\t]*:[ \\t]*|[ \\t])\\w*(?:[ \\t]*=(?:[^\\\\\\s]|\\\\.)*)?)*[ \\t:]
+		(?:filetype|ft|syntax)[ \\t]*=
+			(?i:emacs-lisp|elisp)
+		(?=$|\\s|:)
 	)
 """
 patterns: [{

grammars/muse.cson

@@ -19,19 +19,21 @@ patterns: [{
 	end:   "(?=A)B"
 	patterns: [include: "#main"]
 }]
-firstLineMatch: """(?ix)
+firstLineMatch: """(?x)
 
 	# Emacs modeline
-	-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)
-		muse
-	(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-
+	-\\*-(?i:[ \\t]*(?=[^:;\\s]+[ \\t]*-\\*-)|(?:.*?[ \\t;]|(?<=-\\*-))[ \\t]*mode[ \\t]*:[ \\t]*)
+		(?i:muse)
+	(?=[ \\t;]|(?<![-*])-\\*-).*?-\\*-
 
 	|
 
 	# Vim modeline
-	(?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s* set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=
-		muse
-	(?=\\s|:|$)
+	(?:(?:^|[ \\t])(?:vi|Vi(?=m))(?:m[<=>]?[0-9]+|m)?|[ \\t]ex)(?=:(?=[ \\t]*set?[ \\t][^\\r\\n:]+:)|:(?![ \\t]*set?[ \\t]))
+	(?:(?:[ \\t]*:[ \\t]*|[ \\t])\\w*(?:[ \\t]*=(?:[^\\\\\\s]|\\\\.)*)?)*[ \\t:]
+	(?:filetype|ft|syntax)[ \\t]*=
+		(?i:muse)
+	(?=$|\\s|:)
 """
 
 repository:

grammars/yasnippet.cson

@@ -4,11 +4,11 @@ fileTypes: [
 	"yasnippet"
 	"yas"
 ]
-firstLineMatch: """(?xi)
+firstLineMatch: """(?x)
 	# Emacs modeline
-	-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)
-		(?:yasnippet|snippet)
-	(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-
+	-\\*-(?i:[ \\t]*(?=[^:;\\s]+[ \\t]*-\\*-)|(?:.*?[ \\t;]|(?<=-\\*-))[ \\t]*mode[ \\t]*:[ \\t]*)
+		(?i:yasnippet|snippet)
+	(?=[ \\t;]|(?<![-*])-\\*-).*?-\\*-
 """
 
 patterns: [{