Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

feat(cli): fallback to `PlainEnglish` parser (#1223)

Steve Kurche3a0d8e8a2e1
diff --git a/harper-cli/src/main.rs b/harper-cli/src/main.rs
index e483757f2..26b5e65e9 100644
--- a/harper-cli/src/main.rs
+++ b/harper-cli/src/main.rs
@@ -7,13 +7,12 @@ use std::path::{Component, Path, PathBuf};
use std::sync::Arc;
use std::{fs, process};
-use anyhow::format_err;
use ariadne::{Color, Label, Report, ReportKind, Source};
use clap::Parser;
use dirs::{config_dir, data_local_dir};
use harper_comments::CommentParser;
use harper_core::linting::{LintGroup, Linter};
-use harper_core::parsers::{Markdown, MarkdownOptions};
+use harper_core::parsers::{Markdown, MarkdownOptions, PlainEnglish};
use harper_core::{
remove_overlaps, CharStringExt, Dialect, Dictionary, Document, FstDictionary, MergedDictionary,
MutableDictionary, TokenKind, TokenStringExt, WordId, WordMetadata,
@@ -377,19 +376,26 @@ fn load_file(
) -> anyhow::Result<(Document, String)> {
let source = std::fs::read_to_string(file)?;
- let parser: Box<dyn harper_core::parsers::Parser> =
- match file.extension().map(|v| v.to_str().unwrap()) {
- Some("md") => Box::new(Markdown::default()),
- Some("lhs") => Box::new(LiterateHaskellParser::new_markdown(
- MarkdownOptions::default(),
- )),
- Some("typ") => Box::new(harper_typst::Typst),
- _ => Box::new(
- CommentParser::new_from_filename(file, markdown_options)
- .map(Box::new)
- .ok_or(format_err!("Could not detect language ID."))?,
- ),
- };
+ let parser: Box<dyn harper_core::parsers::Parser> = match file
+ .extension()
+ .map(|v| v.to_str().unwrap())
+ {
+ Some("md") => Box::new(Markdown::default()),
+ Some("lhs") => Box::new(LiterateHaskellParser::new_markdown(
+ MarkdownOptions::default(),
+ )),
+ Some("typ") => Box::new(harper_typst::Typst),
+ _ => {
+ if let Some(comment_parser) = CommentParser::new_from_filename(file, markdown_options) {
+ Box::new(comment_parser)
+ } else {
+ println!(
+ "Warning: could not detect language ID; falling back to PlainEnglish parser."
+ );
+ Box::new(PlainEnglish)
+ }
+ }
+ };
Ok((Document::new(&source, &parser, dictionary), source))
}