Skip to content

Commit

Permalink
Merge f859acc into 09826b4
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jason3S
Jason3S committed May 16, 2020
2 parents 09826b4 + f859acc commit e1a459a
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 85 deletions.
17 changes: 17 additions & 0 deletions cspell-dict.txt
View file
@@ -0,0 +1,17 @@
DAWG
WORDCHARS
cryptocurrencies
deserialize
deserializer
deserializers
disp
gitignore
gzipped
istanbuljs
micromatch
monorepo
multiline
restructuredtext
serializers
streetsidesoftware
xxhash
9 changes: 2 additions & 7 deletions cspell.code-workspace
View file
Expand Up @@ -27,12 +27,7 @@
}
],
"settings": {
"cSpell.words": [
"Dawg",
"WORDCHARS",
"deserializers",
"serializers"
],
"typescript.tsdk": "cspell-monorepo/node_modules/typescript/lib"
"typescript.tsdk": "cspell-monorepo/node_modules/typescript/lib",
"cSpell.customWorkspaceDictionaries": [ "workspace" ]
}
}
58 changes: 8 additions & 50 deletions cspell.json
View file
@@ -1,5 +1,13 @@
{
"version": "0.1",
"dictionaryDefinitions": [
{
"name": "workspace",
"file": "./cspell-dict.txt",
"description": "Custom Workspace Dictionary"
}
],
"dictionaries": ["workspace"],
"ignorePaths": [
"azure-pipelines.yml",
"**/jest.config.js",
Expand Down Expand Up @@ -27,55 +35,5 @@
"repo",
"tscv",
"tsdk"
],
"words": [
"DAWG",
"deserialize",
"deserializer",
"deserializers",
"disp",
"gitignore",
"gzipped",
"multiline",
"istanbuljs",
"micromatch",
"monorepo",
"restructuredtext",
"serializers",
"streetsidesoftware",
"xxhash"
],
"enabledLanguageIds": [
"asciidoc",
"c",
"cpp",
"csharp",
"css",
"go",
"handlebars",
"html",
"ignore",
"jade",
"java",
"javascript",
"javascriptreact",
"json",
"jsonc",
"latex",
"less",
"markdown",
"php",
"plaintext",
"pug",
"python",
"restructuredtext",
"rust",
"scala",
"scss",
"text",
"typescript",
"typescriptreact",
"yaml",
"yml"
]
}
3 changes: 3 additions & 0 deletions packages/cspell-lib/config/cspell-default.json
View file
Expand Up @@ -48,9 +48,11 @@
}
],
"import": [
"node_modules/cspell-dict-aws/cspell-ext.json",
"node_modules/cspell-dict-bash/cspell-ext.json",
"node_modules/cspell-dict-companies/cspell-ext.json",
"node_modules/cspell-dict-cpp/cspell-ext.json",
"node_modules/cspell-dict-cryptocurrencies/cspell-ext.json",
"node_modules/cspell-dict-django/cspell-ext.json",
"node_modules/cspell-dict-dotnet/cspell-ext.json",
"node_modules/cspell-dict-elixir/cspell-ext.json",
Expand All @@ -64,6 +66,7 @@
"node_modules/cspell-dict-java/cspell-ext.json",
"node_modules/cspell-dict-latex/cspell-ext.json",
"node_modules/cspell-dict-lorem-ipsum/cspell-ext.json",
"node_modules/cspell-dict-lua/cspell-ext.json",
"node_modules/cspell-dict-php/cspell-ext.json",
"node_modules/cspell-dict-powershell/cspell-ext.json",
"node_modules/cspell-dict-python/cspell-ext.json",
Expand Down
54 changes: 39 additions & 15 deletions packages/cspell-lib/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 11 additions & 8 deletions packages/cspell-lib/package.json
View file
Expand Up @@ -53,31 +53,34 @@
"homepage": "https://github.com/streetsidesoftware/cspell#readme",
"dependencies": {
"comment-json": "^1.1.3",
"configstore": "^5.0.0",
"configstore": "^5.0.1",
"cspell-dict-aws": "^1.0.5",
"cspell-dict-bash": "^1.0.3",
"cspell-dict-companies": "^1.0.20",
"cspell-dict-companies": "^1.0.22",
"cspell-dict-cpp": "^1.1.26",
"cspell-dict-django": "^1.0.14",
"cspell-dict-cryptocurrencies": "^1.0.2",
"cspell-dict-django": "^1.0.15",
"cspell-dict-dotnet": "^1.0.14",
"cspell-dict-elixir": "^1.0.13",
"cspell-dict-en-gb": "^1.1.14",
"cspell-dict-en_us": "^1.2.23",
"cspell-dict-en-gb": "^1.1.16",
"cspell-dict-en_us": "^1.2.26",
"cspell-dict-fonts": "^1.0.5",
"cspell-dict-fullstack": "^1.0.21",
"cspell-dict-fullstack": "^1.0.23",
"cspell-dict-golang": "^1.1.14",
"cspell-dict-haskell": "^1.0.4",
"cspell-dict-html-symbol-entities": "^1.0.13",
"cspell-dict-java": "^1.0.12",
"cspell-dict-latex": "^1.0.13",
"cspell-dict-lorem-ipsum": "^1.0.10",
"cspell-dict-lua": "^1.0.8",
"cspell-dict-php": "^1.0.13",
"cspell-dict-powershell": "^1.0.5",
"cspell-dict-python": "^1.0.19",
"cspell-dict-ruby": "^1.0.3",
"cspell-dict-rust": "^1.0.12",
"cspell-dict-scala": "^1.0.11",
"cspell-dict-software-terms": "^1.0.5",
"cspell-dict-typescript": "^1.0.3",
"cspell-dict-software-terms": "^1.0.10",
"cspell-dict-typescript": "^1.0.5",
"cspell-io": "^5.0.1-alpha.3",
"cspell-trie-lib": "^5.0.1-alpha.3",
"cspell-util-bundle": "^5.0.1-alpha.3",
Expand Down
10 changes: 5 additions & 5 deletions packages/cspell-lib/src/Settings/LanguageSettings.test.ts
View file
Expand Up @@ -28,17 +28,17 @@ describe('Validate LanguageSettings', () => {
const sPython = calcSettingsForLanguage(languageSettings, 'python', 'en');
expect(sPython.allowCompoundWords).toBe(true);
expect(sPython.dictionaries).not.toHaveLength(0);
expect((sPython.dictionaries!).sort()).toEqual(
['en_us', 'filetypes', 'companies', 'softwareTerms', 'python', 'misc', 'django'].sort()
);
expect(sPython.dictionaries!).toEqual(expect.arrayContaining([
'en_us', 'filetypes', 'companies', 'softwareTerms', 'python', 'misc', 'django'
]));

const sPhp = calcSettingsForLanguage(languageSettings, 'php', 'en-gb');
expect(sPhp.allowCompoundWords).toBeUndefined();
expect(sPhp.dictionaries).not.toHaveLength(0);
expect((sPhp.dictionaries!).sort()).toEqual([
expect(sPhp.dictionaries!).toEqual(expect.arrayContaining([
'en-gb', 'filetypes', 'companies', 'softwareTerms', 'php', 'html',
'npm', 'fonts', 'css', 'typescript', 'misc', 'fullstack'
].sort());
]));
});

test('tests that settings at language level are merged', () => {
Expand Down

0 comments on commit e1a459a

Please sign in to comment.