Fix an issue with compound words.

streetsidesoftware · Feb 2, 2017 · 011f126 · 011f126
1 parent cde6b08
commit 011f126
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/cSpell.json b/cSpell.json
@@ -18,6 +18,7 @@
         "dist/**",
         ".vscode/**"
     ],
+    "allowCompoundWords": true,
 
     // flagWords - list of words to be always considered incorrect
     // This is useful for offensive words and common spelling errors.

diff --git a/src/application.ts b/src/application.ts
@@ -129,21 +129,21 @@ export class CSpellApplication {
         const r = Rx.Observable.combineLatest(
                 configRx,
                 filesRx,
-                (config, fileInfo) => ({ config, text: fileInfo.text, filename: fileInfo.filename })
+                (configInfo, fileInfo) => ({ configInfo, text: fileInfo.text, filename: fileInfo.filename })
             )
-            .map(({config, filename, text}) => {
+            .map(({configInfo, filename, text}) => {
                 const ext = path.extname(filename);
                 const languageIds = cspell.getLanguagesForExt(ext);
                 this.debug(`Filename: ${filename}, Extension: ${ext}, LanguageIds: ${languageIds.toString()}`);
-                const settings = cspell.mergeSettings(cspell.getDefaultSettings(), config);
-                const fileSettings = cspell.constructSettingsForText(settings, text, languageIds);
-                return {config: fileSettings, filename, text}
+                const settings = cspell.mergeSettings(cspell.getDefaultSettings(), configInfo.config);
+                const config = cspell.constructSettingsForText(settings, text, languageIds);
+                return {configInfo: {...configInfo, config}, filename, text};
             })
-            .filter(info => info.config.enabled !== false)
+            .filter(info => info.configInfo.config.enabled !== false)
             .do(() => status.files += 1)
-            .flatMap(({config, filename, text}) => {
-                this.debug(commentJson.stringify(config, undefined, 2));
-                return cspell.validateText(text, config)
+            .flatMap(({configInfo, filename, text}) => {
+                this.debug(commentJson.stringify(configInfo, undefined, 2));
+                return cspell.validateText(text, configInfo.config)
                     .then(wordOffsets => {
                         return {
                             filename,