Skip to content

Conversation

rakudrama
Copy link
Member

When the generated code position is on a line that has sourcemap entries, but it is before any entry on that line, the original source position is specified by the last entry of the previous generated code line. The bug being fixed is that when these conditions held, the generated code position was incorrectly considered to be unmapped.


  • I’ve reviewed the contributor guide and applied the relevant portions to this PR.
Contribution guidelines:

Many Dart repos have a weekly cadence for reviewing PRs - please allow for some latency before initial review feedback.

Note: The Dart team is trialing Gemini Code Assist. Don't take its comments as final Dart team feedback. Use the suggestions if they're helpful; otherwise, wait for a human reviewer.

@rakudrama rakudrama requested a review from a team as a code owner October 9, 2025 21:25
@rakudrama rakudrama requested a review from sigmundch October 9, 2025 21:25
Copy link

github-actions bot commented Oct 9, 2025

Package publishing

Package Version Status Publish tag (post-merge)
package:benchmark_harness 2.4.0-wip WIP (no publish necessary)
package:boolean_selector 2.1.2 already published at pub.dev
package:browser_launcher 1.1.3 already published at pub.dev
package:cli_config 0.2.1-wip WIP (no publish necessary)
package:cli_util 0.5.0-wip WIP (no publish necessary)
package:clock 1.1.3-wip WIP (no publish necessary)
package:code_builder 4.11.0 already published at pub.dev
package:coverage 1.15.0 already published at pub.dev
package:csslib 1.0.2 already published at pub.dev
package:extension_discovery 2.1.0 already published at pub.dev
package:file 7.0.2-wip WIP (no publish necessary)
package:file_testing 3.1.0-wip WIP (no publish necessary)
package:glob 2.1.3 already published at pub.dev
package:graphs 2.3.3-wip WIP (no publish necessary)
package:html 0.15.6 already published at pub.dev
package:io 1.1.0-wip WIP (no publish necessary)
package:json_rpc_2 4.0.0 already published at pub.dev
package:markdown 7.3.1-wip WIP (no publish necessary)
package:mime 2.0.0 already published at pub.dev
package:oauth2 2.0.4-wip WIP (no publish necessary)
package:package_config 2.3.0-wip WIP (no publish necessary)
package:pool 1.5.2 already published at pub.dev
package:process 5.0.5 already published at pub.dev
package:pub_semver 2.2.0 already published at pub.dev
package:pubspec_parse 1.5.0 already published at pub.dev
package:source_map_stack_trace 2.1.3-wip WIP (no publish necessary)
package:source_maps 0.10.14-wip WIP (no publish necessary)
package:source_span 1.10.1 already published at pub.dev
package:sse 4.1.8 already published at pub.dev
package:stack_trace 1.12.1 already published at pub.dev
package:stream_channel 2.1.4 already published at pub.dev
package:stream_transform 2.1.2-wip WIP (no publish necessary)
package:string_scanner 1.4.1 already published at pub.dev
package:term_glyph 1.2.3-wip WIP (no publish necessary)
package:test_reflective_loader 0.4.0 already published at pub.dev
package:timing 1.0.2 already published at pub.dev
package:unified_analytics 8.0.6 ready to publish unified_analytics-v8.0.6
package:watcher 1.1.5-wip WIP (no publish necessary)
package:yaml 3.1.3 already published at pub.dev
package:yaml_edit 2.2.2 already published at pub.dev

Documentation at https://github.com/dart-lang/ecosystem/wiki/Publishing-automation.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request correctly fixes an issue in SingleMapping.spanFor where a generated code position before any sourcemap entry on a line was considered unmapped. The new _findEntry method correctly implements the specified behavior of using the last entry from the previous line in such cases. The accompanying test case update properly validates this fix.

My review includes a couple of minor suggestions to correct the links to the sourcemap specification in the changelog and in a documentation comment, as they currently point to an incorrect ECMA standard.

Copy link

github-actions bot commented Oct 9, 2025

PR Health

