Skip to content

Conversation

@webdevred
Copy link
Owner

@webdevred webdevred commented Nov 16, 2025

ObjectKey & NodeCursor refactor

  • Added new helper function maybeObjectKey for extracting object-key text from ObjectKey nodes.
  • Removed applyObjCrumb; applyCrumb now uses maybeObjectKey to generate ObjectIndexAndKey breadcrumbs.
  • Updated NodeCursor and compareSB to handle the new breadcrumb structure.
  • Simplified select and findAndUpdateTextInNode logic using maybeObjectKey.
  • Updated formatting for ObjectKey nodes to no longer require special crumb logic.

ForceComplexNewLine feature

  • Introduced ForceComplexNewLine :: PropertyKey Bool in formatting rules.
  • Added forceComplexNewLine function to check this property for a NodeCursor.
  • Updated doFormatNode to respect forceComplexNewLine when formatting nodes.
  • Updated DSL parser to recognize the ForceComplexNewLine property in input files.

CommandLineOptions cleanup

  • Replaced foldl' (>>=) with foldr (=<<) when applying option actions.

@webdevred webdevred force-pushed the master branch 5 times, most recently from d0f5d6d to 386379a Compare November 17, 2025 17:57
@webdevred webdevred force-pushed the force-complex-newline-property branch 2 times, most recently from 64b7335 to 8973d84 Compare November 22, 2025 19:13
@webdevred webdevred force-pushed the force-complex-newline-property branch from 1f7b20f to 0c8e99b Compare November 22, 2025 19:44
@webdevred webdevred force-pushed the force-complex-newline-property branch from 091de22 to 5df2915 Compare November 22, 2025 22:17
This is needed because when complexChildren is False singleline comments are not terminated
- Introduced `charBoth` in `Helpers.hs` to combine two `Char -> Bool` predicates.
- Simplified `isNotFinalChar` in `Helpers.hs` using `charBoth`.
- Refactored object key parser in `DSL.hs` to use `charBoth`.
- Removed unnecessary parentheses in `Formatting.hs` for `newlineBeforeComment`.
@webdevred webdevred force-pushed the force-complex-newline-property branch from e969779 to b701f2f Compare November 23, 2025 21:24
@webdevred webdevred merged commit c54d8dd into master Nov 23, 2025
14 checks passed
@webdevred webdevred deleted the force-complex-newline-property branch November 23, 2025 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant