cspell 5.18.1 → 5.18.2

package/dist/emitters/suggestionsEmitter.js

@@ -12,11 +12,13 @@ function emitSuggestionResult(result, options) {
         return;
     }
     if (verbose) {
-        const maxWidth = suggestions.map((r) => r.word.length).reduce((max, len) => Math.max(max, len), 0);
+        const maxWidth = suggestions
+            .map((r) => (0, util_1.width)(r.compoundWord || r.word))
+            .reduce((max, len) => Math.max(max, len), 0);
         for (const sug of suggestions) {
             const { word, cost, dictionaries, compoundWord } = sug;
             const w = compoundWord || word;
-            const padding = ' '.repeat(maxWidth - w.length);
+            const padding = ' '.repeat((0, util_1.padWidth)(w, maxWidth));
             const forbid = sug.forbidden ? chalk.red('X') : ' ';
             const ignore = sug.noSuggest ? chalk.yellow('N') : ' ';
             const strCost = (0, util_1.padLeft)(cost.toString(10), 4);

package/dist/emitters/traceEmitter.js

@@ -32,7 +32,7 @@ function emitTraceResults(results, options) {
     var _a;
     const maxWordLength = results
         .map((r) => r.foundWord || r.word)
-        .reduce((a, b) => Math.max(a, b.length), 'Word'.length);
+        .reduce((a, b) => Math.max(a, (0, util_1.width)(b)), 'Word'.length);
     const cols = {
         word: maxWordLength,
         dictName: colWidthDictionaryName,
@@ -66,7 +66,7 @@ function emitTraceResult(r, colWidths, options) {
     const dictColor = r.dictActive ? chalk.yellowBright : chalk.rgb(200, 128, 50);
     const n = dictColor(dictName);
     const info = [w, f, n].join(' ') + ' ';
-    const used = (0, strip_ansi_1.default)(info).length;
+    const used = (0, util_1.width)((0, strip_ansi_1.default)(info));
     const widthSrc = terminalWidth - used;
     const c = errors ? chalk.red : chalk.white;
     const s = c(formatDictionaryLocation(r.dictSource, widthSrc, options.cwd));

package/dist/util/util.d.ts

@@ -4,7 +4,9 @@ export declare function uniqueFilterFnGenerator<T>(): FilterFn<T>;
 export declare function uniqueFilterFnGenerator<T, U>(extractFn: (v: T) => U): FilterFn<T>;
 export declare function unique<T>(src: T[]): T[];
 export declare function clean<T>(src: T): T;
+export declare function padWidth(s: string, target: number): number;
 export declare function pad(s: string, w: number): string;
 export declare function padLeft(s: string, w: number): string;
+export declare function width(s: string): number;
 export {};
 //# sourceMappingURL=util.d.ts.map

package/dist/util/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.padLeft = exports.pad = exports.clean = exports.unique = exports.uniqueFilterFnGenerator = exports.uniqueFn = void 0;
+exports.width = exports.padLeft = exports.pad = exports.padWidth = exports.clean = exports.unique = exports.uniqueFilterFnGenerator = exports.uniqueFn = void 0;
 // alias for uniqueFilterFnGenerator
 exports.uniqueFn = uniqueFilterFnGenerator;
 function uniqueFilterFnGenerator(extractFn) {
@@ -28,16 +28,28 @@ function clean(src) {
     return r;
 }
 exports.clean = clean;
+function padWidth(s, target) {
+    const sWidth = width(s);
+    return Math.max(target - sWidth, 0);
+}
+exports.padWidth = padWidth;
 function pad(s, w) {
-    if (s.length >= w)
+    const p = padWidth(s, w);
+    if (!p)
         return s;
-    return (s + ' '.repeat(w)).slice(0, w);
+    return s + ' '.repeat(p);
 }
 exports.pad = pad;
 function padLeft(s, w) {
-    if (s.length >= w)
+    const p = padWidth(s, w);
+    if (!p)
         return s;
-    return (' '.repeat(w) + s).slice(-w);
+    return ' '.repeat(p) + s;
 }
 exports.padLeft = padLeft;
+function width(s) {
+    // eslint-disable-next-line no-control-regex
+    return s.replace(/[\u0300-\u036f\x00-\x1f]/g, '').length;
+}
+exports.width = width;
 //# sourceMappingURL=util.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell",
-  "version": "5.18.1",
+  "version": "5.18.2",
   "description": "A Spelling Checker for Code!",
   "funding": "https://github.com/streetsidesoftware/cspell?sponsor=1",
   "main": "dist/index.js",
@@ -70,13 +70,13 @@
   },
   "homepage": "https://streetsidesoftware.github.io/cspell/",
   "dependencies": {
-    "@cspell/cspell-pipe": "^5.18.1",
+    "@cspell/cspell-pipe": "^5.18.2",
     "chalk": "^4.1.2",
     "commander": "^9.0.0",
     "comment-json": "^4.1.1",
-    "cspell-gitignore": "^5.18.1",
-    "cspell-glob": "^5.18.1",
-    "cspell-lib": "^5.18.1",
+    "cspell-gitignore": "^5.18.2",
+    "cspell-glob": "^5.18.2",
+    "cspell-lib": "^5.18.2",
     "fast-json-stable-stringify": "^2.1.0",
     "file-entry-cache": "^6.0.1",
     "fs-extra": "^10.0.0",
@@ -91,8 +91,8 @@
     "node": ">=12.13.0"
   },
   "devDependencies": {
-    "@cspell/cspell-json-reporter": "^5.18.1",
-    "@cspell/cspell-types": "^5.18.1",
+    "@cspell/cspell-json-reporter": "^5.18.2",
+    "@cspell/cspell-types": "^5.18.2",
     "@types/file-entry-cache": "^5.0.2",
     "@types/fs-extra": "^9.0.13",
     "@types/glob": "^7.2.0",
@@ -104,8 +104,8 @@
     "micromatch": "^4.0.4",
     "minimatch": "^3.0.4",
     "rimraf": "^3.0.2",
-    "rollup": "^2.66.1",
+    "rollup": "^2.67.0",
     "rollup-plugin-dts": "^4.1.0"
   },
-  "gitHead": "8b94979b57a7b1a11f8efbd5bc086d29d496f7be"
+  "gitHead": "baa92d5154ccf0a3a27d00ed169dd79cc80ea6cc"
 }