Use strict sorted and union for NoQA mapping insertion

[dhruvmanila]

Summary

This PR fixes the way NoQA range is inserted to the NoqaMapping.

Previously, the way the mapping insertion logic worked was as follows:

1. If the range which is to be inserted touched the previous range, meaning
   that the end of the previous range was the same as the start of the new
   range, then the new range was added in addition to the previous range.
2. Else, if the new range intersected the previous range, then the previous
   range was replaced with the new intersection of the two ranges.

The problem with this logic is that it does not work for the following case:

assert foo, \
    """multi-line
    string"""

Now, the comments cannot be added to the same line which ends with a continuation
character. So, the NoQA directive has to be added to the next line. But, the
next line is also a triple-quoted string, so the NoQA directive for that line
needs to be added to the next line. This creates a union pattern instead of an
intersection pattern.

But, only union doesn't suffice because (1) means that for the edge case where
the range touch only at the end, the union won't take place.

Solution

1. Replace '<=' with '<' to have a strict insertion case
2. Use union instead of intersection

Test Plan

Add a new test case. Run the test suite to ensure that nothing is broken.

Integration

1. Make a test.py file with the following contents:

   assert foo, \
       """multi-line
       string"""

2. Run the following command:

   $ cargo run --bin ruff -- check --isolated --no-cache --select=F821 test.py
   /Users/dhruv/playground/ruff/fstring.py:1:8: F821 Undefined name `foo`
   Found 1 error.

3. Use --add-noqa:

   $ cargo run --bin ruff -- check --isolated --no-cache --select=F821 --add-noqa test.py
   Added 1 noqa directive.

4. Check that the NoQA directive was added in the correct position:

   assert foo, \
       """multi-line
       string"""  # noqa: F821

5. Run the check command to ensure that the NoQA directive is respected:

   $ cargo run --bin ruff -- check --isolated --no-cache --select=F821 test.py

fixes: #7530

[dhruvmanila]

Current dependencies on/for this PR:

• main
  • PR Use strict sorted and union for NoQA mapping insertion #7531 👈

This comment was auto-generated by Graphite.

[github-actions]

PR Check Results

Ecosystem

✅ ecosystem check detected no changes.