Repository navigation
conflicting assignment fixes - #248
Merged
Merged
Conversation
JonatanWaern
commented
Nov 2, 2026
Contributor
- Do not conflict assignments with themselves when their conditions differ
- Merge equivalent externs
JonatanWaern
force-pushed
the
conflicting-assignment-fixes
branch
from
November 2, 2026 08:49
82be50f to
d1b0e72
Compare
Signed-off-by: Jonatan Waern <jonatan.waern@intel.com>
Signed-off-by: Jonatan Waern <jonatan.waern@intel.com>
JonatanWaern
force-pushed
the
conflicting-assignment-fixes
branch
from
November 2, 2026 08:58
d1b0e72 to
c2aa62b
Compare
There was a problem hiding this comment.
🟡 Changes recommended
Repeated extern declarations can deadlock device analysis, while per-declaration symbol storage also causes duplicate navigation results.
2 open issues
What changed in this PR
This PR updates DML language-server analysis to avoid parameter self-conflicts across conditional paths and merge repeated extern declarations into shared symbols.
Changes:
- Compare distinct parameter assignments while preserving conditional reachability.
- Merge extern declarations and retain their navigation locations, with type-equivalence checking explicitly deferred.
- Add regression fixtures, lookup tests, and changelog entries.
| File | Description |
|---|---|
tests/test_files/repeated_externs.dml |
Covers repeated extern navigation and extern/session collisions. |
tests/test_files/repeated_extern_import.dml |
Supplies imported extern declarations for merging tests. |
tests/test_files/conditional_parameter_paths.dml |
Covers shared assignments, exclusive branches, and genuine conflicts. |
tests/lsp_lookup_tests.rs |
Adds extern lookup and conditional parameter diagnostic tests. |
src/analysis/templating/objects.rs |
Groups extern declarations and revises parameter conflict detection. |
src/analysis/mod.rs |
Maps merged extern declarations to shared symbols. |
CHANGELOG.md |
Documents both behavior changes and deferred extern type checking. |
Review effort: Balanced
TSonono
approved these changes
Nov 2, 2026
Used to be one symbol per merged decl, now one symbol contains all merged decls as possible decl spans Signed-off-by: Jonatan Waern <jonatan.waern@intel.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

