Rewrite patterns for matching Vim/Emacs modelines

Alhadis · Alhadis · commit abffa5855cd5 · 2016-09-18T01:57:03.000+10:00
Both of the previous patterns had flawed handling of less obvious cases,
such as wrongly accepting invalid modelines, or failing to match grammar
that would otherwise be understood by Vim or Emacs.

Emacs:
* Boundaries now matched correctly to avoid matching "not-mode: nroff;"
* Invalid modelines like "-*- nroff; -*-" are now ignored
* Preceding variables containing asterisks are permitted
* Semicolons are no longer required to separate modes from variables
* Handling of malformed modelines better resembles Emacs's own behaviour

Vim:
* Version-specific modelines are now supported: "vim&lt;200: ft=roff"
* Preceding whitespace is required before "vim/ex"
* Boolean options may now be listed before filetypes: "vi: noet ft=roff"
* Escaped backslashes are handled properly; "vim: s=foo\ ft=cpp ft=roff"
diff --git a/grammars/roff.cson b/grammars/roff.cson
@@ -37,12 +37,20 @@ firstLineMatch: """(?x)
 	^'\\\\\"\\x20[tre]+(?=\\s|$)
 	|
 	
-	# Emacs modeline
-	(?i:-\\*-[^*]*(?:mode:\\s*)?\\b[gnt]?roff(?:\\s*;.*?)?\\s*-\\*-
-	|
-	
-	# Vim modeline
-	(?:vim?|ex):\\s*(?:set?.*\\s)?(?:syntax|filetype|ft)=[gnt]?roff\\s?(?:.*:)?)
+	# Modeline
+	(?i:
+		# Emacs
+		-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)
+			[gnt]?roff
+		(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-
+		
+		|
+		
+		# 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*=
+			[gnt]?roff
+		(?=\\s|:|$)
+	)
 """
 patterns: [{ include: "#main" }]
 