Breaking changes ✔️
Package Change Current Version New Version Needed Version Looking good?
source_maps None 0.10.13 0.10.14-wip 0.10.13 ✔️

This check can be disabled by tagging the PR with skip-breaking-check.

Changelog Entry ✔️
Package Changed Files

Changes to files need to be accounted for in their respective changelogs.

This check can be disabled by tagging the PR with skip-changelog-check.

Coverage ✔️
File Coverage
pkgs/source_maps/lib/parser.dart 💚 63 %

This check for test coverage is informational (issues shown here will not fail the PR).

This check can be disabled by tagging the PR with skip-coverage-check.

API leaks ✔️

The following packages contain symbols visible in the public API, but not exported by the library. Export these symbols or remove them from your publicly visible API.

Package Leaked API symbol Leaking sources

This check can be disabled by tagging the PR with skip-leaking-check.

License Headers ✔️
// Copyright (c) 2025, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
Files
no missing headers

All source files should start with a license header.

Unrelated files missing license headers
Files
pkgs/bazel_worker/benchmark/benchmark.dart
pkgs/benchmark_harness/integration_test/perf_benchmark_test.dart
pkgs/boolean_selector/example/example.dart
pkgs/clock/lib/clock.dart
pkgs/clock/lib/src/clock.dart
pkgs/clock/lib/src/default.dart
pkgs/clock/lib/src/stopwatch.dart
pkgs/clock/lib/src/utils.dart
pkgs/clock/test/clock_test.dart
pkgs/clock/test/default_test.dart
pkgs/clock/test/stopwatch_test.dart
pkgs/clock/test/utils.dart
pkgs/coverage/lib/src/coverage_options.dart
pkgs/html/example/main.dart
pkgs/html/lib/dom.dart
pkgs/html/lib/dom_parsing.dart
pkgs/html/lib/html_escape.dart
pkgs/html/lib/parser.dart
pkgs/html/lib/src/constants.dart
pkgs/html/lib/src/encoding_parser.dart
pkgs/html/lib/src/html_input_stream.dart
pkgs/html/lib/src/list_proxy.dart
pkgs/html/lib/src/query_selector.dart
pkgs/html/lib/src/token.dart
pkgs/html/lib/src/tokenizer.dart
pkgs/html/lib/src/treebuilder.dart
pkgs/html/lib/src/utils.dart
pkgs/html/test/dom_test.dart
pkgs/html/test/parser_feature_test.dart
pkgs/html/test/parser_test.dart
pkgs/html/test/query_selector_test.dart
pkgs/html/test/selectors/level1_baseline_test.dart
pkgs/html/test/selectors/level1_lib.dart
pkgs/html/test/selectors/selectors.dart
pkgs/html/test/support.dart
pkgs/html/test/tokenizer_test.dart
pkgs/html/test/trie_test.dart
pkgs/html/tool/generate_trie.dart
pkgs/pubspec_parse/test/git_uri_test.dart
pkgs/stack_trace/example/example.dart
pkgs/watcher/test/custom_watcher_factory_test.dart
pkgs/yaml_edit/example/example.dart

This check can be disabled by tagging the PR with skip-license-check.

Copy link
Member

@sigmundch sigmundch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the refactor_test only covered this behavior indirectly, it may be helpful to add a test case in parser_test.dart to cover this scenario.

@rakudrama rakudrama requested a review from natebosch October 10, 2025 21:21
@rakudrama
Copy link
Member Author

I have added a test that used to fail like this, but now passes:

00:00 +28 -4: test/continued_region_test.dart: continued span, later line, later column [E]        
  Expected: '----------\n'
              '----------\n'
              '----AAAAAA\n'
              'AAAAAAAAAA\n'
              'AAAAAAAAAA\n'
              'AAAAAABBBB\n'
              'BBBBBBBBBB\n'
              'BBBBBBBBBB\n'
              ''
    Actual: '----------\n'
              '----------\n'
              '----AAAAAA\n'
              'AAAAAAAAAA\n'
              'AAAAAAAAAA\n'
              '------BBBB\n'
              'BBBBBBBBBB\n'
              'BBBBBBBBBB\n'
              ''
     Which: is different.
            Expected: ... AAAAAAAA\nAAAAAABBBB ...
              Actual: ... AAAAAAAA\n------BBBB ...
                                    ^
             Differ at offset 60

