Changes
ci: Workflow Bot -- Update Integration Snapshots (main) (#3320)
ci: Workflow Bot -- Update Integration Snapshots (main) (#3320)
Update Integration Repositories
integration-tests/config/config.json | 46 +-
.../Azure/azure-rest-api-specs/snapshot.txt | 53 +-
.../SoftwareBrothers/admin-bro/snapshot.txt | 3 +-
.../snapshots/TheAlgorithms/Python/report.yaml | 66 +-
.../snapshots/TheAlgorithms/Python/snapshot.txt | 66 +-
.../aspnetboilerplate/report.yaml | 8 +-
.../aspnetboilerplate/snapshot.txt | 4 +-
.../snapshots/aws-amplify/docs/snapshot.txt | 9 +-
.../snapshots/caddyserver/caddy/report.yaml | 117 ++--
.../snapshots/caddyserver/caddy/snapshot.txt | 113 ++--
.../snapshots/django/django/report.yaml | 434 ++++++-------
.../snapshots/django/django/snapshot.txt | 432 ++++++-------
.../snapshots/eslint/eslint/report.yaml | 36 +-
.../snapshots/eslint/eslint/snapshot.txt | 32 +-
.../googleapis/google-cloud-cpp/report.yaml | 189 +++---
.../googleapis/google-cloud-cpp/snapshot.txt | 185 +++---
.../snapshots/ktaranov/sqlserver-kit/report.yaml | 160 ++---
.../snapshots/ktaranov/sqlserver-kit/snapshot.txt | 160 ++---
.../microsoft/TypeScript-Website/report.yaml | 12 +-
.../microsoft/TypeScript-Website/snapshot.txt | 8 +-
.../snapshots/php/php-src/report.yaml | 669 +++++++++++----------
.../snapshots/php/php-src/snapshot.txt | 667 ++++++++++----------
.../snapshots/prettier/prettier/snapshot.txt | 4 +-
.../snapshots/pycontribs/jira/report.yaml | 64 +-
.../snapshots/pycontribs/jira/snapshot.txt | 64 +-
.../snapshots/wireapp/wire-webapp/snapshot.txt | 22 +-
26 files changed, 1879 insertions(+), 1744 deletions(-)
Features
feat: Support spell checking of JSX/TSX Text (#3346)
feat: Support spell checking of JSX/TSX Text (#3346)
- New Option:
checkJSXText
defaults totrue
.
fixes: #3342
feat: Use CSpellIO as the default file read layer. (#3323)
feat: Use CSpellIO as the default file read layer. (#3323)
Fixes
fix: Workflow Bot -- Update Dictionaries (main) (#3337)
fix: Workflow Bot -- Update Dictionaries (main) (#3337)
Update Dictionaries (main)
.../snapshots/eslint/eslint/report.yaml | 3 +-
.../snapshots/eslint/eslint/snapshot.txt | 3 +-
.../iluwatar/java-design-patterns/report.yaml | 4 +--
.../iluwatar/java-design-patterns/snapshot.txt | 4 +--
packages/cspell-bundled-dicts/package-lock.json | 42 +++++++++++-----------
packages/cspell-bundled-dicts/package.json | 6 ++--
6 files changed, 28 insertions(+), 34 deletions(-)
dev: add ability to encode a data url from a file. (#3314)
dev: add ability to encode a data url from a file. (#3314)
Dictionary Updates
fix: Workflow Bot -- Update Dictionaries (main) (#3337)
fix: Workflow Bot -- Update Dictionaries (main) (#3337)
Update Dictionaries (main)
.../snapshots/eslint/eslint/report.yaml | 3 +-
.../snapshots/eslint/eslint/snapshot.txt | 3 +-
.../iluwatar/java-design-patterns/report.yaml | 4 +--
.../iluwatar/java-design-patterns/snapshot.txt | 4 +--
packages/cspell-bundled-dicts/package-lock.json | 42 +++++++++++-----------
packages/cspell-bundled-dicts/package.json | 6 ++--
6 files changed, 28 insertions(+), 34 deletions(-)
Documentation
ci: Workflow Bot -- Build Docs (#3312)
ci: Workflow Bot -- Build Docs (#3312)
.../AdvancedCSpellSettingsWithSourceTrace.md | 106 +++++++++----------
docs/types/cspell-types/interfaces/BaseSetting.md | 32 +++---
.../cspell-types/interfaces/CSpellReporter.md | 12 +--
.../interfaces/CSpellReporterModule.md | 2 +-
.../cspell-types/interfaces/CSpellSettings.md | 98 +++++++++---------
.../interfaces/CSpellSettingsWithSourceTrace.md | 104 +++++++++----------
.../types/cspell-types/interfaces/CacheSettings.md | 6 +-
.../cspell-types/interfaces/CharacterSetCosts.md | 6 +-
.../cspell-types/interfaces/CommandLineSettings.md | 4 +-
.../interfaces/DictionaryDefinitionAlternate.md | 14 +--
.../interfaces/DictionaryDefinitionAugmented.md | 16 +--
.../interfaces/DictionaryDefinitionBase.md | 12 +--
.../interfaces/DictionaryDefinitionCustom.md | 18 ++--
.../interfaces/DictionaryDefinitionPreferred.md | 14 +--
.../interfaces/DictionaryInformation.md | 32 ++++--
docs/types/cspell-types/interfaces/EditCosts.md | 10 +-
.../cspell-types/interfaces/ExtendableSettings.md | 62 +++++------
docs/types/cspell-types/interfaces/Features.md | 2 +-
docs/types/cspell-types/interfaces/FileSettings.md | 94 ++++++++---------
docs/types/cspell-types/interfaces/FileSource.md | 8 +-
.../types/cspell-types/interfaces/ImportFileRef.md | 6 +-
.../cspell-types/interfaces/InMemorySource.md | 8 +-
docs/types/cspell-types/interfaces/Issue.md | 20 ++--
.../cspell-types/interfaces/LanguageSetting.md | 38 +++----
.../interfaces/LanguageSettingFilterFields.md | 6 +-
.../LanguageSettingFilterFieldsDeprecated.md | 4 +-
.../LanguageSettingFilterFieldsPreferred.md | 4 +-
.../cspell-types/interfaces/LegacySettings.md | 4 +-
docs/types/cspell-types/interfaces/MergeSource.md | 8 +-
.../interfaces/OverrideFilterFields.md | 2 +-
.../cspell-types/interfaces/OverrideSettings.md | 62 +++++------
docs/types/cspell-types/interfaces/ParseResult.md | 6 +-
docs/types/cspell-types/interfaces/ParsedText.md | 12 +--
docs/types/cspell-types/interfaces/Parser.md | 4 +-
docs/types/cspell-types/interfaces/Plugin.md | 2 +-
docs/types/cspell-types/interfaces/PnPSettings.md | 4 +-
docs/types/cspell-types/interfaces/ProgressBase.md | 2 +-
.../cspell-types/interfaces/ProgressFileBase.md | 8 +-
.../cspell-types/interfaces/ProgressFileBegin.md | 8 +-
.../interfaces/ProgressFileComplete.md | 16 +--
.../interfaces/RegExpPatternDefinition.md | 6 +-
.../interfaces/ReportingConfiguration.md | 12 +--
docs/types/cspell-types/interfaces/RunResult.md | 10 +-
docs/types/cspell-types/interfaces/Settings.md | 60 +++++------
.../interfaces/SuggestionsConfiguration.md | 6 +-
.../cspell-types/interfaces/TextDocumentOffset.md | 16 +--
docs/types/cspell-types/interfaces/TextOffset.md | 6 +-
.../interfaces/WorkspaceTrustSettings.md | 6 +-
docs/types/cspell-types/modules.md | 114 ++++++++++-----------
49 files changed, 565 insertions(+), 547 deletions(-)
Testing
Maintenance
ci: Workflow Bot -- Update ALL Dependencies (main) (#3343)
ci: Workflow Bot -- Update ALL Dependencies (main) (#3343)
Update ALL Dependencies (main)
integration-tests/package-lock.json | 174 ++++++-------
integration-tests/package.json | 2 +-
package-lock.json | 276 ++++++++++-----------
package.json | 4 +-
packages/Samples/package-lock.json | 12 +-
packages/cspell-bundled-dicts/package-lock.json | 40 +--
packages/cspell-bundled-dicts/package.json | 4 +-
packages/cspell-config/package-lock.json | 150 +++++------
packages/cspell-config/package.json | 2 +-
packages/cspell-dynamic-loader/package-lock.json | 172 ++++++-------
packages/cspell-eslint-plugin/package-lock.json | 66 ++---
packages/cspell-eslint-plugin/package.json | 6 +-
packages/cspell-gitignore/package-lock.json | 150 +++++------
packages/cspell-gitignore/package.json | 2 +-
packages/cspell-glob/package-lock.json | 150 +++++------
packages/cspell-glob/package.json | 2 +-
packages/cspell-grammar/package-lock.json | 150 +++++------
packages/cspell-grammar/package.json | 2 +-
packages/cspell-io/package-lock.json | 150 +++++------
packages/cspell-io/package.json | 2 +-
packages/cspell-json-reporter/package-lock.json | 12 +-
packages/cspell-lib/package-lock.json | 174 ++++++-------
packages/cspell-lib/package.json | 2 +-
packages/cspell-pipe/package-lock.json | 150 +++++------
packages/cspell-pipe/package.json | 2 +-
packages/cspell-service-bus/package-lock.json | 150 +++++------
packages/cspell-service-bus/package.json | 2 +-
packages/cspell-tools/package-lock.json | 150 +++++------
packages/cspell-tools/package.json | 2 +-
packages/cspell-trie-lib/package-lock.json | 150 +++++------
packages/cspell-trie-lib/package.json | 2 +-
packages/cspell-trie/package-lock.json | 150 +++++------
packages/cspell-trie/package.json | 2 +-
packages/cspell-trie2-lib/package-lock.json | 148 +++++------
packages/cspell-types/package-lock.json | 148 +++++------
packages/cspell/package-lock.json | 172 ++++++-------
packages/hunspell-reader/package-lock.json | 150 +++++------
packages/hunspell-reader/package.json | 2 +-
test-packages/cspell-cli/package-lock.json | 36 +--
.../test-cspell-eslint-plugin/package-lock.json | 86 +++----
.../test-cspell-eslint-plugin/package.json | 2 +-
test-packages/test-cspell-io/package-lock.json | 12 +-
.../test-cspell-lib-webpack/package-lock.json | 172 ++++++-------
test-packages/test-cspell-lib/package-lock.json | 36 +--
test-packages/test-cspell-tools/package-lock.json | 36 +--
test-packages/test-cspell/package-lock.json | 36 +--
website/package-lock.json | 202 +++++++--------
website/package.json | 2 +-
48 files changed, 1852 insertions(+), 1852 deletions(-)
ci: Workflow Bot -- Update ALL Dependencies (main) (#3339)
ci: Workflow Bot -- Update ALL Dependencies (main) (#3339)
Update ALL Dependencies (main)
integration-tests/package-lock.json | 48 ++++-----
package-lock.json | 112 ++++++++++-----------
packages/cspell-config/package-lock.json | 12 +--
packages/cspell-dynamic-loader/package-lock.json | 48 ++++-----
packages/cspell-eslint-plugin/package-lock.json | 36 +++----
packages/cspell-gitignore/package-lock.json | 12 +--
packages/cspell-glob/package-lock.json | 12 +--
packages/cspell-grammar/package-lock.json | 12 +--
packages/cspell-io/package-lock.json | 12 +--
packages/cspell-lib/package-lock.json | 48 ++++-----
packages/cspell-pipe/package-lock.json | 12 +--
packages/cspell-service-bus/package-lock.json | 12 +--
packages/cspell-tools/package-lock.json | 12 +--
packages/cspell-trie-lib/package-lock.json | 12 +--
packages/cspell-trie/package-lock.json | 12 +--
packages/cspell-trie2-lib/package-lock.json | 12 +--
packages/cspell-types/package-lock.json | 12 +--
packages/cspell/package-lock.json | 48 ++++-----
packages/hunspell-reader/package-lock.json | 12 +--
test-packages/cspell-cli/package-lock.json | 36 +++----
.../test-cspell-eslint-plugin/package-lock.json | 36 +++----
.../test-cspell-lib-webpack/package-lock.json | 60 +++++------
test-packages/test-cspell-lib/package-lock.json | 36 +++----
test-packages/test-cspell-tools/package-lock.json | 36 +++----
test-packages/test-cspell/package-lock.json | 36 +++----
website/package-lock.json | 52 +++++-----
26 files changed, 394 insertions(+), 394 deletions(-)
ci: Workflow Bot -- Update ALL Dependencies (main) (#3334)
ci: Workflow Bot -- Update ALL Dependencies (main) (#3334)
Update ALL Dependencies (main)
integration-tests/package-lock.json | 24 +++++++++++-----------
package-lock.json | 24 +++++++++++-----------
packages/cspell-config/package-lock.json | 24 +++++++++++-----------
packages/cspell-dynamic-loader/package-lock.json | 24 +++++++++++-----------
packages/cspell-gitignore/package-lock.json | 24 +++++++++++-----------
packages/cspell-glob/package-lock.json | 24 +++++++++++-----------
packages/cspell-grammar/package-lock.json | 24 +++++++++++-----------
packages/cspell-io/package-lock.json | 24 +++++++++++-----------
packages/cspell-lib/package-lock.json | 24 +++++++++++-----------
packages/cspell-pipe/package-lock.json | 24 +++++++++++-----------
packages/cspell-service-bus/package-lock.json | 24 +++++++++++-----------
packages/cspell-tools/package-lock.json | 24 +++++++++++-----------
packages/cspell-trie-lib/package-lock.json | 24 +++++++++++-----------
packages/cspell-trie/package-lock.json | 24 +++++++++++-----------
packages/cspell-trie2-lib/package-lock.json | 24 +++++++++++-----------
packages/cspell-types/package-lock.json | 24 +++++++++++-----------
packages/cspell/package-lock.json | 24 +++++++++++-----------
packages/hunspell-reader/package-lock.json | 24 +++++++++++-----------
.../test-cspell-lib-webpack/package-lock.json | 24 +++++++++++-----------
website/package-lock.json | 12 +++++------
20 files changed, 234 insertions(+), 234 deletions(-)
build(deps): bump streetsidesoftware/cspell-action from 2.3.0 to 2.4 (#3327)
build(deps): bump streetsidesoftware/cspell-action from 2.3.0 to 2.4 (#3327)
Bumps streetsidesoftware/cspell-action from 2.3.0 to 2.4.
Sourced from streetsidesoftware/cspell-action's releases.
Sourced from streetsidesoftware/cspell-action's changelog.
All notable changes to this project will be documented in this file. See standard-version for commit guidelines.
... (truncated)
Release notes
v2.4.0
2.4.0 (2022-07-30)
Features
Updates and Bug Fixes
Changelog
Changelog
2.4.0 (2022-07-30)
Features
Updates and Bug Fixes
2.3.0 (2022-07-26)
Features
Updates and Bug Fixes
Continuous Integration
Commits
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase
.
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
ci: Workflow Bot -- Update ALL Dependencies (main) (#3326)
ci: Workflow Bot -- Update ALL Dependencies (main) (#3326)
Update ALL Dependencies (main)
integration-tests/package-lock.json | 133 +++++----
package-lock.json | 133 +++++----
packages/cspell-config/package-lock.json | 133 +++++----
packages/cspell-dynamic-loader/package-lock.json | 133 +++++----
packages/cspell-gitignore/package-lock.json | 133 +++++----
packages/cspell-glob/package-lock.json | 133 +++++----
packages/cspell-grammar/package-lock.json | 133 +++++----
packages/cspell-io/package-lock.json | 133 +++++----
packages/cspell-lib/package-lock.json | 133 +++++----
packages/cspell-pipe/package-lock.json | 133 +++++----
packages/cspell-service-bus/package-lock.json | 133 +++++----
packages/cspell-tools/package-lock.json | 133 +++++----
packages/cspell-trie-lib/package-lock.json | 133 +++++----
packages/cspell-trie/package-lock.json | 133 +++++----
packages/cspell-trie2-lib/package-lock.json | 133 +++++----
packages/cspell-types/package-lock.json | 133 +++++----
packages/cspell/package-lock.json | 133 +++++----
packages/hunspell-reader/package-lock.json | 133 +++++----
.../test-cspell-lib-webpack/package-lock.json | 133 +++++----
website/package-lock.json | 311 +++++++++++----------
20 files changed, 1588 insertions(+), 1250 deletions(-)
ci: Workflow Bot -- Update ALL Dependencies (main) (#3325)
ci: Workflow Bot -- Update ALL Dependencies (main) (#3325)
Update ALL Dependencies (main)
integration-tests/package-lock.json | 12 +-
package-lock.json | 273 ++--
package.json | 6 +-
packages/cspell-config/package-lock.json | 12 +-
packages/cspell-dynamic-loader/package-lock.json | 12 +-
packages/cspell-eslint-plugin/package-lock.json | 187 +--
packages/cspell-eslint-plugin/package.json | 8 +-
packages/cspell-gitignore/package-lock.json | 12 +-
packages/cspell-glob/package-lock.json | 12 +-
packages/cspell-grammar/package-lock.json | 12 +-
packages/cspell-io/package-lock.json | 12 +-
packages/cspell-lib/package-lock.json | 12 +-
packages/cspell-pipe/package-lock.json | 12 +-
packages/cspell-service-bus/package-lock.json | 12 +-
packages/cspell-tools/package-lock.json | 12 +-
packages/cspell-trie-lib/package-lock.json | 12 +-
packages/cspell-trie/package-lock.json | 12 +-
packages/cspell-trie2-lib/package-lock.json | 12 +-
packages/cspell-types/package-lock.json | 12 +-
packages/cspell/package-lock.json | 12 +-
packages/hunspell-reader/package-lock.json | 12 +-
.../test-cspell-eslint-plugin/package-lock.json | 249 ++--
.../test-cspell-eslint-plugin/package.json | 6 +-
.../test-cspell-lib-webpack/package-lock.json | 12 +-
website/package-lock.json | 1312 ++++++++++----------
website/package.json | 12 +-
26 files changed, 1161 insertions(+), 1108 deletions(-)
ci: Workflow Bot -- Update ALL Dependencies (main) (#3315)
ci: Workflow Bot -- Update ALL Dependencies (main) (#3315)
Update ALL Dependencies (main)
integration-tests/package-lock.json | 28 ++++-----
integration-tests/package.json | 4 +-
package-lock.json | 28 ++++-----
package.json | 4 +-
packages/Samples/package-lock.json | 12 ++--
packages/cspell-bundled-dicts/package-lock.json | 12 ++--
packages/cspell-config/package-lock.json | 14 ++---
packages/cspell-config/package.json | 2 +-
packages/cspell-dynamic-loader/package-lock.json | 12 ++--
packages/cspell-eslint-plugin/package-lock.json | 33 ++++++-----
packages/cspell-eslint-plugin/package.json | 2 +-
packages/cspell-gitignore/package-lock.json | 14 ++---
packages/cspell-gitignore/package.json | 2 +-
packages/cspell-glob/package-lock.json | 14 ++---
packages/cspell-glob/package.json | 2 +-
packages/cspell-grammar/package-lock.json | 14 ++---
packages/cspell-grammar/package.json | 2 +-
packages/cspell-io/package-lock.json | 14 ++---
packages/cspell-io/package.json | 2 +-
packages/cspell-json-reporter/package-lock.json | 12 ++--
packages/cspell-lib/package-lock.json | 14 ++---
packages/cspell-lib/package.json | 2 +-
packages/cspell-pipe/package-lock.json | 14 ++---
packages/cspell-pipe/package.json | 2 +-
packages/cspell-service-bus/package-lock.json | 14 ++---
packages/cspell-service-bus/package.json | 2 +-
packages/cspell-tools/package-lock.json | 14 ++---
packages/cspell-tools/package.json | 2 +-
packages/cspell-trie-lib/package-lock.json | 14 ++---
packages/cspell-trie-lib/package.json | 2 +-
packages/cspell-trie/package-lock.json | 14 ++---
packages/cspell-trie/package.json | 2 +-
packages/cspell-trie2-lib/package-lock.json | 12 ++--
packages/cspell-types/package-lock.json | 12 ++--
packages/cspell/package-lock.json | 12 ++--
packages/hunspell-reader/package-lock.json | 14 ++---
packages/hunspell-reader/package.json | 2 +-
test-packages/cspell-cli/package-lock.json | 12 ++--
.../test-cspell-eslint-plugin/package-lock.json | 26 ++++-----
.../test-cspell-eslint-plugin/package.json | 2 +-
test-packages/test-cspell-io/package-lock.json | 12 ++--
.../test-cspell-lib-webpack/package-lock.json | 12 ++--
test-packages/test-cspell-lib/package-lock.json | 12 ++--
test-packages/test-cspell-tools/package-lock.json | 12 ++--
test-packages/test-cspell/package-lock.json | 12 ++--
website/package-lock.json | 66 +++++++++++-----------
website/package.json | 2 +-
47 files changed, 273 insertions(+), 270 deletions(-)
ci: Workflow Bot -- Update ALL Dependencies (main) (#3308)
ci: Workflow Bot -- Update ALL Dependencies (main) (#3308)
Update ALL Dependencies (main)
integration-tests/package-lock.json | 321 +-
integration-tests/package.json | 2 +-
package-lock.json | 4005 ++++++++------------
package.json | 6 +-
packages/Samples/package-lock.json | 75 +-
packages/cspell-bundled-dicts/package-lock.json | 89 +-
packages/cspell-config/package-lock.json | 100 +-
packages/cspell-config/package.json | 2 +-
packages/cspell-dynamic-loader/package-lock.json | 255 +-
packages/cspell-eslint-plugin/package-lock.json | 179 +-
packages/cspell-eslint-plugin/package.json | 6 +-
packages/cspell-gitignore/package-lock.json | 86 +-
packages/cspell-gitignore/package.json | 2 +-
packages/cspell-glob/package-lock.json | 86 +-
packages/cspell-glob/package.json | 2 +-
packages/cspell-grammar/package-lock.json | 100 +-
packages/cspell-grammar/package.json | 2 +-
packages/cspell-io/package-lock.json | 100 +-
packages/cspell-io/package.json | 2 +-
packages/cspell-json-reporter/package-lock.json | 26 +-
packages/cspell-lib/package-lock.json | 213 +-
packages/cspell-lib/package.json | 4 +-
packages/cspell-pipe/package-lock.json | 86 +-
packages/cspell-pipe/package.json | 2 +-
packages/cspell-service-bus/package-lock.json | 86 +-
packages/cspell-service-bus/package.json | 2 +-
packages/cspell-tools/package-lock.json | 129 +-
packages/cspell-tools/package.json | 2 +-
packages/cspell-trie-lib/package-lock.json | 100 +-
packages/cspell-trie-lib/package.json | 2 +-
packages/cspell-trie/package-lock.json | 100 +-
packages/cspell-trie/package.json | 2 +-
packages/cspell-trie2-lib/package-lock.json | 84 +-
packages/cspell-types/package-lock.json | 84 +-
packages/cspell/package-lock.json | 269 +-
packages/cspell/package.json | 2 +-
packages/hunspell-reader/package-lock.json | 86 +-
packages/hunspell-reader/package.json | 2 +-
rfc/rfc-0001 suggestions/package-lock.json | 14 +-
test-packages/cspell-cli/package-lock.json | 181 +-
.../test-cspell-eslint-plugin/package-lock.json | 167 +-
test-packages/test-cspell-io/package-lock.json | 41 +-
.../test-cspell-lib-webpack/package-lock.json | 227 +-
test-packages/test-cspell-lib/package-lock.json | 149 +-
test-packages/test-cspell-tools/package-lock.json | 203 +-
test-packages/test-cspell/package-lock.json | 183 +-
website/package-lock.json | 464 +--
47 files changed, 3925 insertions(+), 4405 deletions(-)