Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add span to plugin diagnostics #2145

Open
wants to merge 51 commits into
base: main
Choose a base branch
from
Open

Add span to plugin diagnostics #2145

wants to merge 51 commits into from
+72 −1

Conversation

DelevoXDG
Copy link
Contributor

@DelevoXDG DelevoXDG commented Apr 1, 2025 •
edited
Loading

maciektr and others added 30 commits March 12, 2025 15:21
@maciektr
Rework internal TokenStream representation (#1699)
8591848 
commit-id:ab3e2fd1

---

**Stack**:
- #1734
- #1722
- #1704
- #1700
- #1699 ⬅

⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*
@maciektr
Avoid unnecessary allocations when freeing stable structs (#1700)
a541386 
commit-id:55ec12c0

---

**Stack**:
- #1734
- #1722
- #1704
- #1700 ⬅


⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*
@maciektr
Add cairo edition to TokenStreamMetadata (#1704)
ab7ffe6 
commit-id:83c7db1f

---

**Stack**:
- #1734
- #1722
- #1704 ⬅

⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*
@maciektr
Allocate token's content into an arena (#1722)
5fae72d 
commit-id:5e4b122f

Add token stream ser/de tests

---

**Stack**:
- #1749
- #1748
- #1745
- #1747
- #1722 ⬅

⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*
@maciektr
Implement Debug for InternedStr (#1760)
ba87422 
commit-id:919c7f28

---

**Stack**:
- #1749
- #1748
- #1745
- #1747
- #1760 ⬅


⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*
@maciektr
Refactor: split proc macro host into submodules (#1747)
750ae15 
commit-id:6d8f33f9

---

**Stack**:
- #1749
- #1748
- #1745
- #1747 ⬅

⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*
@maciektr
Skip whitespace prefix when creating the span (#1761)
2af0ac0 
commit-id:f0ce5a05

---

**Stack**:
- #1749
- #1748
- #1745
- #1761 ⬅

⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*
@maciektr
Remove confusing default from token stream types (#1745)
633e21f 
commit-id:e6e81399

---

**Stack**:
- #1749
- #1748
- #1745 ⬅

⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*
@maciektr
Make TextSpan u32 to match the compiler one (#1748)
fa44067 
commit-id:107b5e17

---

**Stack**:
- #1749
- #1748 ⬅

⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*
@DelevoXDG @maciektr
Implement code mappings (#1756)
32e5a0a 
Closes #1647

---------

Co-authored-by: maciektr <maciej.tratnowiecki@swmansion.com>
@maciektr
Pass call site to macro expansion (#1749)
cb8dce3 
commit-id:206643a1

---

**Stack**:
- #1811
- #1810
- #1749 ⬅

⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*
@wawel37 @maciektr
Quote macro (#1808) (#1810)
78b125d 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Mateusz Kowalski <mateusz.kowalski@swmansion.com>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Maksim Zdobnikau
<43750648+DelevoXDG@users.noreply.github.com>

commit-id:face0a80

---

**Stack**:
- #1811
- #1810 ⬅

⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*
@maciektr
Refactor: split proc macro tests into multiple files (#1811)
4010c85 
commit-id:b0254722
@maciektr
Proc macro diagnostics Cairo update (#1881)
357703b
@maciektr @remybar @DelevoXDG
Allow renaming macro attributes (#1891)
6078a00 
Signed-off-by: maciektr <mtratnowiecki@gmail.com>
Co-authored-by: Rémy Baranx <remy.baranx@gmail.com>
Co-authored-by: Maksim Zdobnikau <43750648+DelevoXDG@users.noreply.github.com>
@maciektr
Fix quote! parsing for puncts not followed by ident & emit a whitespa…
16aedd7 
…ce preceding a quote var (#1930)
@maciektr
Pin cairo-lang-primitive-token to cairo git commit instead of registr…
852ef31 
…y dep
@maciektr
Make token stream empty and new public (#1964)
a0a1484
@DelevoXDG @maciektr
Fix #token interpolation in quote macro (#2013)
1424d4d 
Closes #1992
@maciektr
Update test cases after dev rebase
9379240
@maciektr
Remove unused ProcMacroHost
eff331b
@maciektr
Add test for token stream with null characters
3433263
@DelevoXDG
Temporarily change deps to modified cairo + others
89644b4 
- Also change cairo-lint to use updated cairo deps
- Also remove LS from root Cargo.toml
@DelevoXDG
fix: this error originates -> this diagnostic originates
d790783
@DelevoXDG
(wip) add support for warn_with_span and error_with_span
d226f37
@DelevoXDG
test
ec6df7d
@DelevoXDG
remove unnecessary note from StableDiagnostic
1edc979
@DelevoXDG
update deps
4e683a7
@DelevoXDG
Merge branch 'dev' into zdobnikau/diagnostics-with-location
400fc99
@DelevoXDG
delete post-merge leftovers
a872985
@DelevoXDG DelevoXDG changed the base branch from main to dev April 1, 2025 08:55
@DelevoXDG DelevoXDG mentioned this pull request Apr 1, 2025
Open
@maciektr
Copy link
Contributor

maciektr commented Apr 2, 2025

Please rebase on main - we don't need dev branch for now

@DelevoXDG DelevoXDG changed the base branch from dev to main April 3, 2025 02:24
@DelevoXDG DelevoXDG marked this pull request as ready for review April 3, 2025 11:54
@DelevoXDG DelevoXDG requested review from Draggu and a team as code owners April 3, 2025 11:54
maciektr
maciektr reviewed Apr 7, 2025
View reviewed changes
plugins/cairo-lang-macro/src/types/mod.rs Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

We can take inspiration from Rust, which defines an api of:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, updated.

Btw, do you think we should have test for each of those, or just one would be sufficient?

@maciektr
Copy link
Contributor

maciektr commented Apr 7, 2025

btw. this doesn't seem right 😅
image

@DelevoXDG
Copy link
Contributor Author

DelevoXDG commented Apr 8, 2025 •
edited
Loading

btw. this doesn't seem right 😅

Yeah, it looks a bit funny 😄

The reason is - I originally started this branch from dev, and later on, with all the changes (especially around the v1/v2 api), it was just way more time-efficient to merge instead of rebasing. That's why all those dev commits are still visible in the history.

Now, what can be done is:

  • I can squash everything into a single commit locally if that would make it easier for you to review
  • Or we can leave it as-is, since it'll all get squashed eventually anyway 😅

@DelevoXDG DelevoXDG requested a review from maciektr April 8, 2025 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maciektr maciektr maciektr approved these changes

@Draggu Draggu Awaiting requested review from Draggu Draggu is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@DelevoXDG @maciektr @wawel37