Copy link
Member

@sigmundch sigmundch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @rakudrama!

//
// We can describe the mapping by an 'image' of the generated file, where
// the positions marked as 'A' in the 'image' correspond to locations in the
// generated file that map to locations in source file file 'A'. Lines and
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: s/file file/file/

@rakudrama rakudrama merged commit b435a46 into dart-lang:main Oct 10, 2025
14 checks passed
copybara-service bot pushed a commit to dart-lang/sdk that referenced this pull request Oct 13, 2025
Revisions updated by `dart tools/rev_sdk_deps.dart`.

ai (https://github.com/dart-lang/ai/compare/59db320..a29274b):
  a29274b  2025-10-09  Greg Spencer  Provide output logs when the process launch fails. (dart-lang/ai#293)
  d33ed02  2025-10-07  Greg Spencer  [Feat] Add hot restart tool (dart-lang/ai#297)

dartdoc (https://github.com/dart-lang/dartdoc/compare/ec2a4fe..98d03ad):
  98d03ad2  2025-10-09  Sarah Zakarias  Bump to 9.0.0 (dart-lang/dartdoc#4116)
  45ba6ede  2025-10-07  Sam Rawlins  Display constructor names in annotations (dart-lang/dartdoc#4115)

ecosystem (https://github.com/dart-lang/ecosystem/compare/96ee861..f4fbac4):
  f4fbac4  2025-10-13  Moritz  Use up to date firehose in publish (dart-lang/ecosystem#376)
  1fe5686  2025-10-10  Moritz  Relax assumptions on workspaces in firehose (dart-lang/ecosystem#375)

shelf (https://github.com/dart-lang/shelf/compare/f30d650..710b8ce):
  710b8ce  2025-10-08  Kevin Moore  shelf_router_generator: update dependencies, SDK (dart-lang/shelf#484)

tools (https://github.com/dart-lang/tools/compare/6866f9b..adf3fe7):
  adf3fe78  2025-10-13  Parker Lougheed  [markdown] Preserve metadata passed to fenced code blocks (dart-lang/tools#2186)
  b435a46b  2025-10-10  Stephen Adams  Fix `SingleMapping.spanFor` to use previous line (dart-lang/tools#2205)
  4c7dae18  2025-10-10  Morgan :)  Fix for skipped tests on Windows. (dart-lang/tools#2204)
  50b4514e  2025-10-09  Morgan :)  Use Event extension type for Windows DirectoryWatcher. (dart-lang/tools#2203)
  a0af8b59  2025-10-08  Morgan :)  Use Event extension type for MacOS DirectoryWatcher. (dart-lang/tools#2201)
  0f50f061  2025-10-08  Morgan :)  Add package-private extension type Event on FileSystemEvent. (dart-lang/tools#2200)
  d67ab97c  2025-10-07  Moritz  [bazel_worker] Upgrade `protobuf` + cleanups (dart-lang/tools#2195)

webdev (https://github.com/dart-lang/webdev/compare/29ba1b1..186bfe7):
  186bfe71  2025-10-09  Ben Konyi  [ DWDS ] Expose `dtdUri` via `DebugConnection` (dart-lang/webdev#2694)
  3ab8fca3  2025-10-09  Srujan Gaddam  [DWDS] Don't send PauseInterrupted event during a hot reload (dart-lang/webdev#2695)
  cdc5cc3c  2025-10-09  jensjoha  Pass script uri for javascript expression compilation (dart-lang/webdev#2682)

Change-Id: Ie78adfec4a8887af1ea3104b50c52ea2fd3bb1d2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/454621
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Auto-Submit: Devon Carew <devoncarew@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants