Problem/Motivation

Limit this to one line easy fixes, avoid any possible controversy, or any change that would better fit with other words, such as doing chien and chiens in the same patch.

The list of words beginning with n -> p, inclusive, that are used once in one file.

Proposed resolution

Remove the following from dictionary.txt

  1. -ndelay
  2. -nocdata
  3. -noemptytag
  4. -noevent
  5. -nonamespace
  6. -nonexistingfilename
  7. -nothere
  8. -omitscript
  9. -overridetest
  10. -pageable
  11. -pageviews
  12. -phpunit's
  13. -powriter
  14. -preconfigure
  15. -precreated

Remaining tasks

Review
Commit

User interface changes

API changes

Data model changes

Release notes snippet

Issue fork drupal-3219513

Command icon Show commands

Start within a Git clone of the project using the version control instructions.

Or, if you do not have SSH keys set up on git.drupalcode.org:

Comments

quietone created an issue. See original summary.

quietone’s picture

StatusFileSize
new9.22 KB

This is just the 'n' words.

quietone’s picture

Issue summary: View changes
Status: Active » Needs review
StatusFileSize
new10.92 KB
new22.03 KB

Add 'o' and 'p'.

quietone’s picture

Assigned: quietone » Unassigned
StatusFileSize
new4.74 KB
new21.46 KB

An easy reroll.

Version: 9.3.x-dev » 9.4.x-dev

Drupal 9.3.0-rc1 was released on November 26, 2021, which means new developments and disruptive changes should now be targeted for the 9.4.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

longwave’s picture

Status: Needs review » Needs work
Issue tags: +Needs reroll

This one applies apart from to dictionary.txt, so should be fairly easy to reroll.

quietone’s picture

Issue summary: View changes
Status: Needs work » Needs review
Issue tags: -Needs reroll
StatusFileSize
new2 KB
new21 KB

Rerolled and run spellcheck on core.

Version: 9.4.x-dev » 9.5.x-dev

Drupal 9.4.0-alpha1 was released on May 6, 2022, which means new developments and disruptive changes should now be targeted for the 9.5.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

Version: 9.5.x-dev » 10.1.x-dev

Drupal 9.5.0-beta2 and Drupal 10.0.0-beta2 were released on September 29, 2022, which means new developments and disruptive changes should now be targeted for the 10.1.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

quietone’s picture

Issue tags: +cspell error

Adding tag for the cspell spelling error issues.

Pallavi1620 made their first commit to this issue’s fork.

smustgrave’s picture

Status: Needs review » Needs work

Patch no longer applies to 10.1

If someone doesn't beat me to it I can update later today.

smustgrave’s picture

Status: Needs work » Needs review
StatusFileSize
new6.41 KB
new19.33 KB

Rerolled for D10

longwave’s picture

Status: Needs review » Needs work

Two nits, otherwise this looks good:

  1. +++ b/core/lib/Drupal/Core/Config/ConfigFactoryOverrideInterface.php
    @@ -36,7 +36,7 @@ public function getCacheSuffix();
    +   * and synchronization to use the over-rider's implementation of
    

    "overrider" is a word, one who overrides? This looks off to me with the added hyphen. I think this one should be ignored instead.

  2. +++ b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php
    @@ -13,6 +13,7 @@
    +// cspell:ignore postbar
    

    This is a single constant in the file but it doesn't actually seem to be used, maybe we can just remove it?

smustgrave’s picture

Status: Needs work » Needs review
StatusFileSize
new735 bytes
new19.33 KB

Addressed point #14.1 with "overriders" sounded right when I said it out loud at least
#14.2 it's actually used as the name of a variable on the page.

longwave’s picture

For #14.2 I see it's used as const POSTBAR = 'post.bar'; but this looks like dead code, so we can remove it and the ignore?

gaurav-mathur’s picture

StatusFileSize
new1.64 KB

Patch #15 is working fine for me in drupal version 10.1.x and fixing word (n to p),
i refer to txt file after patch apply

Thank you.

smustgrave’s picture

StatusFileSize
new791 bytes
new19.39 KB

@longwave you are correct. Removed the variable cspell line.

longwave’s picture

Status: Needs review » Reviewed & tested by the community

Thanks, this looks ready to go.

xjm’s picture

Status: Reviewed & tested by the community » Needs work

Thanks for working on this spelling issue! I have a number of corrections, plus two suggestions for things that should get their own issues.

  1. +++ b/core/lib/Drupal/Core/Config/ConfigBase.php
    @@ -9,6 +9,8 @@
    +// cspell:ignore ntfs
    +
    

    "NTFS" is a legitimate technology term for a file system. I think we should retain it in the dictionary.

  2. +++ b/core/lib/Drupal/Core/Config/ConfigFactoryOverrideInterface.php
    @@ -36,7 +36,7 @@ public function getCacheSuffix();
    -   * and synchronization to use the overrider's implementation of
    +   * and synchronization to use the overriders implementation of
    

    This is not a grammatically correct change. I would suggest "the overriding _____'s implementation" (insert the correct noun).

  3. +++ b/core/lib/Drupal/Core/Database/StatementPrefetch.php
    @@ -3,7 +3,7 @@
    - * An implementation of StatementInterface that prefetches all data.
    + * An implementation of StatementInterface that will prefetch all data.
    

    "prefetch" is not correct if "prefetches" isn't. It should instead be hyphenated: "pre-fetches".

  4. +++ b/core/lib/Drupal/Core/Routing/RoutePreloader.php
    @@ -11,7 +11,7 @@
    - * Defines a class which preloads non-admin routes.
    + * Defines a class that can preload non-admin routes.
    

    Same problem here. "preload" is not a word if "preloads" is not a word. Let's hyphenate it as "pre-loads" instead.

  5. +++ b/core/lib/Drupal/Core/Session/SessionManager.php
    @@ -7,6 +7,8 @@
    +// cspell:ignore owasp
    

    This is a legit technology term, critical in web security, and should be kept in the dictionary.

    https://owasp.org/

  6. +++ b/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTestBase.php
    @@ -5,6 +5,8 @@
    +// cspell:ignore noslash
    +
     /**
    

    This word appears to just be related to test metadata. Let's update the test metadata instead? This could be split into its own issue.

  7. +++ b/core/modules/serialization/tests/modules/test_fieldtype_boolean_emoji_normalizer/src/Normalizer/BooleanItemNormalizer.php
    @@ -29,7 +29,7 @@ public function normalize($object, $format = NULL, array $context = []): array|s
    -    // Just like \Drupal\serialization\Normalizer\FieldItemNormalizer's logic
    +    // Just like logic in \Drupal\serialization\Normalizer\FieldItemNormalizer
         // for denormalization, which uses TypedDataInterface::setValue(), allow the
         // keying by main property name ("value") to be implied.
    

    I would rewrite this comment entirely. The whole thing is really unclear, grammatically convoluted, and technically vague. Let's open a separate issue for it.

  8. +++ b/core/modules/system/tests/modules/pager_test/src/Controller/PagerTestController.php
    @@ -39,7 +39,7 @@ public function __construct(PagerParametersInterface $pager_params) {
    +   * Builds a render array for a multi page test table.
    

    "multi-page" should be hyphenated.

  9. +++ b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php
    @@ -32,7 +32,6 @@ class ContainerAwareEventDispatcherTest extends TestCase {
    -  const POSTBAR = 'post.bar';
    

    This seems out of scope or incorrect.

sourabhjain’s picture

StatusFileSize
new19.41 KB
new2.42 KB

I have fixed the 2,3,4,8 suggestion which is mentioned in #20.

smustgrave’s picture

StatusFileSize
new2.12 KB
new17.09 KB

Attempted to address the other issues from #20.

Opened up 2 follow up tickets.

#20.9 it was pointed out that was dead code in #16

Am getting these phpstan errors now though

------ ------------------------------------------------
Line lib/Drupal/Core/Database/StatementPrefetch.php
------ ------------------------------------------------
212 Variable $query_start might not be defined.
212 Variable $query_start might not be defined.
------ ------------------------------------------------

------ ----------------------------------------------
Line lib/Drupal/Core/Session/SessionManager.php
------ ----------------------------------------------
148 Variable $session_data might not be defined.

smustgrave’s picture

Status: Needs work » Needs review

maybe it was just me?

needs-review-queue-bot’s picture

Status: Needs review » Needs work
StatusFileSize
new8.41 KB

The Needs Review Queue Bot tested this issue. It either no longer applies to Drupal core, or fails the Drupal core commit checks. Therefore, this issue status is now "Needs work".

Apart from a re-roll or rebase, this issue may need more work to address feedback in the issue or MR comments. To progress an issue, incorporate this feedback as part of the process of updating the issue. This helps other contributors to know what is outstanding.

Consult the Drupal Contributor Guide to find step-by-step guides for working with issues.

smustgrave’s picture

Status: Needs work » Needs review
StatusFileSize
new1.51 KB
new17.12 KB

#22 no longer applied with
error: patch failed: core/lib/Drupal/Core/Database/StatementPrefetch.php:3
error: core/lib/Drupal/Core/Database/StatementPrefetch.php: patch does not apply

dww’s picture

Status: Needs review » Needs work
Issue tags: +Needs Review Queue Initiative

Mostly looking good, but a few problems remain:

  1. +++ b/core/lib/Drupal/Core/Config/ConfigFactoryOverrideInterface.php
    @@ -36,7 +36,7 @@ public function getCacheSuffix();
    -   * and synchronization to use the overrider's implementation of
    +   * and synchronization to use the overriding _____'s implementation of
    

    Uhhh, @xjm was suggesting we fill this in with the right noun, not leave a bunch of blanks in the comment. 😂

    That said, given the rest of the comment, I'm not sure the suggestion is the way to go. I honestly think "overrider's implementation" makes the most sense, unless we completely rewrite this entire comment.

  2. +++ b/core/lib/Drupal/Core/Database/StatementPrefetch.php
    @@ -8,7 +8,7 @@
    + * An implementation of StatementInterface that will pre-fetches all data.
    

    "that will pre-fetches all data." isn't grammatically correct.

    Either needs:

    "that will pre-fetch ..."
    or
    "that pre-fetches ..."
    but not both.

  3. +++ b/core/lib/Drupal/Core/Routing/RoutePreloader.php
    @@ -11,7 +11,7 @@
    + * Defines a class that can pre-loads non-admin routes.
    

    Also not right.
    "that can pre-load ..."

Vidushi Mehta’s picture

Status: Needs work » Needs review
StatusFileSize
new16.32 KB
new16.32 KB

Addressing #26

smustgrave’s picture

Status: Needs review » Needs work

Think a file or two may be missing.

Hard to tell as the interdiff is the same as the patch.

rpayanm’s picture

Status: Needs work » Needs review
StatusFileSize
new2.02 KB

I checked the patches (#25 and #27) and they are the same except the interdiff attached here.

smustgrave’s picture

Status: Needs review » Reviewed & tested by the community

Thanks!

  • catch committed f1e19f22 on 10.1.x
    Issue #3219513 by smustgrave, quietone, sourabhjain, Vidushi Mehta,...
catch’s picture

Status: Reviewed & tested by the community » Fixed

Committed/pushed to 10.1.x, thanks!

  • quietone committed 3bafeb49 on 10.1.x
    Revert "Issue #3219513 by smustgrave, quietone, sourabhjain, Vidushi...
quietone’s picture

Status: Fixed » Needs work

Discovered while working on #3355301: Fix spellcheck:make-drupal-dict that this has introduced an error in the dictionary.txt file.

+++ b/core/misc/cspell/dictionary.txt
@@ -839,16 +831,11 @@ outdent
-overrider's

This was removed from the dictionary but the word remains in the code base.

So, what needs to happen it to apply the patch and then run cd core; yarn spellcheck:drupal-make-dict to make sure the dictionary is correct. See https://www.drupal.org/docs/develop/development-tools/cspell

Vidushi Mehta’s picture

I've run this command but it throwing error with the command failed and the dictionary got blanked.

Version: 10.1.x-dev » 11.x-dev

Drupal core is moving towards using a “main” branch. As an interim step, a new 11.x branch has been opened, as Drupal.org infrastructure cannot currently fully support a branch named main. New developments and disruptive changes should now be targeted for the 11.x branch, which currently accepts only minor-version allowed changes. For more information, see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

quietone’s picture

Status: Needs work » Needs review
StatusFileSize
new2.97 KB
new15.93 KB

@Vidushi Mehta, what was the error?

I rerolled the patch. The only conflict was dictionary.txt

I also removed the removal of 'postbar' because that one of four similar constants defined in \Drupal\Tests\Component\EventDispatcher\ContainerAwareEventDispatcherTest all of which are in the dictionary. I think that should be done in another spelling issue because the other constants are used more than once, which is outside the scope of this issue.

quietone’s picture

Issue summary: View changes

Update word list in the IS.

smustgrave’s picture

Status: Needs review » Reviewed & tested by the community

Applied #37 and ran spellcheck:make-drupal-dict and didn't get any additional changes.

Vidushi Mehta’s picture

StatusFileSize
new28.89 KB

@quietone, The reason for the error was that Windows uses a different syntax for setting environment variables compared to Unix-based systems, The LC_ALL environment variable is specific to Unix-based systems, and it is not recognized in the same way on Windows which throws an error and its forcefully removing the content from the dictionary.txt file.

Working fine on Linux RTBC+1

Thanks for the reroll

  • longwave committed 031f63e7 on 11.x
    Issue #3219513 by quietone, smustgrave, Vidushi Mehta, sourabhjain,...
longwave’s picture

Status: Reviewed & tested by the community » Fixed

Committed 031f63e and pushed to 11.x. Thanks!

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.