@@ -1,4 +1,5 @@
11use std::collections::BTreeMap;
2+use std::ffi::OsStr;
23use std::fs::{self, File};
34use std::io::BufReader;
45use std::path::Path;
@@ -183,8 +184,7 @@ impl HighlightingAssets {
183184 let syntax = match (language, file) {
184185 (Some(language), _) => self.syntax_set.find_syntax_by_token(language),
185186 (None, InputFile::Ordinary(ofile)) => {
186− let path = Path::new(ofile.filename());
187− let file_name = path.file_name().and_then(|n| n.to_str()).unwrap_or("");
187+ let path = Path::new(ofile.provided_path());
188188 let line_syntax = self.get_first_line_syntax(reader);
189189
190190 let absolute_path = path.canonicalize().ok().unwrap_or(path.to_owned());
@@ -195,14 +195,17 @@ impl HighlightingAssets {
195195 self.syntax_set.find_syntax_by_name(syntax_name)
196196 }
197197 Some(MappingTarget::MapToUnknown) => line_syntax,
198− None => self.get_extension_syntax(file_name).or(line_syntax),
198+ None => {
199+ let file_name = path.file_name().unwrap_or_default();
200+ self.get_extension_syntax(file_name).or(line_syntax)
201+ }
199202 }
200203 }
201204 (None, InputFile::StdIn(None)) => String::from_utf8(reader.first_line.clone())
202205 .ok()
203206 .and_then(|l| self.syntax_set.find_syntax_by_first_line(&l)),
204207 (None, InputFile::StdIn(Some(file_name))) => self
205− .get_extension_syntax(file_name.to_str().unwrap())
208+ .get_extension_syntax(file_name)
206209 .or(self.get_first_line_syntax(reader)),
207210 (_, InputFile::ThemePreviewFile) => self.syntax_set.find_syntax_by_name("Rust"),
208211 };
@@ -210,15 +213,15 @@ impl HighlightingAssets {
210213 syntax.unwrap_or_else(|| self.syntax_set.find_syntax_plain_text())
211214 }
212215
213− fn get_extension_syntax(&self, file_name: &str) -> Option<&SyntaxReference> {
216+ fn get_extension_syntax(&self, file_name: &OsStr) -> Option<&SyntaxReference> {
214217 self.syntax_set
215− .find_syntax_by_extension(file_name)
218+ .find_syntax_by_extension(file_name.to_str().unwrap_or_default())
216219 .or_else(|| {
217220 self.syntax_set.find_syntax_by_extension(
218221 Path::new(file_name)
219222 .extension()
220223 .and_then(|x| x.to_str())
221− .unwrap_or(""),
224+ .unwrap_or_default(),
222225 )
223226 })
224227 }
@@ -259,14 +262,14 @@ mod tests {
259262 }
260263 }
261264
262− fn syntax_for_file_with_content(&self, file_name: &str, first_line: &str) -> String {
265+ fn syntax_for_file_with_content_os(&self, file_name: &OsStr, first_line: &str) -> String {
263266 let file_path = self.temp_dir.path().join(file_name);
264267 {
265268 let mut temp_file = File::create(&file_path).unwrap();
266269 writeln!(temp_file, "{}", first_line).unwrap();
267270 }
268271
269− let input_file = InputFile::Ordinary(OrdinaryFile::from_path(OsStr::new(&file_path)));
272+ let input_file = InputFile::Ordinary(OrdinaryFile::from_path(file_path.as_os_str()));
270273 let syntax = self.assets.get_syntax(
271274 None,
272275 input_file,
@@ -277,6 +280,14 @@ mod tests {
277280 syntax.name.clone()
278281 }
279282
283+ fn syntax_for_file_os(&self, file_name: &OsStr) -> String {
284+ self.syntax_for_file_with_content_os(file_name, "")
285+ }
286+
287+ fn syntax_for_file_with_content(&self, file_name: &str, first_line: &str) -> String {
288+ self.syntax_for_file_with_content_os(OsStr::new(file_name), first_line)
289+ }
290+
280291 fn syntax_for_file(&self, file_name: &str) -> String {
281292 self.syntax_for_file_with_content(file_name, "")
282293 }
@@ -308,6 +319,19 @@ mod tests {
308319 assert_eq!(test.syntax_for_file("Makefile"), "Makefile");
309320 }
310321
322+ #[cfg(unix)]
323+ #[test]
324+ fn syntax_detection_invalid_utf8() {
325+ use std::os::unix::ffi::OsStrExt;
326+
327+ let test = SyntaxDetectionTest::new();
328+
329+ assert_eq!(
330+ test.syntax_for_file_os(OsStr::from_bytes(b"invalid_\xFEutf8_filename.rs")),
331+ "Rust"
332+ );
333+ }
334+
311335 #[test]
312336 fn syntax_detection_well_defined_mapping_for_duplicate_extensions() {
313337 let test = SyntaxDetectionTest::new();