cspell-lib 5.12.3 → 5.12.4

package/dist/LanguageIds.js

@@ -95,6 +95,7 @@ exports.languageExtensionDefinitions = [
     { id: 'typescript', extensions: ['.ts'] },
     { id: 'typescriptreact', extensions: ['.tsx'] },
     { id: 'vb', extensions: ['.vb', '.brs', '.vbs', '.bas'] },
+    { id: 'vue', extensions: ['.vue'] },
     {
         id: 'xml',
         extensions: [

package/dist/Settings/InDocSettings.js

@@ -25,7 +25,7 @@ const Text = __importStar(require("../util/text"));
 const CSpellSettingsServer_1 = require("./CSpellSettingsServer");
 // cspell:ignore gimuy
 const regExMatchRegEx = /\/.*\/[gimuy]*/;
-const regExInFileSettings = [/(?:spell-?checker|cSpell)::?\s*(.*)/gi, /(LocalWords:?\s+.*)/g];
+const regExInFileSettings = [/(?:spell-?checker|c?spell)::?(.*)/gi, /(LocalWords:?.*)/g];
 function getInDocumentSettings(text) {
     const settings = getPossibleInDocSettings(text)
         .concatMap((a) => parseSettingMatch(a))
@@ -36,17 +36,18 @@ function getInDocumentSettings(text) {
 }
 exports.getInDocumentSettings = getInDocumentSettings;
 function parseSettingMatch(matchArray) {
-    const [, possibleSetting = ''] = matchArray;
+    const [, match = ''] = matchArray;
+    const possibleSetting = match.trim();
     const settingParsers = [
         [/^(?:enable|disable)(?:allow)?CompoundWords/i, parseCompoundWords],
         [/^words?\s/i, parseWords],
         [/^ignore(?:words?)?\s/i, parseIgnoreWords],
         [/^ignore_?Reg_?Exp\s+.+$/i, parseIgnoreRegExp],
         [/^include_?Reg_?Exp\s+.+$/i, parseIncludeRegExp],
-        [/^locale?\s/i, parseLocal],
-        [/^language\s/i, parseLocal],
+        [/^locale?\s/i, parseLocale],
+        [/^language\s/i, parseLocale],
         [/^dictionaries\s/i, parseDictionaries],
-        [/^LocalWords:/, parseWords],
+        [/^LocalWords:/, (w) => parseWords(w.replace(/LocalWords:?/gi, ' '))],
     ];
     return settingParsers
         .filter(([regex]) => regex.test(possibleSetting))
@@ -61,9 +62,9 @@ function parseWords(match) {
     const words = match.split(/[,\s]+/g).slice(1);
     return { id: 'in-doc-words', words };
 }
-function parseLocal(match) {
-    const parts = match.trim().split(/\s+/);
-    const language = parts.slice(1).join(' ');
+function parseLocale(match) {
+    const parts = match.trim().split(/[\s,]+/);
+    const language = parts.slice(1).join(',');
     return language ? { id: 'in-doc-local', language } : {};
 }
 function parseIgnoreWords(match) {

package/dist/Settings/LanguageSettings.js

@@ -27,13 +27,19 @@ function getDefaultLanguageSettings() {
     return defaultLanguageSettings;
 }
 exports.getDefaultLanguageSettings = getDefaultLanguageSettings;
+function localesToList(locales) {
+    locales = typeof locales !== 'string' ? locales.join(',') : locales;
+    return stringToList(locales.replace(/\s+/g, ','));
+}
 function stringToList(sList) {
-    if (typeof sList === 'string') {
-        sList = sList
-            .replace(/[|;]/g, ',')
-            .split(',')
-            .map((s) => s.trim());
+    if (typeof sList !== 'string') {
+        sList = sList.join(',');
     }
+    sList = sList
+        .replace(/[|;]/g, ',')
+        .split(',')
+        .map((s) => s.trim())
+        .filter((s) => !!s);
     return sList;
 }
 function normalizeLanguageId(langId) {
@@ -45,7 +51,7 @@ function normalizeLanguageIdToString(langId) {
     return [...normalizeLanguageId(langId)].join(',');
 }
 function normalizeLocale(locale) {
-    locale = stringToList(locale);
+    locale = localesToList(locale);
     return new Set(locale.map((locale) => locale.toLowerCase().replace(/[^a-z]/g, '')));
 }
 exports.normalizeLocale = normalizeLocale;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "5.12.3",
+  "version": "5.12.4",
   "description": "A library of useful functions used across various cspell tools.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -47,15 +47,15 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "^5.12.3",
-    "@cspell/cspell-types": "^5.12.3",
+    "@cspell/cspell-bundled-dicts": "^5.12.4",
+    "@cspell/cspell-types": "^5.12.4",
     "clear-module": "^4.1.1",
     "comment-json": "^4.1.1",
     "configstore": "^5.0.1",
     "cosmiconfig": "^7.0.1",
-    "cspell-glob": "^5.12.3",
-    "cspell-io": "^5.12.3",
-    "cspell-trie-lib": "^5.12.3",
+    "cspell-glob": "^5.12.4",
+    "cspell-io": "^5.12.4",
+    "cspell-trie-lib": "^5.12.4",
     "find-up": "^5.0.0",
     "fs-extra": "^10.0.0",
     "gensequence": "^3.1.1",
@@ -72,19 +72,19 @@
     "@cspell/dict-csharp": "^1.0.11",
     "@cspell/dict-css": "^1.0.12",
     "@cspell/dict-fa-ir": "^1.0.17",
-    "@cspell/dict-fr-fr": "^1.2.21",
+    "@cspell/dict-fr-fr": "^2.0.1",
     "@cspell/dict-html": "^1.1.9",
     "@cspell/dict-nl-nl": "^2.0.1",
-    "@cspell/dict-python": "^2.0.3",
+    "@cspell/dict-python": "^2.0.4",
     "@types/configstore": "^5.0.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.0.2",
-    "@types/node": "^16.10.3",
+    "@types/node": "^16.11.6",
     "cspell-dict-nl-nl": "^1.1.2",
-    "jest": "^27.2.5",
+    "jest": "^27.3.1",
     "lorem-ipsum": "^2.0.4",
     "rimraf": "^3.0.2",
-    "ts-jest": "^27.0.5"
+    "ts-jest": "^27.0.7"
   },
-  "gitHead": "6c424aed933adb8d983ab09dd45042d63d7a5cd8"
+  "gitHead": "3e9973c39725f65141683b373ed839562f28bd94"
 }