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

grammars/abnf.cson

@@ -2,19 +2,21 @@ name: "Augmented Backus-Naur Form"
 scopeName: "source.abnf"
 fileTypes: ["abnf"]
 patterns: [include: "#main"]
-firstLineMatch: """(?ix)
+firstLineMatch: """(?x)
 
 	# Emacs modeline
-	-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)
-		abnf
-	(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-
+	-\\*-(?i:[ \\t]*(?=[^:;\\s]+[ \\t]*-\\*-)|(?:.*?[ \\t;]|(?<=-\\*-))[ \\t]*mode[ \\t]*:[ \\t]*)
+		(?i:abnf)
+	(?=[ \\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*=
-		abnf
-	(?=\\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:abnf)
+	(?=$|\\s|:)
 """
 
 repository:

grammars/bnf.cson

@@ -2,19 +2,21 @@ name: "Backus-Naur Form"
 scopeName: "source.bnf"
 fileTypes: ["bnf"]
 patterns: [include: "#main"]
-firstLineMatch: """(?ix)
+firstLineMatch: """(?x)
 
 	# Emacs modeline
-	-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)
-		bnf
-	(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-
+	-\\*-(?i:[ \\t]*(?=[^:;\\s]+[ \\t]*-\\*-)|(?:.*?[ \\t;]|(?<=-\\*-))[ \\t]*mode[ \\t]*:[ \\t]*)
+		(?i:bnf)
+	(?=[ \\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*=
-		bnf
-	(?=\\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:bnf)
+	(?=$|\\s|:)
 """
 
 repository:

grammars/ebnf.cson

@@ -2,19 +2,21 @@ name: "Extended Backus-Naur Form"
 scopeName: "source.ebnf"
 fileTypes: ["ebnf"]
 patterns: [include: "#main"]
-firstLineMatch: """(?ix)
+firstLineMatch: """(?x)
 
 	# Emacs modeline
-	-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)
-		ebnf
-	(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-
+	-\\*-(?i:[ \\t]*(?=[^:;\\s]+[ \\t]*-\\*-)|(?:.*?[ \\t;]|(?<=-\\*-))[ \\t]*mode[ \\t]*:[ \\t]*)
+		(?i:ebnf)
+	(?=[ \\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*=
-		ebnf
-	(?=\\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:ebnf)
+	(?=$|\\s|:)
 """
 
 repository:

grammars/lark.cson

@@ -9,28 +9,28 @@ patterns: [{
 	beginCaptures:
 		0: name: "punctuation.definition.comment.shebang.lark"
 }, include: "#main"]
-firstLineMatch: """(?ix)
+firstLineMatch: """(?x)
 	
 	# Hashbang
 	^\\#!.*(?:\\s|\\/|(?<=!)\\b)
-		(?-i:lark)
+		lark
 	(?:$|\\s)
 	
 	|
 	
 	# Emacs modeline
-	-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)
-		lark
-	(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-
+	-\\*-(?i:[ \\t]*(?=[^:;\\s]+[ \\t]*-\\*-)|(?:.*?[ \\t;]|(?<=-\\*-))[ \\t]*mode[ \\t]*:[ \\t]*)
+		(?i:lark)
+	(?=[ \\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*=
-		lark
-	(?=\\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:lark)
+	(?=$|\\s|:)
 """
 
 repository:

grammars/lex.cson

@@ -2,19 +2,21 @@ name: "Lex"
 scopeName: "source.lex"
 fileTypes: ["l", "lex", "flex"]
 patterns: [include: "#main"]
-firstLineMatch: """(?ix)
+firstLineMatch: """(?x)
 
 	# Emacs modeline
-	-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)
-		f?lex
-	(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-
+	-\\*-(?i:[ \\t]*(?=[^:;\\s]+[ \\t]*-\\*-)|(?:.*?[ \\t;]|(?<=-\\*-))[ \\t]*mode[ \\t]*:[ \\t]*)
+		(?i:f?lex)
+	(?=[ \\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*=
-		f?lex
-	(?=\\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:f?lex)
+	(?=$|\\s|:)
 """
 
 repository:

grammars/yacc.cson

@@ -2,19 +2,21 @@ name: "Yacc/Bison"
 scopeName: "source.yacc"
 fileTypes: ["bison", "y", "yy", "yacc"]
 patterns: [include: "#main"]
-firstLineMatch: """(?ix)
+firstLineMatch: """(?x)
 
 	# Emacs modeline
-	-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)
-		(?:yacc|bison)
-	(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-
+	-\\*-(?i:[ \\t]*(?=[^:;\\s]+[ \\t]*-\\*-)|(?:.*?[ \\t;]|(?<=-\\*-))[ \\t]*mode[ \\t]*:[ \\t]*)
+		(?i:yacc|bison)
+	(?=[ \\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*=
-		(?:yacc|bison)
-	(?=\\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:yacc|bison)
+	(?=$|\\s|:)
 """
 
 repository: