From e3d91d6dcc3a3b5d65f7c25686a1062f81af65ee Mon Sep 17 00:00:00 2001
From: Wilfred Hughes <me@wilfred.me.uk>
Date: Fri, 1 Apr 2022 22:24:12 -0700
Subject: [PATCH] Move header checks out of from_extension

---
 src/guess_language.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/guess_language.rs b/src/guess_language.rs
index 3b160c546..0ed13918b 100644
--- a/src/guess_language.rs
+++ b/src/guess_language.rs
@@ -62,7 +62,10 @@ pub fn guess(path: &Path, src: &str) -> Option<Language> {
     }
 
     match path.extension() {
-        Some(extension) => from_extension(extension, src),
+        Some(extension) => match from_extension(extension) {
+            Some(Language::Php) if src.starts_with("<?hh") => None,
+            language => language,
+        },
         None => None,
     }
 }
@@ -169,7 +172,7 @@ fn from_name(path: &Path) -> Option<Language> {
     }
 }
 
-fn from_extension(extension: &OsStr, src: &str) -> Option<Language> {
+fn from_extension(extension: &OsStr) -> Option<Language> {
     match extension.to_string_lossy().borrow() {
         "sh" | "bash" | "bats" | "cgi" | "command" | "env" | "fcgi" | "ksh" | "sh.in" | "tmux"
         | "tool" | "zsh" => Some(Bash),
@@ -201,7 +204,7 @@ fn from_extension(extension: &OsStr, src: &str) -> Option<Language> {
         "nix" => Some(Nix),
         "ml" => Some(OCaml),
         "mli" => Some(OCamlInterface),
-        "php" if !src.starts_with("<?hh") => Some(Php),
+        "php" => Some(Php),
         "py" | "py3" | "pyi" | "bzl" => Some(Python),
         "rb" | "builder" | "spec" | "rake" => Some(Ruby),
         "rs" => Some(Rust),