KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

dont save useless matches, thanks to pchaigno

Browse Source
This commit is contained in:
michael tesch
2015-03-15 12:40:31 +01:00
parent fda0f2a042
commit 5fd7992f98
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/linguist/strategy/modeline.rb
View File

@@ -1,7 +1,7 @@
module Linguist module Linguist
module Strategy module Strategy
class Modeline 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 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 = /\/\*\s*vim:\s*set\s*(?:ft|filetype)=(\w+):\s*\*\//i
# Public: Detects language based on Vim and Emacs modelines # Public: Detects language based on Vim and Emacs modelines
@@ -22,13 +22,8 @@ module Linguist
# #
# Returns a String or nil # Returns a String or nil
def self.modeline(data) def self.modeline(data)
match = data.match(EmacsModeline) match = data.match(EmacsModeline) | data.match(VimModeline)
if match match[1] if match
match[4]
else
match = data.match(VimModeline)
match[1] if match
end
end end
end end
end end