feat: Upgrade go dictionary (#2792)

streetsidesoftware · May 4, 2022 · 778b8fe · 778b8fe
1 parent ac0f9e9
commit 778b8fe
Show file tree

Hide file tree

Showing 7 changed files with 452 additions and 99 deletions.
diff --git a/integration-tests/snapshots/caddyserver/caddy/report.yaml b/integration-tests/snapshots/caddyserver/caddy/report.yaml
diff --git a/integration-tests/snapshots/caddyserver/caddy/snapshot.txt b/integration-tests/snapshots/caddyserver/caddy/snapshot.txt
diff --git a/packages/cspell-bundled-dicts/package-lock.json b/packages/cspell-bundled-dicts/package-lock.json
diff --git a/packages/cspell-bundled-dicts/package.json b/packages/cspell-bundled-dicts/package.json
@@ -55,13 +55,13 @@
     "@cspell/dict-django": "^2.0.0",
     "@cspell/dict-dotnet": "^2.0.1",
     "@cspell/dict-elixir": "^2.0.1",
-    "@cspell/dict-en-gb": "^1.1.33",
     "@cspell/dict-en_us": "^2.2.2",
+    "@cspell/dict-en-gb": "^1.1.33",
     "@cspell/dict-filetypes": "^2.0.1",
     "@cspell/dict-fonts": "^2.0.0",
     "@cspell/dict-fullstack": "^2.0.5",
     "@cspell/dict-git": "^1.0.1",
-    "@cspell/dict-golang": "^2.0.0",
+    "@cspell/dict-golang": "^3.0.1",
     "@cspell/dict-haskell": "^2.0.0",
     "@cspell/dict-html": "^3.0.1",
     "@cspell/dict-html-symbol-entities": "^3.0.0",

diff --git a/packages/cspell-lib/src/test/__snapshots__/bugs.spec.ts.snap b/packages/cspell-lib/src/test/__snapshots__/bugs.spec.ts.snap
@@ -2,6 +2,28 @@
 
 exports[`Validate Against Bug Fixes validate ../src/sample.go 1`] = `
 Array [
+  Object {
+    "isFlagged": false,
+    "isFound": false,
+    "line": Object {
+      "offset": 265,
+      "text": "	longname(i)
+",
+    },
+    "offset": 266,
+    "text": "longname",
+  },
+  Object {
+    "isFlagged": false,
+    "isFound": false,
+    "line": Object {
+      "offset": 344,
+      "text": "func longname(i I) {
+",
+    },
+    "offset": 349,
+    "text": "longname",
+  },
   Object {
     "isFlagged": false,
     "isFound": false,

diff --git a/packages/cspell-lib/src/test/golang.spec.ts b/packages/cspell-lib/src/test/golang.spec.ts
@@ -14,12 +14,12 @@ describe('Validate that Go files are correctly checked.', () => {
         const languageIds = cspell.getLanguagesForExt(ext);
         const settings = cspell.getDefaultBundledSettings();
         const fileSettings = cspell.combineTextAndLanguageSettings(settings, text, languageIds);
-        // cspell:ignore weirdd garbbage
+        // cspell:ignore weirdd garbbage longname
         const results1 = await cspell.validateText('some weirdd garbbage', fileSettings);
         expect(results1.map((t) => t.text)).toEqual(expect.arrayContaining(['weirdd']));
         expect(results1.map((t) => t.text)).toEqual(expect.arrayContaining(['garbbage']));
         const results = await cspell.validateText(text, fileSettings);
-        expect(results).toHaveLength(1);
-        expect(results.map((t) => t.text)).toEqual(expect.arrayContaining(['garbbage']));
+        expect(results).toHaveLength(3);
+        expect(results.map((t) => t.text)).toEqual(expect.arrayContaining(['longname', 'garbbage']));
     });
 });
diff --git a/packages/cspell/src/application.test.ts b/packages/cspell/src/application.test.ts
@@ -20,6 +20,7 @@ const featuresRoot = r(fixturesRoot, 'features');
 const sampleOptions = { root: samplesRoot };
 
 const oc = expect.objectContaining;
+const ac = expect.arrayContaining;
 
 jest.mock('get-stdin', () => {
     return jest.fn(() => Promise.resolve(getStdinResult.value));
@@ -251,10 +252,12 @@ function sampleTests(): SampleTest[] {
             file: 'samples/src/sample.go',
             options: { showSuggestions: true, showContext: true },
             issues: [
+                { text: 'longname' },
+                { text: 'longname' },
                 {
                     text: 'garbbage',
-                    suggestions: expect.arrayContaining(['garbage', 'garage']),
-                    context: expect.objectContaining({ text: 'Deliberate misspelling: garbbage. */' }),
+                    suggestions: ac(['garbage', 'garage']),
+                    context: oc({ text: 'Deliberate misspelling: garbbage. */' }),
                 },
             ],
         },