Don't exclude template files

Also don't crash the CLI when displaying errors on excluded files.

Fix #8

src/check/manifest.rs

@@ -68,16 +68,19 @@ pub async fn check(
  name: name.into(),
  version,
  };
+
  world_for_template(
  &manifest,
  package_dir,
  package_spec.unwrap_or(&inferred_package_spec),
- exclude,
+ exclude.clone(),
  )
  } else {
  None
  };
 
+ dont_exclude_template_files(diags, &manifest, package_dir, exclude);
+
  Worlds {
  package: world,
  template: template_world,
@@ -440,3 +443,42 @@ fn world_for_template(
  world.exclude(exclude);
  Some(world)
 }
+
+fn dont_exclude_template_files(
+ diags: &mut Diagnostics,
+ manifest: &toml_edit::ImDocument<&String>,
+ package_dir: &Path,
+ exclude: Override,
+) -> Option<()> {
+ let template_root = manifest
+ .get("template")
+ .and_then(|t| t.get("path"))?
+ .as_str()?;
+ for entry in ignore::Walk::new(package_dir.join(template_root)) {
+ if let Ok(entry) = entry {
+ if exclude
+ .matched(
+ entry.path().canonicalize().ok()?,
+ entry.metadata().ok()?.is_dir(),
+ )
+ .is_ignore()
+ {
+ diags.emit(
+ Diagnostic::error()
+ .with_message(
+ "This file is part of the template and should not be excluded.",
+ )
+ .with_labels(vec![Label::primary(
+ FileId::new(
+ None,
+ VirtualPath::new(entry.path().strip_prefix(&package_dir).ok()?),
+ ),
+ 0..0,
+ )]),
+ )
+ }
+ }
+ }
+
+ Some(())
+}

src/cli.rs

@@ -39,6 +39,9 @@ pub fn print_diagnostics(
  // don't remove the exclusion, it will fail to read and display the file
  // contents.
  world.exclude(Override::empty());
+ world.reset_file_cache();
+
+ println!("writing diags !!!");
 
  for diagnostic in warnings.iter().chain(errors) {
  term::emit(

src/world.rs

@@ -100,6 +100,11 @@ impl SystemWorld {
  pub fn exclude(&mut self, globs: Override) {
  self.excluded = globs;
  }
+
+ pub fn reset_file_cache(&mut self) {
+ let mut slots = self.slots.lock();
+ slots.clear();
+ }
 }
 
 impl World for SystemWorld {