Skip to content

Associate comments without newline before with prior node #56

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

Merged
webdevred merged 13 commits into from
Sep 21, 2025
Merged

Associate comments without newline before with prior node #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c360062
Generalize helper and update DLS:hs
webdevred Sep 21, 2025
d1d517a
We can now associate comments on the same line as node to that node
webdevred Sep 21, 2025
3c26f65
Formatting consistent with new parsing behaviour
webdevred Sep 21, 2025
c401a4e
Clarity changes in Formatting.hs
webdevred Sep 21, 2025
fa26d95
Extracted is space check to separate function
webdevred Sep 21, 2025
1174d08
Simplified FormattingSpec.hs
webdevred Sep 21, 2025
936f7fe
Fix compilation errs in Transformation due to Comment changes
webdevred Sep 21, 2025
5da6135
Place associated comments after vertex nodes
webdevred Sep 21, 2025
7b998f9
Fix
webdevred Sep 21, 2025
eccf7d1
Updated AST dumps
webdevred Sep 21, 2025
3059fc4
Made tests compile
webdevred Sep 21, 2025
812f0f2
Formatting fix in Parsing/Jbeam.hs
webdevred Sep 21, 2025
27b2db9
Test for the comment assocation
webdevred Sep 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions examples/ast/jbeam/fender.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ Object
( InternalComment
{ cText = "Left side"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -151,6 +152,7 @@ Object
( InternalComment
{ cText = "Right side"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -251,6 +253,7 @@ Object
( InternalComment
{ cText = "Support nodes"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -305,6 +308,7 @@ Object
( InternalComment
{ cText = "Structural beams"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -345,6 +349,7 @@ Object
( InternalComment
{ cText = "Front"
, cMultiline = False
, assocWithPrior = False
}
)
, Array
Expand Down Expand Up @@ -399,6 +404,7 @@ Object
( InternalComment
{ cText = "Middle"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -427,6 +433,7 @@ Object
( InternalComment
{ cText = "Rear"
, cMultiline = False
, assocWithPrior = False
}
)
, Array
Expand Down Expand Up @@ -489,6 +496,7 @@ Object
( InternalComment
{ cText = "Crossing beams"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand All @@ -501,6 +509,7 @@ Object
( InternalComment
{ cText = "Front"
, cMultiline = False
, assocWithPrior = False
}
)
, Array
Expand Down Expand Up @@ -539,6 +548,7 @@ Object
( InternalComment
{ cText = "Rear"
, cMultiline = False
, assocWithPrior = False
}
)
, Array
Expand Down Expand Up @@ -577,6 +587,7 @@ Object
( InternalComment
{ cText = "Support beams"
, cMultiline = False
, assocWithPrior = False
}
)
, Array
Expand Down Expand Up @@ -671,6 +682,7 @@ Object
( InternalComment
{ cText = "Front rigid"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand All @@ -693,6 +705,7 @@ Object
( InternalComment
{ cText = "Left side"
, cMultiline = False
, assocWithPrior = False
}
)
, Array
Expand All @@ -707,6 +720,7 @@ Object
( InternalComment
{ cText = "Right side"
, cMultiline = False
, assocWithPrior = False
}
)
, Array
Expand All @@ -721,6 +735,7 @@ Object
( InternalComment
{ cText = "Attachment beams"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -757,18 +772,21 @@ Object
( InternalComment
{ cText = "Frame"
, cMultiline = False
, assocWithPrior = False
}
)
, Comment
( InternalComment
{ cText = "Left side"
, cMultiline = False
, assocWithPrior = False
}
)
, Comment
( InternalComment
{ cText = "Front"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -811,6 +829,7 @@ Object
( InternalComment
{ cText = "Middle"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -853,6 +872,7 @@ Object
( InternalComment
{ cText = "Rear"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -917,12 +937,14 @@ Object
( InternalComment
{ cText = "Right side"
, cMultiline = False
, assocWithPrior = False
}
)
, Comment
( InternalComment
{ cText = "Front"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -975,6 +997,7 @@ Object
( InternalComment
{ cText = "Middle"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -1017,6 +1040,7 @@ Object
( InternalComment
{ cText = "Rear"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -1091,12 +1115,14 @@ Object
( InternalComment
{ cText = "Body"
, cMultiline = False
, assocWithPrior = False
}
)
, Comment
( InternalComment
{ cText = "Left side"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand All @@ -1121,6 +1147,7 @@ Object
( InternalComment
{ cText = "Right side"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down
16 changes: 16 additions & 0 deletions examples/ast/jbeam/suspension.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Object
( InternalComment
{ cText = "--Nodes--"
, cMultiline = False
, assocWithPrior = False
}
)
, ObjectKey
Expand Down Expand Up @@ -424,6 +425,7 @@ Object
( InternalComment
{ cText = "--Beams--"
, cMultiline = False
, assocWithPrior = False
}
)
, ObjectKey
Expand All @@ -437,6 +439,7 @@ Object
( InternalComment
{ cText = "Structural beams"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand All @@ -463,6 +466,7 @@ Object
( InternalComment
{ cText = "Front end"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -571,6 +575,7 @@ Object
( InternalComment
{ cText = "Middle"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -715,6 +720,7 @@ Object
( InternalComment
{ cText = "Rear end"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -863,12 +869,14 @@ Object
( InternalComment
{ cText = "Crossing beams"
, cMultiline = False
, assocWithPrior = False
}
)
, Comment
( InternalComment
{ cText = "Front end"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -945,6 +953,7 @@ Object
( InternalComment
{ cText = "Middle"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -1053,6 +1062,7 @@ Object
( InternalComment
{ cText = "Rear end"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -1161,12 +1171,14 @@ Object
( InternalComment
{ cText = "Support beams"
, cMultiline = False
, assocWithPrior = False
}
)
, Comment
( InternalComment
{ cText = "Front end"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -1235,6 +1247,7 @@ Object
( InternalComment
{ cText = "Middle"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -1319,6 +1332,7 @@ Object
( InternalComment
{ cText = "Rear end"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand Down Expand Up @@ -1395,6 +1409,7 @@ Object
( InternalComment
{ cText = "Front crush"
, cMultiline = False
, assocWithPrior = False
}
)
, Object
Expand All @@ -1417,6 +1432,7 @@ Object
( InternalComment
{ cText = "--Collision Triangles--"
, cMultiline = False
, assocWithPrior = False
}
)
, ObjectKey
Expand Down
1 change: 0 additions & 1 deletion jbeam-edit.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ test-suite jbeam-edit-test
FormattingSpec
Parsing.DSLSpec
Parsing.JbeamSpec
Parsing.ParsingTestHelpers
SpecHelper
TransformationSpec
Paths_jbeam_edit
Expand Down
Loading
Loading