From 27fe1d6be4aa4ed83f3d63685853c6d95e25c991 Mon Sep 17 00:00:00 2001 From: Jason Dent Date: Thu, 4 Nov 2021 09:42:59 +0100 Subject: [PATCH] dev: Update C# dictionary (#1947) * dev: Update C# dictionary settings * fix: Update description of `caseSensitive` setting. --- cspell.schema.json | 6 +++--- .../cspell-bundled-dicts/cspell-default.config.js | 5 ----- .../cspell-bundled-dicts/cspell-default.config.ts | 5 ----- packages/cspell-bundled-dicts/package-lock.json | 12 ++++++------ packages/cspell-bundled-dicts/package.json | 4 ++-- packages/cspell-types/cspell.schema.json | 6 +++--- packages/cspell-types/src/CSpellSettingsDef.ts | 7 ++++++- 7 files changed, 20 insertions(+), 25 deletions(-) diff --git a/cspell.schema.json b/cspell.schema.json index ba3d94be923..32bea01e041 100644 --- a/cspell.schema.json +++ b/cspell.schema.json @@ -254,7 +254,7 @@ }, "caseSensitive": { "default": false, - "description": "Words must match case rules.", + "description": "Determines if words must match case and accent rules.\n\n- `false` - Case is ignored and accents can be missing on the entire word. Incorrect accents or partially missing accents will be marked as incorrect.\n- `true` - Case and accents are enforced.", "type": "boolean" }, "description": { @@ -394,7 +394,7 @@ }, "caseSensitive": { "default": false, - "description": "Words must match case rules.", + "description": "Determines if words must match case and accent rules.\n\n- `false` - Case is ignored and accents can be missing on the entire word. Incorrect accents or partially missing accents will be marked as incorrect.\n- `true` - Case and accents are enforced.", "type": "boolean" }, "description": { @@ -737,7 +737,7 @@ }, "caseSensitive": { "default": false, - "description": "Words must match case rules.", + "description": "Determines if words must match case and accent rules.\n\n- `false` - Case is ignored and accents can be missing on the entire word. Incorrect accents or partially missing accents will be marked as incorrect.\n- `true` - Case and accents are enforced.", "type": "boolean" }, "description": { diff --git a/packages/cspell-bundled-dicts/cspell-default.config.js b/packages/cspell-bundled-dicts/cspell-default.config.js index fbf1d418dd4..2aac21debf2 100644 --- a/packages/cspell-bundled-dicts/cspell-default.config.js +++ b/packages/cspell-bundled-dicts/cspell-default.config.js @@ -32,11 +32,6 @@ const settings = { }, ], languageSettings: [ - { - languageId: 'csharp', - allowCompoundWords: true, - dictionaries: ['csharp', 'dotnet', 'npm'], - }, { languageId: 'javascript,javascriptreact', dictionaries: ['typescript', 'node', 'npm'], diff --git a/packages/cspell-bundled-dicts/cspell-default.config.ts b/packages/cspell-bundled-dicts/cspell-default.config.ts index b005882724b..264e918e125 100644 --- a/packages/cspell-bundled-dicts/cspell-default.config.ts +++ b/packages/cspell-bundled-dicts/cspell-default.config.ts @@ -34,11 +34,6 @@ const settings: CSpellSettings = { ], languageSettings: [ - { - languageId: 'csharp', - allowCompoundWords: true, - dictionaries: ['csharp', 'dotnet', 'npm'], - }, { languageId: 'javascript,javascriptreact', dictionaries: ['typescript', 'node', 'npm'], diff --git a/packages/cspell-bundled-dicts/package-lock.json b/packages/cspell-bundled-dicts/package-lock.json index eb331f38adb..b6b4d403973 100644 --- a/packages/cspell-bundled-dicts/package-lock.json +++ b/packages/cspell-bundled-dicts/package-lock.json @@ -56,9 +56,9 @@ "integrity": "sha512-47ABvDJOkaST/rXipNMfNvneHUzASvmL6K/CbOFpYKfsd0x23Jc9k1yaOC7JAm82XSC/8a7+3Yu+Fk2jVJNnsA==" }, "@cspell/dict-csharp": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@cspell/dict-csharp/-/dict-csharp-1.0.11.tgz", - "integrity": "sha512-nub+ZCiTgmT87O+swI+FIAzNwaZPWUGckJU4GN402wBq420V+F4ZFqNV7dVALJrGaWH7LvADRtJxi6cZVHJKeA==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-csharp/-/dict-csharp-2.0.1.tgz", + "integrity": "sha512-ZzAr+WRP2FUtXHZtfhe8f3j9vPjH+5i44Hcr5JqbWxmqciGoTbWBPQXwu9y+J4mbdC69HSWRrVGkNJ8rQk8pSw==" }, "@cspell/dict-css": { "version": "1.0.12", @@ -191,9 +191,9 @@ "integrity": "sha512-5V/R7PRbbminTpPS3ywgdAalI9BHzcEjEj9ug4kWYvBIGwSnS7T6QCFCiu+e9LvEGUqQC+NHgLY4zs1NaBj2vA==" }, "@cspell/dict-software-terms": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.0.8.tgz", - "integrity": "sha512-9p05Y4+dfBE5SrjQqVxTdBcSJdTIMhgKNqELCXmk3gg+6TOPH/vlXANWbXjOYU2TCSPjMBA9Q2LjA/ffjJLCkA==" + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.0.9.tgz", + "integrity": "sha512-LhUmmJYD5Kzj04UgqPW7EvJ4eEVKkrPl4ki29ClwUg/uQNZh5JwcsxEMqh5+PHD7GggDqKPYcYZanytDELTZpg==" }, "@cspell/dict-swift": { "version": "1.0.1", diff --git a/packages/cspell-bundled-dicts/package.json b/packages/cspell-bundled-dicts/package.json index 82da70a2d49..ceaf7848bcd 100644 --- a/packages/cspell-bundled-dicts/package.json +++ b/packages/cspell-bundled-dicts/package.json @@ -49,7 +49,7 @@ "@cspell/dict-companies": "^2.0.2", "@cspell/dict-cpp": "^1.1.40", "@cspell/dict-cryptocurrencies": "^1.0.10", - "@cspell/dict-csharp": "^1.0.11", + "@cspell/dict-csharp": "^2.0.1", "@cspell/dict-css": "^1.0.12", "@cspell/dict-django": "^1.0.26", "@cspell/dict-dotnet": "^1.0.32", @@ -76,7 +76,7 @@ "@cspell/dict-ruby": "^1.0.14", "@cspell/dict-rust": "^1.0.23", "@cspell/dict-scala": "^1.0.21", - "@cspell/dict-software-terms": "^2.0.8", + "@cspell/dict-software-terms": "^2.0.9", "@cspell/dict-swift": "^1.0.1", "@cspell/dict-typescript": "^1.0.19", "@cspell/dict-vue": "^2.0.1" diff --git a/packages/cspell-types/cspell.schema.json b/packages/cspell-types/cspell.schema.json index ba3d94be923..32bea01e041 100644 --- a/packages/cspell-types/cspell.schema.json +++ b/packages/cspell-types/cspell.schema.json @@ -254,7 +254,7 @@ }, "caseSensitive": { "default": false, - "description": "Words must match case rules.", + "description": "Determines if words must match case and accent rules.\n\n- `false` - Case is ignored and accents can be missing on the entire word. Incorrect accents or partially missing accents will be marked as incorrect.\n- `true` - Case and accents are enforced.", "type": "boolean" }, "description": { @@ -394,7 +394,7 @@ }, "caseSensitive": { "default": false, - "description": "Words must match case rules.", + "description": "Determines if words must match case and accent rules.\n\n- `false` - Case is ignored and accents can be missing on the entire word. Incorrect accents or partially missing accents will be marked as incorrect.\n- `true` - Case and accents are enforced.", "type": "boolean" }, "description": { @@ -737,7 +737,7 @@ }, "caseSensitive": { "default": false, - "description": "Words must match case rules.", + "description": "Determines if words must match case and accent rules.\n\n- `false` - Case is ignored and accents can be missing on the entire word. Incorrect accents or partially missing accents will be marked as incorrect.\n- `true` - Case and accents are enforced.", "type": "boolean" }, "description": { diff --git a/packages/cspell-types/src/CSpellSettingsDef.ts b/packages/cspell-types/src/CSpellSettingsDef.ts index dbe8753d42d..c9f1f05462b 100644 --- a/packages/cspell-types/src/CSpellSettingsDef.ts +++ b/packages/cspell-types/src/CSpellSettingsDef.ts @@ -300,7 +300,12 @@ export interface BaseSetting { allowCompoundWords?: boolean; /** - * Words must match case rules. + * Determines if words must match case and accent rules. + * + * - `false` - Case is ignored and accents can be missing on the entire word. + * Incorrect accents or partially missing accents will be marked as incorrect. + * - `true` - Case and accents are enforced. + * * @default false */ caseSensitive?: boolean;