Merge branch 'master' into great_line_ending_and_cursor_range_cleanup

This commit is contained in:
Nathan Vegdahl 2021-07-05 20:27:49 -07:00
commit 85d5b399de
37 changed files with 1495 additions and 361 deletions

View file

@ -94,6 +94,7 @@ 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;
use std::path::PathBuf;
#[derive(rust_embed::RustEmbed)]
#[folder = "../runtime/"]