Merge pull request #2394 from github/vim-modeline-fix

Improving Vim modeline regex
This commit is contained in:
Arfon Smith
2015-05-13 09:03:43 -05:00
2 changed files with 176 additions and 1 deletions

View File

@@ -2,7 +2,7 @@ module Linguist
module Strategy
class Modeline
EmacsModeline = /-\*-\s*(?:(?!mode)[\w-]+\s*:\s*(?:[\w+-]+)\s*;?\s*)*(?:mode\s*:)?\s*([\w+-]+)\s*(?:;\s*(?!mode)[\w-]+\s*:\s*[\w+-]+\s*)*;?\s*-\*-/i
VimModeline = /\/\*\s*vim:\s*set\s*(?:ft|filetype)=(\w+):\s*\*\//i
VimModeline = /vim:\s*set\s*(?:ft|filetype)=(\w+):/i
# Public: Detects language based on Vim and Emacs modelines
#