KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-12-29 21:31:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1354 from github/binary-language-mkII

Browse Source 
Ask Charlock earlier
This commit is contained in:
Arfon Smith
2014-07-07 15:43:52 -05:00
parent 408a325732 bc7596a8b5
commit 4948ec2999
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/linguist/language.rb
View File

@@ -104,7 +104,7 @@ module Linguist
# #
# We'll perform a more comprehensive test later which actually involves # We'll perform a more comprehensive test later which actually involves
# looking for binary characters in the blob # looking for binary characters in the blob
return nil if blob.likely_binary? return nil if blob.likely_binary? || blob.binary?
# A bit of an elegant hack. If the file is executable but extensionless, # A bit of an elegant hack. If the file is executable but extensionless,
# append a "magic" extension so it can be classified with other # append a "magic" extension so it can be classified with other
@@ -124,7 +124,7 @@ module Linguist
possible_language_names = possible_languages.map(&:name) possible_language_names = possible_languages.map(&:name)
# Don't bother with binary contents or an empty file # Don't bother with binary contents or an empty file
if blob.binary? || data.nil? || data == "" if data.nil? || data == ""
nil nil
# Check if there's a shebang line and use that as authoritative # Check if there's a shebang line and use that as authoritative
elsif (result = find_by_shebang(data)) && !result.empty? elsif (result = find_by_shebang(data)) && !result.empty?
@@ -401,7 +401,7 @@ module Linguist
# #
# Returns the extensions Array # Returns the extensions Array
attr_reader :filenames attr_reader :filenames
# Public: Return all possible extensions for language # Public: Return all possible extensions for language
def all_extensions def all_extensions
(extensions + [primary_extension]).uniq (extensions + [primary_extension]).uniq