From 4fc991fdeca5db36bd7be7197510e62a019e1677 Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Wed, 16 Feb 2022 07:57:20 -0600 Subject: migrate grammar fetching/building code into helix-loader crate This is a rather large refactor that moves most of the code for loading, fetching, and building grammars into a new helix-loader module. This works well with the [[grammars]] syntax for languages.toml defined earlier: we only have to depend on the types for GrammarConfiguration in helix-loader and can leave all the [[language]] entries for helix-core. --- helix-term/src/application.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'helix-term/src/application.rs') diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs index e885bc49..269ce13d 100644 --- a/helix-term/src/application.rs +++ b/helix-term/src/application.rs @@ -61,10 +61,10 @@ impl Application { let mut compositor = Compositor::new()?; let size = compositor.size(); - let conf_dir = helix_core::config_dir(); + let conf_dir = helix_loader::config_dir(); let theme_loader = - std::sync::Arc::new(theme::Loader::new(&conf_dir, &helix_core::runtime_dir())); + std::sync::Arc::new(theme::Loader::new(&conf_dir, &helix_loader::runtime_dir())); let true_color = config.editor.true_color || crate::true_color(); let theme = config @@ -109,7 +109,7 @@ impl Application { compositor.push(editor_view); if args.load_tutor { - let path = helix_core::runtime_dir().join("tutor.txt"); + let path = helix_loader::runtime_dir().join("tutor.txt"); editor.open(path, Action::VerticalSplit)?; // Unset path to prevent accidentally saving to the original tutor file. doc_mut!(editor).set_path(None)?; -- cgit v1.2.3-70-g09d2