Skip to content

Scala parser: add try/catch/finally, match, and fix complex parameter types#7260

Merged
jkschneider merged 1 commit intomainfrom
scala-try-match
Apr 2, 2026
Merged

Scala parser: add try/catch/finally, match, and fix complex parameter types#7260
jkschneider merged 1 commit intomainfrom
scala-try-match

Conversation

@jkschneider
Copy link
Copy Markdown
Member

@jkschneider jkschneider commented Apr 2, 2026

Summary

  • Map Trees.Try → J.Try with J.Try.Catch for each case clause
  • Map Trees.Match → J.Switch with J.Case for each pattern case
  • Add ScalaPrinter overrides for Scala-style try/catch and match syntax
  • Fix complex parameter types (Map[String, Any], Array[String], etc.) — no longer fall back to J.Unknown
  • Fix modifier spacing before def keyword
  • Handle Statement types in method body wrapping
  • Fix extractSource cursor issue in visitMethodParameter

Test plan

  • All 412 tests pass, zero failures
  • All 8 TryTest cases pass
  • ParameterizedType tests pass (Map, List, Array in method signatures)
  • ThrowTest.throwInMatchCase passes (match inside method body)

@jkschneider
Scala parser: add try/catch/finally and match expression support
25f748f 
- Map Trees.Try to J.Try with J.Try.Catch for each case clause
- Map Trees.Match to J.Switch with J.Case for each pattern
- Add ScalaPrinter overrides for try/catch (Scala syntax), switch/case (match syntax)
- Fix modifier spacing before def keyword (implicit def, abstract override def)
- Handle Statement types (e.g., match) in method body wrapping
- All 8 TryTest cases pass
- 1 remaining match printer formatting issue (throwInMatchCase)
@github-project-automation github-project-automation Bot moved this to In Progress in OpenRewrite Apr 2, 2026
@jkschneider jkschneider merged commit 9258932 into main Apr 2, 2026
1 check passed
@jkschneider jkschneider deleted the scala-try-match branch April 2, 2026 19:51
@github-project-automation github-project-automation Bot moved this from In Progress to Done in OpenRewrite Apr 2, 2026
@jkschneider jkschneider restored the scala-try-match branch April 2, 2026 20:13
jkschneider added a commit that referenced this pull request Apr 2, 2026
@jkschneider
Scala parser: support parameterless methods, annotated methods, remov…
251dd8a 
…e while fallback

- Parameterless methods (def name: Type) now map to J.MethodDeclaration with
  OmitBraces marker on empty param container — printer omits ()
- Annotated methods (@deprecated def ...) now map to J.MethodDeclaration with
  annotations extracted and def-modifier carrying annotation-to-def spacing
- Remove while loop fallback — while loops in method bodies handled by parser
- Remove AppliedTypeTree fallback (already fixed in #7260)
- 3 remaining fallbacks: procedure syntax, nested braces, function type params
- 5 test failures: 3 complex annotations (with args), 2 while body block whitespace
jkschneider added a commit that referenced this pull request Apr 2, 2026
@jkschneider
Scala parser: support parameterless methods, annotated methods, remov…
74fcdc3 
…e while fallback

- Parameterless methods (def name: Type) now map to J.MethodDeclaration with
  OmitBraces marker on empty param container — printer omits ()
- Annotated methods (@deprecated def ...) now map to J.MethodDeclaration with
  annotations extracted and def-modifier carrying annotation-to-def spacing
- Remove while loop fallback — while loops in method bodies handled by parser
- Remove AppliedTypeTree fallback (already fixed in #7260)
- 3 remaining fallbacks: procedure syntax, nested braces, function type params
- 5 test failures: 3 complex annotations (with args), 2 while body block whitespace
jkschneider added a commit that referenced this pull request Apr 2, 2026
@jkschneider
Scala parser: support parameterless methods, annotated methods, remov…
e3c928d 
…e while fallback

- Parameterless methods (def name: Type) now map to J.MethodDeclaration with
  OmitBraces marker on empty param container — printer omits ()
- Annotated methods (@deprecated def ...) now map to J.MethodDeclaration with
  annotations extracted and def-modifier carrying annotation-to-def spacing
- Remove while loop fallback — while loops in method bodies handled by parser
- Remove AppliedTypeTree fallback (already fixed in #7260)
- 3 remaining fallbacks: procedure syntax, nested braces, function type params
- 5 test failures: 3 complex annotations (with args), 2 while body block whitespace
jkschneider added a commit that referenced this pull request Apr 2, 2026
@jkschneider
Scala parser: support parameterless methods, annotated methods, remov…
022f9d2 
…e while fallback

- Parameterless methods (def name: Type) now map to J.MethodDeclaration with
  OmitBraces marker on empty param container — printer omits ()
- Annotated methods (@deprecated def ...) now map to J.MethodDeclaration with
  annotations extracted and def-modifier carrying annotation-to-def spacing
- Remove while loop fallback — while loops in method bodies handled by parser
- Remove AppliedTypeTree fallback (already fixed in #7260)
- 3 remaining fallbacks: procedure syntax, nested braces, function type params
- 5 test failures: 3 complex annotations (with args), 2 while body block whitespace
jkschneider added a commit that referenced this pull request Apr 2, 2026
@jkschneider
Scala parser: support parameterless methods, annotated methods, remov…
6b749e3 
…e while fallback

- Parameterless methods (def name: Type) now map to J.MethodDeclaration with
  OmitBraces marker on empty param container — printer omits ()
- Annotated methods (@deprecated def ...) now map to J.MethodDeclaration with
  annotations extracted and def-modifier carrying annotation-to-def spacing
- Remove while loop fallback — while loops in method bodies handled by parser
- Remove AppliedTypeTree fallback (already fixed in #7260)
- 3 remaining fallbacks: procedure syntax, nested braces, function type params
- 5 test failures: 3 complex annotations (with args), 2 while body block whitespace
jkschneider added a commit that referenced this pull request Apr 2, 2026
@jkschneider
Scala parser: support parameterless methods, annotated methods, remov…
72e9e01 
…e while fallback

- Parameterless methods (def name: Type) now map to J.MethodDeclaration with
  OmitBraces marker on empty param container — printer omits ()
- Annotated methods (@deprecated def ...) now map to J.MethodDeclaration with
  annotations extracted and def-modifier carrying annotation-to-def spacing
- Remove while loop fallback — while loops in method bodies handled by parser
- Remove AppliedTypeTree fallback (already fixed in #7260)
- 3 remaining fallbacks: procedure syntax, nested braces, function type params
- 5 test failures: 3 complex annotations (with args), 2 while body block whitespace
timtebeek added a commit that referenced this pull request Apr 6, 2026
@timtebeek
Handle untpd.ParsedTry in Scala 3 parser
e0f99a7 
The Scala 3 compiler uses two different AST representations for
try/catch/finally: `Trees.Try` (typed/desugared) and `untpd.ParsedTry`
(untyped/parsed). PR #7260 added handling for `Trees.Try` but
`ParsedTry` was falling through to `visitUnknown` since it extends
`Trees.Tree` directly and not `Trees.Try`.

Add `visitParsedTry`/`visitParsedTryImpl` to handle `ParsedTry` by
extracting cases from its `handler` (a `Match` tree) and mapping them
to `J.Try` AST nodes. Update `ScalaPrinter` to use AST-stored spacing
for catch block formatting.
@timtebeek timtebeek mentioned this pull request Apr 6, 2026
Closed
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@jkschneider jkschneider

Labels

None yet

Projects

OpenRewrite
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@jkschneider
⚡