fix: (cspell-tools) Delay splitting _ till later (#4309)

streetsidesoftware · Mar 13, 2023 · 0e517d1 · 0e517d1
1 parent e524c61
commit 0e517d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/cspell-tools/src/compiler/legacyLineToWords.test.ts b/packages/cspell-tools/src/compiler/legacyLineToWords.test.ts
@@ -2,8 +2,7 @@
 
 import { opFilter, pipe } from '@cspell/cspell-pipe/sync';
 
-import { resolvePathToFixture } from '../test/TestHelper';
-import { createAllowedSplitWordsFromFiles } from './createWordsCollection';
+import { createAllowedSplitWords } from './createWordsCollection';
 import { legacyLineToWords } from './legacyLineToWords';
 import { defaultAllowedSplitWords } from './WordsCollection';
 
@@ -44,10 +43,11 @@ describe('Validate legacyLineToWords', () => {
         ${'well-educated'}                    | ${['well', 'educated']}
         ${'CURLcode'}                         | ${['CURLcode']}
         ${'RedGreen'}                         | ${['red', 'green']}
-        ${'kDNSServiceErr_BadSig'}            | ${['kDNSServiceErr', 'BadSig']}
-        ${'apd_get_active_symbols'}           | ${['apd', 'get', 'active', 'symbols']}
+        ${'kDNSServiceErr_BadSig'}            | ${['kDNSServiceErr_BadSig']}
+        ${'apd_get_active_symbols'}           | ${['apd_get_active_symbols']}
+        ${'RED_GREEN'}                        | ${['red', 'green']}
     `('legacy splitting lines $line', async ({ line, expectedResult }: { line: string; expectedResult: string[] }) => {
-        const allowed = await createAllowedSplitWordsFromFiles([resolvePathToFixture('dicts/colors.trie')]);
+        const allowed = await createAllowedSplitWords(['red', 'green']);
         expect([...pipe(legacyLineToWords(line, false, allowed), opFilter(distinct()))]).toEqual(expectedResult);
     });
 });

diff --git a/packages/cspell-tools/src/compiler/legacyLineToWords.ts b/packages/cspell-tools/src/compiler/legacyLineToWords.ts
@@ -3,7 +3,7 @@ import { opConcatMap, opFilter, opMap, pipe } from '@cspell/cspell-pipe/sync';
 import { regExpSpaceOrDash, splitCamelCaseIfAllowed } from './splitCamelCaseIfAllowed';
 import type { AllowedSplitWordsCollection } from './WordsCollection';
 
-const regNonWord = /[^\p{L}\p{M}' \d]+/giu;
+const regNonWord = /[^\p{L}\p{M}' _\d]+/giu;
 const regExpRepeatChars = /(.)\1{5}/i;
 
 export function legacyLineToWords(