fix: Report the root cause of a dictionary error. (#1014)

streetsidesoftware · Feb 26, 2021 · 8c1debd · 8c1debd
1 parent 602edd1
commit 8c1debd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/packages/cspell-lib/src/Settings/index.ts b/packages/cspell-lib/src/Settings/index.ts
@@ -1,3 +1,4 @@
 export * from './CSpellSettingsServer';
 export * from './DefaultSettings';
 export * from '@cspell/cspell-types';
+export * from './ImportError';
diff --git a/packages/cspell-lib/src/SpellingDictionary/index.ts b/packages/cspell-lib/src/SpellingDictionary/index.ts
@@ -2,3 +2,4 @@ export * from './SpellingDictionary';
 export * from './SpellingDictionaryCollection';
 export * from './Dictionaries';
 export * from './createSpellingDictionary';
+export * from './SpellingDictionaryError';
diff --git a/packages/cspell-lib/src/index.ts b/packages/cspell-lib/src/index.ts
@@ -15,10 +15,12 @@ export {
     CompoundWordsMethod,
     createSpellingDictionary,
     getDictionary,
+    isSpellingDictionaryLoadError,
     refreshDictionaryCache,
     SpellingDictionary,
     SuggestionCollector,
     SuggestionResult,
+    SpellingDictionaryLoadError,
 } from './SpellingDictionary';
 export { combineTextAndLanguageSettings } from './Settings/TextDocumentSettings';
 export { combineTextAndLanguageSettings as constructSettingsForText } from './Settings/TextDocumentSettings';

diff --git a/packages/cspell/src/app.ts b/packages/cspell/src/app.ts
@@ -15,6 +15,7 @@ import {
 } from './link';
 import { tableToLines } from './util/table';
 import { Emitters, isProgressFileComplete, MessageType, ProgressItem, Issue } from './emitters';
+import { isSpellingDictionaryLoadError, SpellingDictionaryLoadError, ImportError } from 'cspell-lib';
 
 interface Options extends CSpellApplicationOptions {
     legacy?: boolean;
@@ -52,7 +53,10 @@ function genIssueEmitter(template: string) {
     };
 }
 
-function errorEmitter(message: string, error: Error) {
+function errorEmitter(message: string, error: Error | SpellingDictionaryLoadError | ImportError) {
+    if (isSpellingDictionaryLoadError(error)) {
+        error = error.cause;
+    }
     console.error(chalk.red(message), error.toString());
 }