Merge branch 'master' into revert-2014-revert-1976-path-for-fileblob

This commit is contained in:
Arfon Smith
2015-03-14 17:18:36 -05:00
4 changed files with 111 additions and 0 deletions

View File

@@ -62,6 +62,7 @@ module Linguist
generated_parser? ||
generated_net_docfile? ||
generated_postscript? ||
compiled_cython_file? ||
generated_protocol_buffer_go? ||
generated_protocol_buffer? ||
generated_jni_header? ||
@@ -270,5 +271,17 @@ module Linguist
# VCR Cassettes have "recorded_with: VCR" in the second last line.
return lines[-2].include?("recorded_with: VCR")
end
# Internal: Is this a compiled C/C++ file from Cython?
#
# Cython-compiled C/C++ files typically contain:
# /* Generated by Cython x.x.x on ... */
# on the first line.
#
# Return true or false
def compiled_cython_file?
return false unless ['.c', '.cpp'].include? extname
return lines[0].include?("Generated by Cython")
end
end
end

View File

@@ -2213,6 +2213,7 @@ PLSQL:
- .pkb
- .pks
- .plb
- .plsql
- .sql
#Postgres