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.

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

Fix @inherits mapping for fuse #10985

Merged
merged 8 commits into from
Oct 9, 2024
Merged

Conversation

chsienki
Copy link
Contributor

@chsienki chsienki commented Oct 8, 2024

Fuse wasn't mapping the [type] portion of the @inherits [type] directive. We now track the [type] as a token rather than just a string, so we can also track it's source location if it came from source.

Most of the changes just come from changing it from a string type, which was almost entirely mechanical. I tried to keep the commit history clean, so it might make sense to review commit-by-commit.

Partially solves #10963

Note: the inherits directive interacts with the @model directive too. That's not yet mapped, and in order to do so I'll need to make more changes here, but the diff seemed big enough that it was worth getting this out for review as its own item.

@chsienki chsienki added area-compiler Umbrella for all compiler issues New Feature: Fuse labels Oct 8, 2024
@chsienki chsienki added this to the 17.13 P1 milestone Oct 8, 2024
@chsienki chsienki requested review from a team as code owners October 8, 2024 21:06
@davidwengier davidwengier removed the request for review from a team October 8, 2024 21:15
@chsienki
Copy link
Contributor Author

chsienki commented Oct 8, 2024

@dotnet/razor-compiler for review please :)

@chsienki
Copy link
Contributor Author

chsienki commented Oct 9, 2024

@dotnet/razor-compiler for a second review please :)

@chsienki chsienki merged commit 81d9296 into dotnet:main Oct 9, 2024
12 checks passed
@dotnet-policy-service dotnet-policy-service bot modified the milestones: 17.13 P1, Next Oct 9, 2024
chsienki added a commit to chsienki/razor-tooling that referenced this pull request Oct 18, 2024
* Make base type a token rather than a string
* Track inherits source location and emit it when present
* Add simple inherits test for components
* Add razor page inherits test
333fred added a commit to 333fred/razor that referenced this pull request Oct 23, 2024
* upstream/main: (290 commits)
  Add breaking changes document (dotnet#11064)
  Do not extract component into code block (dotnet#11069)
  Fix invalid setttings json (dotnet#11062)
  update MicrosoftSourceBuildIntermediatearcadePackageVersion
  Localized file check-in by OneLocBuild Task: Build definition ID 262: Build ID 2566512
  Localized file check-in by OneLocBuild Task: Build definition ID 262: Build ID 2566512
  Update source-build team references (dotnet#11032)
  Handle EditorRequired *Changed/*Expression parameters (dotnet#11043)
  Localized file check-in by OneLocBuild Task: Build definition ID 262: Build ID 2566213
  Localized file check-in by OneLocBuild Task: Build definition ID 262: Build ID 2566213
  Avoid ambiguous `object` reference in generic component recovery (dotnet#11053)
  Move culture info check (dotnet#11057)
  Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20241015.1
  Fix code actions integration tests
  Add option for format on paste (dotnet#11039)
  Update src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentDocumentClassifierPass.cs
  Fix merge to 17.12 version
  Update src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentDocumentClassifierPass.cs
  Ensure model directives are mapped at runtime (dotnet#11007)
  Fix @inherits mapping for fuse (dotnet#10985)
  ...
@phil-allen-msft phil-allen-msft modified the milestones: Next, 17.13 P1 Oct 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-compiler Umbrella for all compiler issues New Feature: Fuse
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants