aboutsummaryrefslogtreecommitdiff
path: root/helix-core/src
diff options
context:
space:
mode:
authorBrian Dawn2021-06-05 20:24:10 +0000
committerBlaž Hrastnik2021-06-06 01:49:17 +0000
commit5463a436a8d5647b90c7bfc54f7fc714465384fa (patch)
tree5252c5b4c5274c7e249cbe89be51639042f111a4 /helix-core/src
parente09b0f4eff1ec3ec943788c7ea205e3161de94cd (diff)
Return an error if we request an embedded file that does not exist.
This makes the load_runtime_file function behave like the non-embedded one.
Diffstat (limited to 'helix-core/src')
-rw-r--r--helix-core/src/syntax.rs25
1 files changed, 22 insertions, 3 deletions
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 929dae11..24b4e1a3 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -82,14 +82,30 @@ fn load_runtime_file(language: &str, filename: &str) -> Result<String, std::io::
#[cfg(feature = "embed_runtime")]
fn load_runtime_file(language: &str, filename: &str) -> Result<String, Box<dyn std::error::Error>> {
+ use std::fmt;
+
#[derive(rust_embed::RustEmbed)]
#[folder = "../runtime/"]
struct Runtime;
+ #[derive(Debug)]
+ struct EmbeddedFileNotFoundError {
+ path: PathBuf,
+ }
+ impl std::error::Error for EmbeddedFileNotFoundError {}
+ impl fmt::Display for EmbeddedFileNotFoundError {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ write!(f, "failed to load embedded file {}", self.path.display())
+ }
+ }
+
let path = PathBuf::from("queries").join(language).join(filename);
- let query_bytes = Runtime::get(&path.display().to_string()).unwrap_or_default();
- String::from_utf8(query_bytes.to_vec()).map_err(|err| err.into())
+ if let Some(query_bytes) = Runtime::get(&path.display().to_string()) {
+ String::from_utf8(query_bytes.to_vec()).map_err(|err| err.into())
+ } else {
+ Err(Box::new(EmbeddedFileNotFoundError { path }))
+ }
}
fn read_query(language: &str, filename: &str) -> String {
@@ -1722,5 +1738,8 @@ fn test_input_edits() {
fn test_load_runtime_file() {
// Test to make sure we can load some data from the runtime directory.
let contents = load_runtime_file("rust", "indents.toml").unwrap();
- assert!(!contents.is_empty())
+ assert!(!contents.is_empty());
+
+ let results = load_runtime_file("rust", "does-not-exist");
+ assert!(results.is_err());
}