Merge e6413cb into ecf9ee8

streetsidesoftware · May 13, 2019 · da15498 · da15498
2 parents ecf9ee8 + e6413cb
commit da15498
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/cspell/src/Settings/DictionarySettings.test.ts b/packages/cspell/src/Settings/DictionarySettings.test.ts
@@ -1,6 +1,8 @@
 import { expect } from 'chai';
 import * as DictSettings from './DictionarySettings';
 import * as fsp from 'fs-extra';
+import * as path from 'path';
+import * as os from 'os';
 import { getDefaultSettings } from './DefaultSettings';
 
 const defaultSettings = getDefaultSettings();
@@ -50,6 +52,11 @@ describe('Validate DictionarySettings', () => {
         expect(dictionaryDefinitions).to.not.be.empty;
         const defs = DictSettings.normalizePathForDictDefs(dictionaryDefinitions!, '.');
         expect(defs.length).to.be.equal(dictionaryDefinitions!.length);
+
+        const basePath = path.join('some', 'dir');
+        dictionaryDefinitions![0].path = path.join('~', basePath);
+        const tildeDefs = DictSettings.normalizePathForDictDefs(dictionaryDefinitions!, '.');
+        expect(tildeDefs[0].path).to.be.equal(path.join(os.homedir(), basePath));
     });
 });
 
diff --git a/packages/cspell/src/Settings/DictionarySettings.ts b/packages/cspell/src/Settings/DictionarySettings.ts
@@ -1,5 +1,6 @@
 import { DictionaryDefinition, DictionaryId } from './CSpellSettingsDef';
 import * as path from 'path';
+import * as os from 'os';
 
 const dictionaryPath = () => path.join(__dirname, '..', '..', 'dist', 'dictionaries');
 
@@ -46,7 +47,7 @@ export function normalizePathForDictDef(def: DictionaryDefinition, defaultPath:
         const absPath = relPath.match(/^\./) ? path.join(defaultPath, relPath) : relPath;
         return {
             ...def,
-            path:  absPath
+            path:  absPath.replace(/^~/, os.homedir())
         };
 }