on master help sign in
569 files changed+8609−3952
since splitsnapshots
unifiedsplit
.buildkite/pipeline.yml+18 .circleci/config.yml−44 .github/workflows/binaries.yml+39 .github/workflows/build.sh+7 .gitignore+1 CHANGELOG.md+231 CONTRIBUTING.md+6−1 DESIGN.md+24−21 README.md+97−29 app/Main.hs+133−95 data/examples/declaration/annotation/annotation-out.hs+4−3 data/examples/declaration/class/associated-data1-out.hs−1 data/examples/declaration/class/associated-data2-out.hs+2−1 data/examples/declaration/class/associated-data2.hs+2 data/examples/declaration/class/associated-type-defaults-out.hs−2 data/examples/declaration/class/associated-types1-out.hs−1 data/examples/declaration/class/associated-types2-out.hs+2−1 data/examples/declaration/class/associated-types2.hs+2 data/examples/declaration/class/default-implementations-comments-out.hs+7−6 data/examples/declaration/class/default-implementations-comments.hs+2 data/examples/declaration/class/default-implementations-out.hs+5−3 data/examples/declaration/class/default-implementations.hs+2−1 data/examples/declaration/class/default-signatures-out.hs+13−13 data/examples/declaration/class/default-signatures-simple-out.hs+2−2 data/examples/declaration/class/default-signatures-simple.hs+2−1 data/examples/declaration/class/default-signatures.hs+2 data/examples/declaration/class/dependency-super-classes-out.hs+11−11 data/examples/declaration/class/dependency-super-classes.hs+2 data/examples/declaration/class/empty-classes-out.hs+2 data/examples/declaration/class/empty-classes.hs+2 data/examples/declaration/class/functional-dependencies-out.hs+4−1 data/examples/declaration/class/functional-dependencies.hs+2 data/examples/declaration/class/multi-parameters1-out.hs+5−5 data/examples/declaration/class/multi-parameters2-out.hs+9−8 data/examples/declaration/class/multi-parameters2.hs+2 data/examples/declaration/class/newlines-after-where-out.hs+5 data/examples/declaration/class/newlines-after-where.hs+7 data/examples/declaration/class/newlines-and-default-decls-out.hs+11 data/examples/declaration/class/newlines-and-default-decls.hs+13 data/examples/declaration/class/newlines-and-haddocks-out.hs+23 data/examples/declaration/class/newlines-and-haddocks.hs+19 data/examples/declaration/class/newlines-between-methods-out.hs+17 data/examples/declaration/class/newlines-between-methods.hs+15 data/examples/declaration/class/poly-kinded-classes-out.hs+3−3 data/examples/declaration/class/single-parameters-out.hs+13−10 data/examples/declaration/class/single-parameters.hs+2 data/examples/declaration/class/super-classes-out.hs+4−4 data/examples/declaration/class/type-operators1-out.hs+1−1 data/examples/declaration/class/type-operators2-out.hs+1−1 data/examples/declaration/class/type-operators3-out.hs+10 data/examples/declaration/class/type-operators3.hs+7 data/examples/declaration/data/deriving-strategies-out.hs+3−1 data/examples/declaration/data/deriving-strategies.hs+2 data/examples/declaration/data/existential-multiline-out.hs+12 data/examples/declaration/data/existential-multiline.hs+7 data/examples/declaration/data/existential-out.hs+2 data/examples/declaration/data/existential.hs+2 data/examples/declaration/data/fat-multiline-out.hs+6−4 data/examples/declaration/data/fat-multiline.hs+2 data/examples/declaration/data/field-layout/gadt-out.hs+11 data/examples/declaration/data/field-layout/gadt.hs+10 data/examples/declaration/data/field-layout/record-out.hs+12 data/examples/declaration/data/field-layout/record.hs+11 data/examples/declaration/data/field-layout/variants-out.hs+10 data/examples/declaration/data/field-layout/variants.hs+10 data/examples/declaration/data/gadt-syntax-out.hs+2−1 data/examples/declaration/data/gadt-syntax.hs+1−1 data/examples/declaration/data/gadt/multiline-out.hs+17−13 data/examples/declaration/data/gadt/multiline-where-out.hs+7 data/examples/declaration/data/gadt/multiline-where.hs+6 data/examples/declaration/data/gadt/multiline.hs+2 data/examples/declaration/data/gadt/multiple-declaration-out.hs+6−6 data/examples/declaration/data/gadt/record-out.hs+11−9 data/examples/declaration/data/gadt/record.hs+2 data/examples/declaration/data/gadt/simple-out.hs+12−2 data/examples/declaration/data/gadt/simple.hs+2 data/examples/declaration/data/gadt/strictness-out.hs+2−1 data/examples/declaration/data/gadt/strictness.hs+2−1 data/examples/declaration/data/kind-annotations-out.hs+8 data/examples/declaration/data/kind-annotations.hs+7 data/examples/declaration/data/multiline-arg-parens-out.hs+3−1 data/examples/declaration/data/multiline-arg-parens.hs+2 data/examples/declaration/data/multiline-names-out.hs+2−2 data/examples/declaration/data/multiline-out.hs+8−3 data/examples/declaration/data/multiline.hs+2 data/examples/declaration/data/newtype-out.hs+2 data/examples/declaration/data/newtype.hs+2 data/examples/declaration/data/operators-out.hs+12 data/examples/declaration/data/operators.hs+12 data/examples/declaration/data/partly-documented-out.hs+5 data/examples/declaration/data/partly-documented.hs+2 data/examples/declaration/data/record-multi-const-out.hs+17 data/examples/declaration/data/record-multi-const.hs+13 data/examples/declaration/data/record-out.hs+21−16 data/examples/declaration/data/record-singleline-out.hs+2 data/examples/declaration/data/record-singleline.hs+2 data/examples/declaration/data/record.hs+2 data/examples/declaration/data/simple-broken-out.hs+3−2 data/examples/declaration/data/simple-broken.hs+2 data/examples/declaration/data/simple-out.hs+2 data/examples/declaration/data/simple.hs+2 data/examples/declaration/data/strictness-out.hs+5−1 data/examples/declaration/data/strictness.hs+5−1 data/examples/declaration/data/unnamed-field-comment-0-out.hs+7 data/examples/declaration/data/unnamed-field-comment-0.hs+5 data/examples/declaration/data/unnamed-field-comment-1-out.hs+5 data/examples/declaration/data/unnamed-field-comment-1.hs+4 data/examples/declaration/data/with-comment-out.hs+4 data/examples/declaration/data/with-comment.hs+5 data/examples/declaration/data/with-weird-haddock-out.hs+4 data/examples/declaration/data/with-weird-haddock.hs+2 data/examples/declaration/default/default-out.hs+1−1 data/examples/declaration/foreign/foreign-export-out.hs+2−1 data/examples/declaration/foreign/foreign-import-out.hs+10−10 data/examples/declaration/instance/associated-data-out.hs−2 data/examples/declaration/instance/associated-data.hs+1 data/examples/declaration/instance/associated-types-out.hs−1 data/examples/declaration/instance/associated-types.hs+2 data/examples/declaration/instance/contexts-comments-out.hs+8−8 data/examples/declaration/instance/contexts-out.hs+7−7 data/examples/declaration/instance/data-family-instances-gadt-out.hs+8−6 data/examples/declaration/instance/data-family-instances-newtype-out.hs+3−4 data/examples/declaration/instance/data-family-instances-out.hs+2−2 data/examples/declaration/instance/instance-sigs-multiple-out.hs+5−7 data/examples/declaration/instance/instance-sigs-out.hs+4−4 data/examples/declaration/instance/multi-parameter-out.hs−2 data/examples/declaration/instance/newlines-after-where-out.hs+5 data/examples/declaration/instance/newlines-after-where.hs+7 data/examples/declaration/instance/newlines-between-methods-out.hs+18 data/examples/declaration/instance/newlines-between-methods.hs+16 data/examples/declaration/instance/single-parameter-out.hs−2 data/examples/declaration/instance/type-family-instances-out.hs+2−2 data/examples/declaration/rewrite-rule/basic1-out.hs+2−1 data/examples/declaration/rewrite-rule/forall-out.hs → data/examples/declaration/rewrite-rule/forall-0-out.hs data/examples/declaration/rewrite-rule/forall.hs → data/examples/declaration/rewrite-rule/forall-0.hs data/examples/declaration/rewrite-rule/forall-1-out.hs+23 data/examples/declaration/rewrite-rule/forall-1.hs+17 data/examples/declaration/rewrite-rule/phase-out.hs+4−2 data/examples/declaration/rewrite-rule/prelude2-out.hs+1 data/examples/declaration/rewrite-rule/prelude2.hs−1 data/examples/declaration/rewrite-rule/type-signature-out.hs+6−5 data/examples/declaration/signature/complete/complete-out.hs+2−2 data/examples/declaration/signature/inline/inline-out.hs+4 data/examples/declaration/signature/inline/inline.hs+5 data/examples/declaration/signature/minimal/minimal-out.hs+1−3 data/examples/declaration/signature/pattern/multiline-out.hs+9−9 data/examples/declaration/signature/specialize/specialize-instance-out.hs+1−5 data/examples/declaration/signature/specialize/specialize-out.hs+6−6 data/examples/declaration/signature/standalone-kind-out.hs+13 data/examples/declaration/signature/standalone-kind.hs+13 data/examples/declaration/signature/type/arguments-out.hs+14−13 data/examples/declaration/signature/type/context-multi-line-out.hs+10−10 data/examples/declaration/signature/type/context-single-line-out.hs+7−7 data/examples/declaration/signature/type/infix-promoted-type-constructor-out.hs−1 data/examples/declaration/signature/type/long-function-name-out.hs+6−6 data/examples/declaration/signature/type/long-multiline-applications-out.hs+16−15 data/examples/declaration/signature/type/long-multiline-applications.hs+2−1 data/examples/declaration/signature/type/multi-value-out.hs+7−2 data/examples/declaration/signature/type/multi-value.hs+5 data/examples/declaration/signature/type/unrelated-out.hs+4 data/examples/declaration/signature/type/unrelated.hs+4 data/examples/declaration/splice/bracket-declaration-out.hs+1−1 data/examples/declaration/splice/grouped-splices-out.hs+3 data/examples/declaration/splice/grouped-splices.hs+3 data/examples/declaration/splice/splice-decl.hs−1 data/examples/declaration/splice/typed-splice-out.hs+1−1 data/examples/declaration/splice/untyped-splice-out.hs+1−1 data/examples/declaration/type-families/closed-type-family/multi-line-out.hs+9−8 data/examples/declaration/type-families/closed-type-family/simple-out.hs+2 data/examples/declaration/type-families/closed-type-family/simple.hs+2 data/examples/declaration/type-families/closed-type-family/with-equal-sign-out.hs+2 data/examples/declaration/type-families/closed-type-family/with-equal-sign.hs+2 data/examples/declaration/type-families/closed-type-family/with-forall-out.hs+3 data/examples/declaration/type-families/closed-type-family/with-forall.hs+3 data/examples/declaration/type-families/data-family/no-annotation-out.hs+2 data/examples/declaration/type-families/data-family/no-annotation.hs+2 data/examples/declaration/type-families/data-family/simple-out.hs+2 data/examples/declaration/type-families/data-family/simple.hs+2 data/examples/declaration/type-families/type-family/no-annotation-out.hs+2 data/examples/declaration/type-families/type-family/no-annotation.hs+2 data/examples/declaration/type-families/type-family/operator-out.hs+3 data/examples/declaration/type-families/type-family/operator.hs+2 data/examples/declaration/type-families/type-family/simple-out.hs+2 data/examples/declaration/type-families/type-family/simple.hs+2 data/examples/declaration/type-synonyms/multi-line-out.hs+12−15 data/examples/declaration/type-synonyms/multi-line.hs−3 data/examples/declaration/type-synonyms/simple-out.hs+2 data/examples/declaration/type-synonyms/simple.hs+2 data/examples/declaration/type-synonyms/with-weird-haddock-out.hs+3 data/examples/declaration/type-synonyms/with-weird-haddock.hs+1 data/examples/declaration/type/forall-out.hs+4 data/examples/declaration/type/forall.hs+4 data/examples/declaration/type/lits-out.hs+6 data/examples/declaration/type/lits.hs+4 data/examples/declaration/type/type-applications-out.hs+3 data/examples/declaration/type/type-applications.hs+3 data/examples/declaration/type/visible-forall-out.hs+2 data/examples/declaration/type/visible-forall.hs+2 data/examples/declaration/value/function/application-0-out.hs+17 data/examples/declaration/value/function/application-0.hs+12 data/examples/declaration/value/function/application-1-out.hs+19 data/examples/declaration/value/function/application-1.hs+14 data/examples/declaration/value/function/arg-breakpoints-out.hs+3 data/examples/declaration/value/function/arg-breakpoints.hs+3 data/examples/declaration/value/function/arithmetic-sequences-out.hs+2−2 data/examples/declaration/value/function/arrow/expression-applications-out.hs−9 data/examples/declaration/value/function/arrow/expression-applications.hs−9 data/examples/declaration/value/function/arrow/expression-forms-out.hs−13 data/examples/declaration/value/function/arrow/expression-forms.hs−11 data/examples/declaration/value/function/arrow/multiline-case-out.hs+8 data/examples/declaration/value/function/arrow/multiline-case.hs+7 data/examples/declaration/value/function/arrow/proc-applications-out.hs+5−4 data/examples/declaration/value/function/arrow/proc-do-complex-out.hs+27−26 data/examples/declaration/value/function/arrow/proc-do-simple1-out.hs+3−2 data/examples/declaration/value/function/arrow/proc-do-simple2-out.hs+8−6 data/examples/declaration/value/function/arrow/proc-forms1-out.hs+16−13 data/examples/declaration/value/function/arrow/proc-forms2-out.hs+11−7 data/examples/declaration/value/function/arrow/proc-forms2.hs+6−6 data/examples/declaration/value/function/arrow/proc-ifs-out.hs+9−7 data/examples/declaration/value/function/arrow/proc-lets-out.hs+1−1 data/examples/declaration/value/function/arrow/proc-parentheses-out.hs+6−5 data/examples/declaration/value/function/arrow/recursive-procs-out.hs+13−9 data/examples/declaration/value/function/awkward-comment-0-out.hs+6 data/examples/declaration/value/function/awkward-comment-0.hs+5 data/examples/declaration/value/function/awkward-comment-1-out.hs+9 data/examples/declaration/value/function/awkward-comment-1.hs+7 data/examples/declaration/value/function/blank-lines-let-out.hs+6 data/examples/declaration/value/function/blank-lines-let.hs+9 data/examples/declaration/value/function/blank-lines-where-out.hs+6 data/examples/declaration/value/function/blank-lines-where.hs+7 data/examples/declaration/value/function/block-arguments-out.hs+14−10 data/examples/declaration/value/function/block-arguments.hs+7 data/examples/declaration/value/function/case-multi-line-guards-out.hs+4−2 data/examples/declaration/value/function/case-multi-line-guards.hs+3 data/examples/declaration/value/function/complex-list-out.hs+2−2 data/examples/declaration/value/function/comprehension/transform-multi-line1-out.hs+5−4 data/examples/declaration/value/function/comprehension/transform-multi-line2-out.hs+6−5 data/examples/declaration/value/function/comprehension/transform-multi-line3-out.hs+5−4 data/examples/declaration/value/function/comprehension/transform-multi-line3.hs−1 data/examples/declaration/value/function/comprehension/transform-multi-line4-out.hs+7−6 data/examples/declaration/value/function/do/applications-and-parens-out.hs+9 data/examples/declaration/value/function/do/applications-and-parens.hs+6 data/examples/declaration/value/function/do/blocks-out.hs+1 data/examples/declaration/value/function/do/comment-alignment-out.hs+9 data/examples/declaration/value/function/do/comment-alignment.hs+9 data/examples/declaration/value/function/do/comment-spacing-out.hs+7 data/examples/declaration/value/function/do/comment-spacing.hs+7 data/examples/declaration/value/function/do/expr.hs−1 data/examples/declaration/value/function/do/hang-rhs-arrow-out.hs+9 data/examples/declaration/value/function/do/hang-rhs-arrow.hs+9 data/examples/declaration/value/function/do/hanging-out.hs data/examples/declaration/value/function/do/hanging.hs data/examples/declaration/value/function/do/operator-and-parens-out.hs+7 data/examples/declaration/value/function/do/operator-and-parens.hs+7 data/examples/declaration/value/function/do/recursive-do-rec-out.hs+5 data/examples/declaration/value/function/explicit-type-out.hs+2−2 data/examples/declaration/value/function/fancy-forall-0-out.hs+10 data/examples/declaration/value/function/fancy-forall-0.hs+6 data/examples/declaration/value/function/fancy-forall-1-out.hs+10 data/examples/declaration/value/function/fancy-forall-1.hs+6 data/examples/declaration/value/function/if-with-comment-out.hs+8 data/examples/declaration/value/function/if-with-comment.hs+8 data/examples/declaration/value/function/implicit-params-out.hs+8−7 data/examples/declaration/value/function/implicit-params.hs+2 data/examples/declaration/value/function/infix/applicative.hs−2 data/examples/declaration/value/function/infix/comments-out.hs+3−5 data/examples/declaration/value/function/infix/dollar-chains-out.hs+22 data/examples/declaration/value/function/infix/dollar-chains.hs+22 data/examples/declaration/value/function/infix/hanging-out.hs+7−6 data/examples/declaration/value/function/infix/lenses-out.hs+20−10 data/examples/declaration/value/function/infix/lenses.hs+9 data/examples/declaration/value/function/lambda-multi-line1-out.hs+3−3 data/examples/declaration/value/function/lambda-multi-line2-out.hs+4−4 data/examples/declaration/value/function/lambda-single-line-out.hs+2 data/examples/declaration/value/function/lambda-single-line.hs+2 data/examples/declaration/value/function/let-multi-line-out.hs+3−3 data/examples/declaration/value/function/let-single-line-out.hs−1 data/examples/declaration/value/function/list-comprehensions-out.hs+3−4 data/examples/declaration/value/function/list-notation-0-out.hs+5 data/examples/declaration/value/function/list-notation-0.hs+5 data/examples/declaration/value/function/list-notation-1-out.hs+8 data/examples/declaration/value/function/list-notation-1.hs+7 data/examples/declaration/value/function/list-notation-2-out.hs+6 data/examples/declaration/value/function/list-notation-2.hs+5 data/examples/declaration/value/function/list-notation-3-out.hs+12 data/examples/declaration/value/function/list-notation-3.hs+10 data/examples/declaration/value/function/multi-way-if-out.hs+10−4 data/examples/declaration/value/function/multi-way-if.hs+5 data/examples/declaration/value/function/operator-comments-out.hs → data/examples/declaration/value/function/operator-comments-0-out.hs+2−2 data/examples/declaration/value/function/operator-comments.hs → data/examples/declaration/value/function/operator-comments-0.hs data/examples/declaration/value/function/operator-comments-1-out.hs+16 data/examples/declaration/value/function/operator-comments-1.hs+17 data/examples/declaration/value/function/operator-comments-2-out.hs+5 data/examples/declaration/value/function/operator-comments-2.hs+4 data/examples/declaration/value/function/operator-sections-out.hs+2−2 data/examples/declaration/value/function/operators-0-out.hs+5 data/examples/declaration/value/function/operators-0.hs+4 data/examples/declaration/value/function/operators-1-out.hs+4 data/examples/declaration/value/function/operators-1.hs+3 data/examples/declaration/value/function/operators-2-out.hs+4 data/examples/declaration/value/function/operators-2.hs+4 data/examples/declaration/value/function/operators-3-out.hs+3 data/examples/declaration/value/function/operators-3.hs+3 data/examples/declaration/value/function/operators-4-out.hs+3 data/examples/declaration/value/function/operators-4.hs+3 data/examples/declaration/value/function/operators-5-out.hs+5 data/examples/declaration/value/function/operators-5.hs+4 data/examples/declaration/value/function/operators-6-out.hs+9 data/examples/declaration/value/function/operators-6.hs+7 data/examples/declaration/value/function/overindentation-out.hs+11 data/examples/declaration/value/function/overindentation.hs+9 data/examples/declaration/value/function/parallel-comprehensions-complex-out.hs+2−2 data/examples/declaration/value/function/parens-out.hs+1 data/examples/declaration/value/function/parens.hs+1 data/examples/declaration/value/function/pattern/famous-cardano-pattern-out.hs+8−8 data/examples/declaration/value/function/pattern/multiline-case-pattern-out.hs+2−2 data/examples/declaration/value/function/pattern/record-patterns-out.hs+1−1 data/examples/declaration/value/function/pattern/sig-pattern-out.hs+2−2 data/examples/declaration/value/function/pattern/splice-pattern-out.hs+2−2 data/examples/declaration/value/function/pattern/strictness-out.hs+2 data/examples/declaration/value/function/pattern/strictness.hs+2 data/examples/declaration/value/function/pattern/unboxed-sum-pattern-out.hs+5−3 data/examples/declaration/value/function/pattern/view-pattern-out.hs−3 data/examples/declaration/value/function/pattern/view-pattern.hs−3 data/examples/declaration/value/function/record-constructors-out.hs−26 data/examples/declaration/value/function/record/constructors-out.hs+31 data/examples/declaration/value/function/record-constructors.hs → data/examples/declaration/value/function/record/constructors.hs+1−1 data/examples/declaration/value/function/record/dot-out.hs+15 data/examples/declaration/value/function/record/dot.hs+14 data/examples/declaration/value/function/record/hanging-after-equal-con-out.hs+8 data/examples/declaration/value/function/record/hanging-after-equal-con.hs+7 data/examples/declaration/value/function/record/hanging-after-equal-update-out.hs+8 data/examples/declaration/value/function/record/hanging-after-equal-update.hs+7 data/examples/declaration/value/function/record/inter-comments-out.hs+13 data/examples/declaration/value/function/record/inter-comments.hs+11 data/examples/declaration/value/function/record-updaters-out.hs → data/examples/declaration/value/function/record/updaters-out.hs+3−1 data/examples/declaration/value/function/record-updaters.hs → data/examples/declaration/value/function/record/updaters.hs+1 data/examples/declaration/value/function/record-wildcards-out.hs → data/examples/declaration/value/function/record/wildcards-out.hs+6−5 data/examples/declaration/value/function/record-wildcards.hs → data/examples/declaration/value/function/record/wildcards.hs data/examples/declaration/value/function/static-pointers-out.hs+4−3 data/examples/declaration/value/function/strings-out.hs+10 data/examples/declaration/value/function/strings.hs+7 data/examples/declaration/value/function/tricky-parens-out.hs+1−1 data/examples/declaration/value/function/tuples-out.hs+2−2 data/examples/declaration/value/function/type-applications-and-splice-out.hs+4 data/examples/declaration/value/function/type-applications-and-splice.hs+4 data/examples/declaration/value/function/type-applications-out.hs+6 data/examples/declaration/value/function/type-applications.hs+5 data/examples/declaration/value/function/typed-expressions-out.hs+2−2 data/examples/declaration/value/function/unboxed-sums-out.hs+3−2 data/examples/declaration/value/function/unboxed-tuples-out.hs+5−4 data/examples/declaration/value/function/where-nested.hs−1 data/examples/declaration/value/other/comments-get-before-op-out.hs+1−1 data/examples/declaration/value/other/line-multi-line-out.hs+1−1 data/examples/declaration/value/pattern-synonyms/bidirectional-out.hs+14−14 data/examples/declaration/value/pattern-synonyms/explicitely-bidirectional-out.hs+8−8 data/examples/declaration/value/pattern-synonyms/unidirectional-out.hs+8−8 data/examples/declaration/warning/warning-multiline-out.hs+1−1 data/examples/import/comments-inside-imports-out.hs+7 data/examples/import/comments-inside-imports.hs+9 data/examples/import/deduplication-bug-out.hs+6 data/examples/import/deduplication-bug.hs+6 data/examples/import/explicit-imports-out.hs+6−6 data/examples/import/explicit-imports-with-comments-out.hs+4−3 data/examples/import/merging-0-out.hs+3 data/examples/import/merging-0.hs+4 data/examples/import/merging-1-out.hs+2 data/examples/import/merging-1.hs+3 data/examples/import/merging-2-out.hs+2 data/examples/import/merging-2.hs+4 data/examples/import/misc-out.hs+1−7 data/examples/import/nested-explicit-imports-out.hs+8−8 data/examples/import/qualified-post-out.hs+5 data/examples/import/qualified-post.hs+5 data/examples/import/qualified-prelude-out.hs+1−1 data/examples/import/simple-out.hs+2−3 data/examples/import/simple.hs+2 data/examples/import/sorted-export-list-out.hs+1 data/examples/import/sorted-export-list.hs+1 data/examples/module-header/double-dot-with-names-out.hs+1−6 data/examples/module-header/leading-empty-line-out.hs+11 data/examples/module-header/leading-empty-line.hs+11 data/examples/module-header/multiline-out.hs+2−2 data/examples/module-header/multiline-with-comments-out.hs+3−2 data/examples/module-header/multiline2-out.hs+2−2 data/examples/module-header/multiline2.hs+2−2 data/examples/module-header/named-section-out.hs+13 data/examples/module-header/named-section.hs+13 data/examples/module-header/preceding-comment-with-haddock-out.hs+8 data/examples/module-header/preceding-comment-with-haddock.hs+8 data/examples/module-header/shebang-out.hs+6 data/examples/module-header/shebang-with-pragmas-out.hs+5 data/examples/module-header/shebang-with-pragmas.hs+5 data/examples/module-header/shebang.hs+6 data/examples/module-header/singleline-empty-out.hs+1−4 data/examples/module-header/stack-header-0-out.hs+7 data/examples/module-header/stack-header-0.hs+4 data/examples/module-header/stack-header-1-out.hs+8 data/examples/module-header/stack-header-1.hs+5 data/examples/module-header/stack-header-2-out.hs+12 data/examples/module-header/stack-header-2.hs+12 data/examples/module-header/warning-pragma-list-multiline-out.hs+3−3 data/examples/module-header/warning-pragma-multiline-out.hs+1−4 data/examples/module-header/warning-pragma-out.hs+3−1 data/examples/other/argument-comment-out.hs+14−12 data/examples/other/comment-after-preceding-haddock-out.hs+12 data/examples/other/comment-after-preceding-haddock.hs+12 data/examples/other/comment-alignment-out.hs+4−4 data/examples/other/comment-before-hanging-out.hs+5 data/examples/other/comment-before-hanging.hs+5 data/examples/other/comment-following-preceding-gap-out.hs+6 data/examples/other/comment-following-preceding-gap.hs+6 data/examples/other/comment-glued-together-out.hs+7 data/examples/other/comment-glued-together.hs+6 data/examples/other/comment-inside-construct-out.hs+2−2 data/examples/other/comment-multiline-after-out.hs+7 data/examples/other/comment-multiline-after.hs+1 data/examples/other/comment-style-transform-out.hs+17 data/examples/other/comment-style-transform.hs+22 data/examples/other/comment-trailing-space-out.hs+9 data/examples/other/comment-trailing-space.hs+9 data/examples/other/comment-two-blocks-out.hs+8 data/examples/other/comment-two-blocks.hs+9 data/examples/other/consequetive-pipe-comments-out.hs+7 data/examples/other/consequetive-pipe-comments.hs+8 data/examples/other/cpp/continuation-out.hs+8 data/examples/other/cpp/continuation.hs+8 data/examples/other/cpp/lonely-hash-out.hs+14 data/examples/other/cpp/lonely-hash.hs+14 data/examples/other/cpp/separation-0a-out.hs+7 data/examples/other/cpp/separation-0a.hs+6 data/examples/other/cpp/separation-0b-out.hs+10 data/examples/other/cpp/separation-0b.hs+9 data/examples/other/cpp/separation-1a-out.hs+12 data/examples/other/cpp/separation-1a.hs+11 data/examples/other/cpp/separation-1b-out.hs+15 data/examples/other/cpp/separation-1b.hs+14 data/examples/other/cpp/separation-2a-out.hs+9 data/examples/other/cpp/separation-2a.hs+8 data/examples/other/cpp/separation-2b-out.hs+11 data/examples/other/cpp/separation-2b.hs+11 data/examples/other/cpp/shifted-out.hs+21 data/examples/other/cpp/shifted.hs+17 data/examples/other/cpp/simple-import-out.hs+14 data/examples/other/cpp/simple-import.hs+14 data/examples/other/disabling/indented-fragment-out.hs+7 data/examples/other/disabling/indented-fragment.hs+7 data/examples/other/disabling/single-definition-out.hs+10 data/examples/other/disabling/single-definition.hs+10 data/examples/other/disabling/whole-file-out.hs+10 data/examples/other/disabling/whole-file.hs+10 data/examples/other/empty-forall-out.hs+18 data/examples/other/empty-forall.hs+17 data/examples/other/empty-haddock-out.hs+5 data/examples/other/empty-haddock.hs+6 data/examples/other/following-comment-last-0-out.hs+2 data/examples/other/following-comment-last-0.hs+2 data/examples/other/following-comment-last-1-out.hs+2 data/examples/other/following-comment-last-1.hs+2 data/examples/other/following-comment-last-2-out.hs+3 data/examples/other/following-comment-last-2.hs+2 data/examples/other/following-comment-last-3-out.hs+2 data/examples/other/following-comment-last-3.hs+2 data/examples/other/haddock-sections-out.hs+7 data/examples/other/haddock-sections.hs+7 data/examples/other/inline-comment-0-out.hs+3 data/examples/other/inline-comment-0.hs+3 data/examples/other/inline-comment-1-out.hs+12 data/examples/other/inline-comment-1.hs+9 data/examples/other/merging-comments-out.hs+12 data/examples/other/merging-comments.hs+9 data/examples/other/multiline-forall-out.hs+58 data/examples/other/multiline-forall.hs+46 data/examples/other/multiple-blank-line-comment-out.hs+9 data/examples/other/multiple-blank-line-comment.hs+10 data/examples/other/overly-indented-out.hs+11 data/examples/other/overly-indented.hs+10 data/examples/other/pragma-comments-after-out.hs+4 data/examples/other/pragma-comments-after.hs+3 data/examples/other/pragma-comments-out.hs+8 data/examples/other/pragma-comments.hs+11 data/examples/other/pragma-out.hs+1−4 data/examples/other/pragma-sorting-out.hs+11 data/examples/other/pragma-sorting.hs+10 data/printer/list0-multi.hs−4 data/printer/list0-single.hs−1 data/printer/list1-multi.hs−8 data/printer/list1-single.hs−1 data/printer/mhdr-multi.hs−7 data/printer/mhdr-single.hs−3 data/printer/ssig-multi.hs−5 data/printer/ssig-single.hs−1 default.nix+122−36 expected-failures/Agda.txt+11 expected-failures/aws.txt+9 expected-failures/distributed-process.txt+7 expected-failures/esqueleto.txt+7 expected-failures/fay.txt+18 expected-failures/hlint.txt+11 expected-failures/idris.txt+7 expected-failures/intero.txt+5 expected-failures/leksah.txt+5 expected-failures/lens.txt+3 expected-failures/pandoc.txt+9 expected-failures/pipes.txt+3 expected-failures/postgrest.txt+5 expected-failures/purescript.txt+18 expected-failures/tensorflow.txt+7 format.sh+14 nix/nixpkgs/default.nix+7−3 nix/ormolize/default.nix+36−10 nix/ormolize/ormolize.sh−17 ormolu.cabal+174−156 region-tests/expected-result-17-18.hs+17 region-tests/expected-result-6-7.hs+17 region-tests/expected-result-6-8.hs+16 region-tests/expected-result-9-12.hs+17 region-tests/expected-result-all.hs+21 region-tests/src.hs+17 shell.nix+4−2 src/GHC.hs+12 src/GHC/DynFlags.hs+49 src/Ormolu.hs+71−64 src/Ormolu/Config.hs+70−35 src/Ormolu/Diff.hs+92−70 src/Ormolu/Exception.hs+57−50 src/Ormolu/Imports.hs+176−62 src/Ormolu/Parser.hs+183−157 src/Ormolu/Parser/Anns.hs+18−20 src/Ormolu/Parser/CommentStream.hs+184−89 src/Ormolu/Parser/Pragma.hs+34−33 src/Ormolu/Parser/Result.hs+34−20 src/Ormolu/Parser/Shebang.hs+27 src/Ormolu/Printer.hs+25−16 src/Ormolu/Printer/Combinators.hs+168−159 src/Ormolu/Printer/Comments.hs+171−147 src/Ormolu/Printer/Internal.hs+410−293 src/Ormolu/Printer/Meat/Common.hs+85−41 src/Ormolu/Printer/Meat/Declaration.hs+216−131 src/Ormolu/Printer/Meat/Declaration.hs-boot+3−3 src/Ormolu/Printer/Meat/Declaration/Annotation.hs+4−5 src/Ormolu/Printer/Meat/Declaration/Class.hs+43−53 src/Ormolu/Printer/Meat/Declaration/Data.hs+168−107 src/Ormolu/Printer/Meat/Declaration/Default.hs+6−7 src/Ormolu/Printer/Meat/Declaration/Foreign.hs+12−12 src/Ormolu/Printer/Meat/Declaration/Instance.hs+33−38 src/Ormolu/Printer/Meat/Declaration/RoleAnnotation.hs+5−11 src/Ormolu/Printer/Meat/Declaration/Rule.hs+25−25 src/Ormolu/Printer/Meat/Declaration/Signature.hs+134−97 src/Ormolu/Printer/Meat/Declaration/Splice.hs+3−4 src/Ormolu/Printer/Meat/Declaration/Type.hs+22−20 src/Ormolu/Printer/Meat/Declaration/TypeFamily.hs+51−46 src/Ormolu/Printer/Meat/Declaration/Value.hs+848−537 src/Ormolu/Printer/Meat/Declaration/Value.hs-boot+6−7 src/Ormolu/Printer/Meat/Declaration/Warning.hs+11−13 src/Ormolu/Printer/Meat/ImportExport.hs+83−46 src/Ormolu/Printer/Meat/Module.hs+49−42 src/Ormolu/Printer/Meat/Pragma.hs+74−20 src/Ormolu/Printer/Meat/Type.hs+192−128 src/Ormolu/Printer/Operators.hs+177 src/Ormolu/Printer/SpanStream.hs+18−20 src/Ormolu/Processing/Common.hs+27 src/Ormolu/Processing/Cpp.hs+70 src/Ormolu/Processing/Postprocess.hs+31 src/Ormolu/Processing/Preprocess.hs+149 src/Ormolu/Utils.hs+137−18 tests/Ormolu/Parser/PragmaSpec.hs+4−3 tests/Ormolu/Printer/CombinatorsSpec.hs−112 tests/Ormolu/PrinterSpec.hs+31−22
.buildkite/pipeline.ymlnew file+18
@@ -0,0 +1,18 @@
1+steps:
2+ - label: Build and test with GHC 8.6.5
3+ command: |
4+ nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc865
5+ timeout: 100
6+ - label: Build and test with GHC 8.8.4
7+ command: |
8+ nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc884
9+ timeout: 100
10+ - label: Build and test with GHC 8.10.1
11+ command: |
12+ nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc8101
13+ timeout: 100
14+ - wait
15+ - label: Check formatting
16+ command: |
17+ ./format.sh
18+ git diff --exit-code --color=always
.circleci/config.ymldeleted−44
@@ -1,44 +0,0 @@
1−version: 2
2−
3−jobs:
4− build:
5− docker:
6− - image: nixos/nix:2.1.3
7− steps:
8− - checkout
9− - run:
10− name: Add ca-certificates
11− command: |
12− apk --no-progress update
13− apk --no-progress add ca-certificates
14− - run:
15− name: Setup Cachix
16− command: |
17− nix-env -iA cachix -f https://cachix.org/api/v1/install
18− USER=dummy cachix use tweag
19− - run:
20− name: Build environment
21− command: |
22− nix-shell --pure --run :
23− - run:
24− name: Push Cachix
25− command: |
26− if [ -n "$CACHIX_SIGNING_KEY" ];
27− then nix-store -qR --include-outputs $(nix-instantiate default.nix) | cachix push tweag;
28− fi
29− - run:
30− name: Build the package (includes running the tests)
31− command: nix-build --keep-going
32− - run:
33− name: Generate Haddocks
34− command: nix-build --attr ormolu.doc
35− - store_artifacts:
36− path: result-doc/share/doc
37− destination: haddock
38−
39−workflows:
40− version: 2
41− build:
42− jobs:
43− - build:
44− context: org-global
.github/workflows/binaries.ymlnew file+39
@@ -0,0 +1,39 @@
1+name: Build binaries
2+on:
3+ release:
4+ types: [published]
5+jobs:
6+ build:
7+ strategy:
8+ fail-fast: false
9+ matrix:
10+ os: [ubuntu-latest, macOS-latest, windows-latest]
11+ runs-on: ${{ matrix.os }}
12+ steps:
13+ - uses: actions/checkout@v2
14+ - uses: actions/setup-haskell@v1
15+ if: runner.os != 'Linux'
16+ with:
17+ ghc-version: '8.10.1'
18+ cabal-version: '3.2'
19+ - name: Build Linux binary
20+ if: runner.os == 'Linux'
21+ run: |
22+ docker run \
23+ -v $(pwd):/mnt -w /mnt \
24+ utdemir/ghc-musl:v14-ghc8101 \
25+ bash .github/workflows/build.sh
26+ - name: Build ${{ runner.os }} binary
27+ if: runner.os != 'Linux'
28+ shell: bash
29+ run: |
30+ cabal build exe:ormolu
31+ cp $(find dist-newstyle \( -name ormolu -o -name ormolu.exe \) -type f) ormolu
32+ - uses: actions/upload-release-asset@v1
33+ env:
34+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35+ with:
36+ upload_url: ${{ github.event.release.upload_url }}
37+ asset_path: ormolu
38+ asset_name: ormolu-${{ runner.os }}
39+ asset_content_type: application/octet-stream
.github/workflows/build.shnew file+7
@@ -0,0 +1,7 @@
1+set -e
2+
3+cabal update
4+cabal build exe:ormolu --enable-executable-static --ghc-options="-split-sections"
5+
6+cp $(find dist-newstyle -name ormolu -type f) .
7+strip -s ormolu
.gitignore+1
@@ -26,4 +26,5 @@ cabal.sandbox.config
2626dist-*/
2727dist/
2828stack.yaml
29+stack.yaml.lock
2930result*
CHANGELOG.md+231
@@ -1,3 +1,234 @@
1+## Unreleased
2+
3+* Ormolu no longer overwrites already formatted files. [PR
4+ 649](https://github.com/tweag/ormolu/pull/649).
5+
6+## Ormolu 0.1.2.0
7+
8+* Fixed the bug when comments in different styles got glued together after
9+ formatting. [Issue 589](https://github.com/tweag/ormolu/issues/589).
10+
11+* Added `-i` as a shortcut for `--mode inplace`. [Issue
12+ 467](https://github.com/tweag/ormolu/issues/467).
13+
14+* Improved grouping of top-level declarations. [Issue
15+ 466](https://github.com/tweag/ormolu/issues/466).
16+
17+## Ormolu 0.1.1.0
18+
19+* Imports in a import lists are now normalized: duplicate imports are
20+ combined/eliminated intelligently.
21+
22+* Import declarations that can be merged are now automatically merged.
23+ [Issue 414](https://github.com/tweag/ormolu/issues/414).
24+
25+* The magic comments for disabling and enabling Ormolu now can encompass any
26+ fragment of code provided that the remaining code after exclusion of the
27+ disabled part is still syntactically correct. [Issue
28+ 601](https://github.com/tweag/ormolu/issues/601).
29+
30+* Improved sorting of operators in imports. [Issue
31+ 602](https://github.com/tweag/ormolu/issues/602).
32+
33+* Fixed a bug related to trailing space in multiline comments in certain
34+ cases. [Issue 603](https://github.com/tweag/ormolu/issues/602).
35+
36+* Added support for formatting linked lists with `(:)` as line terminator.
37+ [Issue 478](https://github.com/tweag/ormolu/issues/478).
38+
39+* Fixed rendering of function arguments in multiline layout. [Issue
40+ 609](https://github.com/tweag/ormolu/issues/609).
41+
42+* Blank lines between definitions in `let` and `while` bindings are now
43+ preserved. [Issue 554](https://github.com/tweag/ormolu/issues/554).
44+
45+* Fixed the bug when type applications stuck to the `$` of TH splices that
46+ followed them. [Issue 613](https://github.com/tweag/ormolu/issues/613).
47+
48+* Improved region formatting so that indented fragments—such as definitions
49+ inside of `where` clauses—can be formatted. [Issue
50+ 572](https://github.com/tweag/ormolu/issues/572).
51+
52+* Fixed the bug related to the de-association of pragma comments. [Issue
53+ 619](https://github.com/tweag/ormolu/issues/619).
54+
55+## Ormolu 0.1.0.0
56+
57+* Fixed rendering of type signatures concerning several identifiers. [Issue
58+ 566](https://github.com/tweag/ormolu/issues/566).
59+
60+* Fixed an idempotence issue with inline comments in tuples and parentheses.
61+ [Issue 450](https://github.com/tweag/ormolu/issues/450).
62+
63+* Fixed an idempotence issue when certain comments were picked up as
64+ “continuation” of a series of comments [Issue
65+ 449](https://github.com/tweag/ormolu/issues/449).
66+
67+* Fixed an idempotence issue related to different indentation levels in a
68+ comment series. [Issue 512](https://github.com/tweag/ormolu/issues/512).
69+
70+* Fixed an idempotence issue related to comments which may happen to be
71+ separated from the elements they are attached to by the equality sign.
72+ [Issue 340](https://github.com/tweag/ormolu/issues/340).
73+
74+* Fixed an idempotence issue with type synonym and data declarations where
75+ the type has a Haddock. [Issue
76+ 578](https://github.com/tweag/ormolu/issues/578).
77+
78+* Fix the false positive about AST differences in presence of comments with
79+ multiple blank lines in a row. [Issue
80+ 518](https://github.com/tweag/ormolu/issues/518).
81+
82+* Fixed rendering of comments around if expressions. [Issue
83+ 458](https://github.com/tweag/ormolu/issues/458).
84+
85+* Unnamed fields of data constructors are now documented using the `-- ^`
86+ syntax. [Issue 445](https://github.com/tweag/ormolu/issues/445) and [Issue
87+ 428](https://github.com/tweag/ormolu/issues/428).
88+
89+* Fixed non-idempotent transformation of partly documented data definition.
90+ [Issue 590](https://github.com/tweag/ormolu/issues/590).
91+
92+* Fixed an idempotence issue related to operators. [Issue
93+ 522](https://github.com/tweag/ormolu/issues/522).
94+
95+* Renamed the `--check-idempotency` flag to `--check-idempotence`.
96+ Apparently only the latter is correct.
97+
98+## Ormolu 0.0.5.0
99+
100+* Grouping of statements in `do`-blocks is now preserved. [Issue
101+ 74](https://github.com/tweag/ormolu/issues/74).
102+
103+* Grouping of TH splices is now preserved. [Issue
104+ 507](https://github.com/tweag/ormolu/issues/507).
105+
106+* Comments on pragmas are now preserved. [Issue
107+ 216](https://github.com/tweag/ormolu/issues/216).
108+
109+* Ormolu can now be enabled and disabled via special comments. [Issue
110+ 435](https://github.com/tweag/ormolu/issues/435).
111+
112+* Added experimental support for simple CPP. [Issue
113+ 415](https://github.com/tweag/ormolu/issues/415).
114+
115+* Added two new options `--start-line` and `--end-line` that allow us to
116+ select a region to format. [Issue
117+ 516](https://github.com/tweag/ormolu/issues/516).
118+
119+* Fixed rendering of module headers in the presence of preceding comments or
120+ Haddocks. [Issue 561](https://github.com/tweag/ormolu/issues/561).
121+
122+## Ormolu 0.0.4.0
123+
124+* When given several files to format, Ormolu does not stop on the first
125+ failure, but tries to format all the files. [Issue
126+ 502](https://github.com/tweag/ormolu/issues/502).
127+
128+* Made rendering of pattern matches involving operators consistent with
129+ other cases of rendering of operators. [Issue
130+ 500](https://github.com/tweag/ormolu/issues/500).
131+
132+* More compact rendering of type family injectivity constraints. [Issue
133+ 482](https://github.com/tweag/ormolu/issues/482).
134+
135+* Improved rendering of the keyword `where` in class, data, and type family
136+ declarations. When headers of these declarations are multi-line `where` is
137+ now put on its own line. [Issue
138+ 509](https://github.com/tweag/ormolu/issues/509).
139+
140+* Fixed the bug pertaining to rendering of arrow notation with multiline
141+ expressions. [Issue 513](https://github.com/tweag/ormolu/issues/513).
142+
143+* Made rendering of data type definitions, value-level applications, and
144+ application of types use the same style. Moreover, existential now doesn't
145+ cause the data constructor be unconditionally rendered in multiline
146+ layout. [Issue 427](https://github.com/tweag/ormolu/issues/427).
147+
148+* Records with a single data constructor are now formatted more compactly.
149+ [Issue 425](https://github.com/tweag/ormolu/issues/425).
150+
151+* Switched to `ghc-lib-parser-8.10.1`.
152+
153+* Implemented support for the new language extensions `ImportQualifiedPost`
154+ and `StandaloneKindSignatures`.
155+
156+## Ormolu 0.0.3.1
157+
158+* Fixed rendering of record updates with the record dot preprocessor syntax
159+ [Issue 498](https://github.com/tweag/ormolu/issues/498).
160+
161+## Ormolu 0.0.3.0
162+
163+* Fixed an issue related to unnecessary use of curly braces. [Issue
164+ 473](https://github.com/tweag/ormolu/issues/473).
165+
166+* Fixed the issue with formatting multi-way if when it happens to be a
167+ function applied to arguments [Issue
168+ 488](https://github.com/tweag/ormolu/issues/488). This changed the way
169+ multi-line if is formatted in general.
170+
171+* Added support for record dot pre-processor when used via the plugin.
172+ [Issue 486](https://github.com/tweag/ormolu/issues/486).
173+
174+* Stopped hanging record constructors and improved placing
175+ potentially-hanging consturctions in the presence of comments. [Issue
176+ 447](https://github.com/tweag/ormolu/issues/447).
177+
178+* Fixed indentation in presence of type applications. [Issue
179+ 493](https://github.com/tweag/ormolu/issues/493).
180+
181+* Class and instance declarations now do not have a blank line after
182+ `where`. Grouping of methods from the original input is also preserved
183+ with some normalizations. [Issue
184+ 431](https://github.com/tweag/ormolu/issues/431).
185+
186+## Ormolu 0.0.2.0
187+
188+* Switched to `ghc-lib-parser` instead of depending on the `ghc` package
189+ directly. This should allow us to use newest features of GHC while not
190+ necessarily depending on the newest version of the compiler. In addition
191+ to that Ormolu is now GHCJS-compatible.
192+
193+* Now unrecognized GHC options passed with `--ghc-opt` cause Ormolu to fail
194+ (exit code 7).
195+
196+* Fixed formatting of result type in closed type families. See [issue
197+ 420](https://github.com/tweag/ormolu/issues/420).
198+
199+* Fixed a minor inconsistency between formatting of normal and foreign type
200+ signatures. See [issue 408](https://github.com/tweag/ormolu/issues/408).
201+
202+* Fixed a bug when comment before module header with Haddock was moved
203+ inside the export list. See [issue
204+ 430](https://github.com/tweag/ormolu/issues/430).
205+
206+* Empty `forall`s are now correctly preserved. See [issue
207+ 429](https://github.com/tweag/ormolu/issues/429).
208+
209+* Fixed [issue 446](https://github.com/tweag/ormolu/issues/446), which
210+ involved braces and operators.
211+
212+* When there are comments between preceding Haddock (pipe-style) and its
213+ corresponding declaration they are preserved like this in the output
214+ instead of being shifted. To be clear, this is not a very good idea to
215+ have comments in that position because the Haddock will end up not being
216+ associated with the declarations. Issues
217+ [440](https://github.com/tweag/ormolu/issues/440) and
218+ [448](https://github.com/tweag/ormolu/issues/448).
219+
220+* Implemented correct handling of shebangs. [Issue
221+ 377](https://github.com/tweag/ormolu/issues/377).
222+
223+* Implemented correct handling of stack headers. [Issue
224+ 393](https://github.com/tweag/ormolu/issues/393).
225+
226+* Sorting language pragmas cannot not change meaning of the input program
227+ anymore. [Issue 404](https://github.com/tweag/ormolu/issues/404).
228+
229+* Fixed formatting of applications where function is a complex expression.
230+ [Issue 444](https://github.com/tweag/ormolu/issues/444).
231+
1232## Ormolu 0.0.1.0
2233
3234* Initial release.
CONTRIBUTING.md+6−1
@@ -30,7 +30,7 @@ Testing is performed as following:
3030* The result of printing is parsed back again and the AST is compared to the
3131 AST obtained from the original file. They should match.
3232* The output of printer is checked against the expected output.
33−* Idempotency property is verified: formatting already formatted code
33+* Idempotence property is verified: formatting already formatted code
3434 results in exactly the same output.
3535
3636Examples can be organized in sub-directories, see the existing ones for
@@ -55,5 +55,10 @@ User settings -> Account integrations -> Refresh permissions
5555
5656in Circle CI app.
5757
58+## Formatting
59+
60+Use `format.sh` script to format Ormolu with current version of Ormolu. If
61+Ormolu is not formatted like this, the CI will fail.
62+
5863[issues]: https://github.com/tweag/ormolu/issues
5964[bugs]: https://github.com/tweag/ormolu/issues?q=is%3Aissue+is%3Aopen+label%3Abug
DESIGN.md+24−21
@@ -1,5 +1,8 @@
11# Ormolu
22
3+*This document represents our discussions and plans at early stages of
4+development, it is no longer being updated.*
5+
36* [Analysis of the existing solutions](#analysis-of-the-existing-solutions)
47 * [Brittany](#brittany)
58 * [Hindent](#hindent)
@@ -21,7 +24,7 @@ It also includes recommendations for future implementers.
2124
2225We set for the following goals (mostly taken from
2326[brittany](https://github.com/lspitzner/brittany)):
24−* Preserve the meaning of the formatted functions;
27+* Preserve the meaning of the formatted functions when no CPP is used;
2528* Make reasonable use of screen space;
2629* Use linear space and computation time on the size of the input;
2730* Preserve comments;
@@ -137,8 +140,10 @@ impossible to guess what they'll be called on.
137140
138141### CPP
139142
140−Formatting a module which uses CPP directives won't be supported. Instead,
141−we hope for a solution to replace CPP to do conditional compilation.
143+We allow CPP directives in the input, but we forgo the goal to preserve the
144+meaning of the formatted functions in that case.
145+Instead of supporting CPP better, we hope for a solution to replace CPP to
146+do conditional compilation.
142147
143148There are the following challenges when formatting a module with CPP:
144149
@@ -177,14 +182,15 @@ True
177182```
178183
179184At the time of this writing, formatting this program with Hindent
180−produces the same output we would get if the CPP directives were
181−considered comments:
185+or Ormolu produces the same output we would get if the CPP directives
186+were considered comments:
182187
183188```
184−$ hindent --version
185−hindent 5.2.7
189+$ ormolu --version
190+ormolu 0.0.5.0 HEAD fc64eada5c4da7a5b07d2872e253671b48aec115
191+using ghc-lib-parser 8.10.1.20200412
186192
187−$ hindent test.hs
193+$ ormolu --mode inplace test.hs
188194
189195$ cat test.hs
190196{-# LANGUAGE CPP #-}
@@ -224,9 +230,6 @@ to parse Haskell modules. If CPP is replaced with some language
224230extension or mechanism to do conditional compilation, all tools
225231will benefit from it.
226232
227−Therefore, CPP won't be supported. If the CPP extension
228−is enabled, we should signal an error right away.
229−
230233### Printing
231234
232235Just pretty-printing code (following the approach of Hindent) seems sane. It
@@ -282,22 +285,22 @@ map :: (a -> b) -> [a] -> [b]
282285foldr :: (a -> b -> b) ->
283286 b -> [a] -> [b]
284287-- Is reformatted to:
285−foldr
286− :: (a -> b -> b)
287− -> b
288− -> [a]
289− -> [b]
288+foldr ::
289+ (a -> b -> b) ->
290+ b ->
291+ [a] ->
292+ [b]
290293
291294t = let x = foo bar
292295 baz
293296 in foo bar baz
294297-- Is reformatted to:
295298t =
296− let x =
297− foo
298− bar
299− baz
300− in foo far baz
299+ let x =
300+ foo
301+ bar
302+ baz
303+ in foo far baz
301304```
302305
303306Crucially, no effort is made to fit within reasonable line lengths. That's
README.md+97−29
@@ -4,27 +4,26 @@
44[![Hackage](https://img.shields.io/hackage/v/ormolu.svg?style=flat)](https://hackage.haskell.org/package/ormolu)
55[![Stackage Nightly](http://stackage.org/package/ormolu/badge/nightly)](http://stackage.org/nightly/package/ormolu)
66[![Stackage LTS](http://stackage.org/package/ormolu/badge/lts)](http://stackage.org/lts/package/ormolu)
7−[![CircleCI](https://circleci.com/gh/tweag/ormolu/tree/master.svg?style=svg&circle-token=cfd37a39265561eb44e608f97cf953cb2a394c03)](https://circleci.com/gh/tweag/ormolu/tree/master)
7+[![Build status](https://badge.buildkite.com/8e3b0951f3652b77e1c422b361904136a539b0522029156354.svg?branch=master)](https://buildkite.com/tweag-1/ormolu)
88
99Ormolu is a formatter for Haskell source code. The project was created with
1010the following goals in mind:
1111
1212* Using GHC's own parser to avoid parsing problems caused by
1313 [`haskell-src-exts`][haskell-src-exts].
14−* Let some whitespace be programmable. The layout of the input
15− influence the layout choices in the output. This means that the
16− choices between single-line/multi-line layouts in each particular
17− situation are made by the user, not by an algorithm. This makes the
18− implementation simpler and leaves some control to the user while
19− still guaranteeing that the formatted code is stylistically
20− consistent.
21−* Writing code in such a way so it's easy to modify and maintain. Roughly,
22− it means that the project follows the path of [`hindent`][hindent] and is
23− very much about printing AST in a particular way.
14+* Let some whitespace be programmable. The layout of the input influences
15+ the layout choices in the output. This means that the choices between
16+ single-line/multi-line layouts in each particular situation are made by
17+ the user, not by an algorithm. This makes the implementation simpler and
18+ leaves some control to the user while still guaranteeing that the
19+ formatted code is stylistically consistent.
20+* Writing code in such a way so it's easy to modify and maintain.
2421* Implementing one “true” formatting style which admits no configuration.
2522* That formatting style aims to result in minimal diffs while still
2623 remaining very close to “conventional” Haskell formatting people use.
27−* Idempotency: formatting already formatted code doesn't change it.
24+* Choose a style compatible with modern dialects of Haskell. As new Haskell
25+ extensions enter broad use, we may change the style to accommodate them.
26+* Idempotence: formatting already formatted code doesn't change it.
2827* Be well-tested and robust to the point that it can be used in large
2928 projects without exposing unfortunate, disappointing bugs here and there.
3029
@@ -33,7 +32,7 @@ the following goals in mind:
3332The easiest way to build the project is with Nix:
3433
3534```console
36−$ nix-build
35+$ nix-build -A ormolu
3736```
3837
3938Or with `cabal-install` from the Nix shell:
@@ -46,11 +45,36 @@ Alternatively, `stack` could be used with a `stack.yaml` file as follows.
4645
4746```console
4847$ cat stack.yaml
49−resolver: lts-14.3
48+resolver: lts-16.0
5049packages:
5150- '.'
5251
53−$ stack build
52+$ stack build # to build
53+$ stack install # to install
54+```
55+
56+To use Ormolu directly from GitHub with Nix, this snippet may come in handy:
57+
58+```nix
59+# This overlay adds Ormolu straight from GitHub.
60+self: super:
61+
62+let source = super.fetchFromGitHub {
63+ owner = "tweag";
64+ repo = "ormolu";
65+ rev = "de279d80122b287374d4ed87c7b630db1f157642"; # update as necessary
66+ sha256 = "0qrxfk62ww6b60ha9sqcgl4nb2n5fhf66a65wszjngwkybwlzmrv"; # as well
67+ };
68+ ormolu = import source { pkgs = self; };
69+in {
70+ haskell = super.haskell // {
71+ packages = super.haskell.packages // {
72+ "${ormolu.ormoluCompiler}" = super.haskell.packages.${ormolu.ormoluCompiler}.override {
73+ overrides = ormolu.ormoluOverlay;
74+ };
75+ };
76+ };
77+}
5478```
5579
5680## Usage
@@ -68,25 +92,48 @@ formatted output.
6892$ ormolu --mode inplace Module.hs
6993```
7094
71−## Current limitations
95+Use `find` to format a tree recursively:
7296
73−* Does not handle CPP (wontfix, see [the design document][design]).
74−* Ormolu knows nothing about operator precedence so complex chains of
75− operators may be rendered in slightly unpleasant ways †.
76−* Various minor idempotence issues, most of them are related to comments †.
97+```console
98+$ ormolu --mode inplace $(find . -name '*.hs')
99+```
77100
78−† To be resolved in 0.0.2.0.
101+## Magic comments
79102
80−## Editor integration
103+Ormolu understands two magic comments:
81104
82−We know of the following editor integrations:
105+```haskell
106+{- ORMOLU_DISABLE -}
107+```
108+
109+and
110+
111+```haskell
112+{- ORMOLU_ENABLE -}
113+```
114+
115+This allows us to disable formatting selectively for code between these
116+markers or disable it for the entire file. To achieve the latter, just put
117+`{- ORMOLU_DISABLE -}` at the very top. Note that the source code should
118+still be parseable even without the “excluded” part. Because of that the
119+magic comments cannot be placed arbitrary, but should rather enclose
120+independent top-level definitions.
83121
84−* [For Emacs][emacs-package]
122+## Current limitations
123+
124+* CPP support is experimental. CPP is virtually impossible to handle
125+ correctly, so we process them as a sort of unchangeable snippets. This
126+ works only in simple cases when CPP conditionals surround top-level
127+ declarations. See the [CPP][design-cpp] section in the design notes for
128+ a discussion of the dangers.
129+* Input modules should be parsable by Haddock, which is a bit stricter
130+ criterion than just being valid Haskell modules.
131+* Various minor idempotence issues, most of them are related to comments.
85132
86133## Running on Hackage
87134
88135It's possible to try Ormolu on arbitrary packages from Hackage. For that
89−execute (from root of clonned repo):
136+execute (from the root of the cloned repo):
90137
91138```console
92139$ nix-build -A hackage.<package>
@@ -97,17 +144,38 @@ also contain formatted `.hs` files for inspection and original inputs with
97144`.hs-original` extension (those are with CPP dropped, exactly what is fed
98145into Ormolu).
99146
147+## Editor integration
148+
149+We know of the following editor integrations:
150+
151+* [Emacs][emacs-package]
152+* [VS Code][vs-code-plugin]
153+* vim: [neoformat][neoformat], [vim-ormolu][vim-ormolu]
154+
155+## Arch Linux
156+
157+To install Ormolu on Arch Linux, one can use [the package on AUR][aur]:
158+
159+```console
160+yay -S ormolu
161+```
162+
100163## Contributing
101164
102−See [CONTRIBUTING.md](./CONTRIBUTING.md).
165+See [CONTRIBUTING.md][contributing].
103166
104167## License
105168
106−See [LICENSE.md](./LICENSE.md).
169+See [LICENSE.md][license].
107170
108171Copyright © 2018–present Tweag I/O
109172
110−[design]: ./DESIGN.md#cpp
173+[design-cpp]: https://github.com/tweag/ormolu/blob/master/DESIGN.md#cpp
174+[contributing]: https://github.com/tweag/ormolu/blob/master/CONTRIBUTING.md
175+[license]: https://github.com/tweag/ormolu/blob/master/LICENSE.md
111176[haskell-src-exts]: https://hackage.haskell.org/package/haskell-src-exts
112−[hindent]: https://hackage.haskell.org/package/hindent
113177[emacs-package]: https://github.com/vyorkin/ormolu.el
178+[vs-code-plugin]: https://marketplace.visualstudio.com/items?itemName=sjurmillidahl.ormolu-vscode
179+[vim-ormolu]: https://github.com/sdiehl/vim-ormolu
180+[neoformat]: https://github.com/sbdchd/neoformat
181+[aur]: https://aur.archlinux.org/packages/ormolu
app/Main.hs+133−95
@@ -1,12 +1,17 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE LambdaCase #-}
33{-# LANGUAGE RecordWildCards #-}
44{-# LANGUAGE TemplateHaskell #-}
5+{-# LANGUAGE TypeApplications #-}
56
67module Main (main) where
78
9+import Control.Exception (SomeException, displayException, try)
810import Control.Monad
11+import Data.Bool (bool)
12+import Data.Either (lefts)
913import Data.List (intercalate, sort)
14+import qualified Data.Text.IO as TIO
1015import Data.Version (showVersion)
1116import Development.GitRev
1217import Options.Applicative
@@ -16,10 +21,8 @@ import Ormolu.Utils (showOutputable)
1621import Paths_ormolu (version)
1722import System.Exit (ExitCode (..), exitWith)
1823import System.IO (hPutStrLn, stderr)
19−import qualified Data.Text.IO as TIO
2024
2125-- | Entry point of the program.
22−
2326main :: IO ()
2427main = withPrettyOrmoluExceptions $ do
2528 Opts {..} <- execParser optsParserInfo
@@ -27,35 +30,50 @@ main = withPrettyOrmoluExceptions $ do
2730 case optInputFiles of
2831 [] -> formatOne' Nothing
2932 ["-"] -> formatOne' Nothing
30− xs -> mapM_ (formatOne' . Just) xs
33+ [x] -> formatOne' (Just x)
34+ xs -> do
35+ -- It is possible to get IOException, error's and 'OrmoluException's
36+ -- from 'formatOne', so we just catch everything.
37+ errs <-
38+ lefts <$> mapM (try @SomeException . formatOne' . Just) (sort xs)
39+ unless (null errs) $ do
40+ mapM_ (hPutStrLn stderr . displayException) errs
41+ exitWith (ExitFailure 102)
3142
3243-- | Format a single input.
33−
34−formatOne
35− :: Mode -- ^ Mode of operation
36− -> Config -- ^ Configuration
37− -> Maybe FilePath -- ^ File to format or stdin as 'Nothing'
38− -> IO ()
44+formatOne ::
45+ -- | Mode of operation
46+ Mode ->
47+ -- | Configuration
48+ Config RegionIndices ->
49+ -- | File to format or stdin as 'Nothing'
50+ Maybe FilePath ->
51+ IO ()
3952formatOne mode config = \case
4053 Nothing -> do
4154 r <- ormoluStdin config
4255 case mode of
4356 Stdout -> TIO.putStr r
44− _ -> do
45− hPutStrLn stderr
57+ _ -> do
58+ hPutStrLn
59+ stderr
4660 "This feature is not supported when input comes from stdin."
47− -- 101 is different from all the other exit codes we already use.
61+ -- 101 is different from all the other exit codes we already use.
4862 exitWith (ExitFailure 101)
4963 Just inputFile -> do
50− r <- ormoluFile config inputFile
64+ originalInput <- TIO.readFile inputFile
65+ formattedInput <- ormoluFile config inputFile
5166 case mode of
5267 Stdout ->
53− TIO.putStr r
54− InPlace ->
55− TIO.writeFile inputFile r
68+ TIO.putStr formattedInput
69+ InPlace -> do
70+ -- Only write when the contents have changed, in order to avoid
71+ -- updating the modified timestamp if the file was already correctly
72+ -- formatted.
73+ when (formattedInput /= originalInput) $
74+ TIO.writeFile inputFile formattedInput
5675 Check -> do
57− r' <- TIO.readFile inputFile
58− when (r /= r') $
76+ when (formattedInput /= originalInput) $
5977 -- 100 is different to all the other exit code that are emitted
6078 -- either from an 'OrmoluException' or from 'error' and
6179 -- 'notImplemented'.
@@ -65,101 +83,121 @@ formatOne mode config = \case
6583-- Command line options parsing.
6684
6785data Opts = Opts
68− { optMode :: !Mode
69− -- ^ Mode of operation
70− , optConfig :: !Config
71− -- ^ Ormolu 'Config'
72− , optInputFiles :: ![FilePath]
73− -- ^ Haskell source files to format or stdin (when the list is empty)
86+ { -- | Mode of operation
87+ optMode :: !Mode,
88+ -- | Ormolu 'Config'
89+ optConfig :: !(Config RegionIndices),
90+ -- | Haskell source files to format or stdin (when the list is empty)
91+ optInputFiles :: ![FilePath]
7492 }
7593
7694-- | Mode of operation.
77−
7895data Mode
79− = Stdout -- ^ Output formatted source code to stdout
80− | InPlace -- ^ Overwrite original file
81− | Check -- ^ Exit with non-zero status code if
82− -- source is not already formatted
96+ = -- | Output formatted source code to stdout
97+ Stdout
98+ | -- | Overwrite original file
99+ InPlace
100+ | -- | Exit with non-zero status code if
101+ -- source is not already formatted
102+ Check
83103 deriving (Eq, Show)
84104
85105optsParserInfo :: ParserInfo Opts
86−optsParserInfo = info (helper <*> ver <*> exts <*> optsParser) . mconcat $
87− [ fullDesc
88− , progDesc ""
89− , header ""
90− ]
106+optsParserInfo =
107+ info (helper <*> ver <*> exts <*> optsParser) . mconcat $
108+ [ fullDesc,
109+ progDesc "",
110+ header ""
111+ ]
91112 where
92113 ver :: Parser (a -> a)
93− ver = infoOption verStr . mconcat $
94− [ long "version"
95− , short 'v'
96− , help "Print version of the program"
97− ]
98− verStr = intercalate "\n"
99− [ unwords
100− [ "ormolu"
101− , showVersion version
102− , $gitBranch
103− , $gitHash
114+ ver =
115+ infoOption verStr . mconcat $
116+ [ long "version",
117+ short 'v',
118+ help "Print version of the program"
119+ ]
120+ verStr =
121+ intercalate
122+ "\n"
123+ [ unwords
124+ [ "ormolu",
125+ showVersion version,
126+ $gitBranch,
127+ $gitHash
128+ ],
129+ "using ghc-lib-parser " ++ VERSION_ghc_lib_parser
104130 ]
105− , "using ghc " ++ VERSION_ghc
106− ]
107131 exts :: Parser (a -> a)
108− exts = infoOption displayExts . mconcat $
109− [ long "manual-exts"
110− , help "Display extensions that need to be enabled manually"
111− ]
132+ exts =
133+ infoOption displayExts . mconcat $
134+ [ long "manual-exts",
135+ help "Display extensions that need to be enabled manually"
136+ ]
112137 displayExts = unlines $ sort (showOutputable <$> manualExts)
113138
114139optsParser :: Parser Opts
115−optsParser = Opts
116− <$> (option parseMode . mconcat)
117− [ long "mode"
118− , short 'm'
119− , metavar "MODE"
120− , value Stdout
121− , help "Mode of operation: 'stdout' (default), 'inplace', or 'check'"
122− ]
123− <*> configParser
124− <*> (many . strArgument . mconcat)
125− [ metavar "FILE"
126− , help "Haskell source files to format or stdin (default)"
127− ]
140+optsParser =
141+ Opts
142+ <$> ( (fmap (bool Stdout InPlace) . switch . mconcat)
143+ [ short 'i',
144+ help "A shortcut for --mode inplace"
145+ ]
146+ <|> (option parseMode . mconcat)
147+ [ long "mode",
148+ short 'm',
149+ metavar "MODE",
150+ value Stdout,
151+ help "Mode of operation: 'stdout' (default), 'inplace', or 'check'"
152+ ]
153+ )
154+ <*> configParser
155+ <*> (many . strArgument . mconcat)
156+ [ metavar "FILE",
157+ help "Haskell source files to format or stdin (default)"
158+ ]
128159
129−configParser :: Parser Config
130−configParser = Config
131− <$> (fmap (fmap DynOption) . many . strOption . mconcat)
132− [ long "ghc-opt"
133− , short 'o'
134− , metavar "OPT"
135− , help "GHC options to enable (e.g. language extensions)"
136− ]
137− <*> (switch . mconcat)
138− [ long "unsafe"
139− , short 'u'
140− , help "Do formatting faster but without automatic detection of defects"
141− ]
142− <*> (switch . mconcat)
143− [ long "debug"
144− , short 'd'
145− , help "Output information useful for debugging"
146− ]
147− <*> (switch . mconcat)
148− [ long "tolerate-cpp"
149− , short 'p'
150− , help "Do not fail if CPP pragma is present"
151− ]
152− <*> (switch . mconcat)
153− [ long "check-idempotency"
154− , short 'c'
155− , help "Fail if formatting is not idempotent"
156− ]
160+configParser :: Parser (Config RegionIndices)
161+configParser =
162+ Config
163+ <$> (fmap (fmap DynOption) . many . strOption . mconcat)
164+ [ long "ghc-opt",
165+ short 'o',
166+ metavar "OPT",
167+ help "GHC options to enable (e.g. language extensions)"
168+ ]
169+ <*> (switch . mconcat)
170+ [ long "unsafe",
171+ short 'u',
172+ help "Do formatting faster but without automatic detection of defects"
173+ ]
174+ <*> (switch . mconcat)
175+ [ long "debug",
176+ short 'd',
177+ help "Output information useful for debugging"
178+ ]
179+ <*> (switch . mconcat)
180+ [ long "check-idempotence",
181+ short 'c',
182+ help "Fail if formatting is not idempotent"
183+ ]
184+ <*> ( RegionIndices
185+ <$> (optional . option auto . mconcat)
186+ [ long "start-line",
187+ metavar "START",
188+ help "Start line of the region to format (starts from 1)"
189+ ]
190+ <*> (optional . option auto . mconcat)
191+ [ long "end-line",
192+ metavar "END",
193+ help "End line of the region to format (inclusive)"
194+ ]
195+ )
157196
158197----------------------------------------------------------------------------
159198-- Helpers
160199
161200-- | Parse 'Mode'.
162−
163201parseMode :: ReadM Mode
164202parseMode = eitherReader $ \case
165203 "stdout" -> Right Stdout
data/examples/declaration/annotation/annotation-out.hs+4−3
@@ -2,9 +2,9 @@
22
33{-# ANN
44 module
5− ( 5
6− :: Int
7− )
5+ ( 5 ::
6+ Int
7+ )
88 #-}
99
1010{-# ANN foo "hey" #-}
@@ -18,4 +18,5 @@ foo = 5
1818
1919data Foo = Foo Int
2020{-# ANN type Foo ("HLint: ignore") #-}
21+
2122{- Comment -}
data/examples/declaration/class/associated-data1-out.hs−1
@@ -4,7 +4,6 @@ class Foo a where data FooBar a
44
55-- | Something.
66class Bar a where
7−
87 -- | Bar bar
98 data BarBar a
109
data/examples/declaration/class/associated-data2-out.hs+2−1
@@ -1,8 +1,9 @@
11{-# LANGUAGE TypeFamilies #-}
22
3+module Main where
4+
35-- | Something more.
46class Baz a where
5−
67 -- | Baz bar
78 data
89 BazBar
data/examples/declaration/class/associated-data2.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13{-# LANGUAGE TypeFamilies #-}
24
35-- | Something more.
data/examples/declaration/class/associated-type-defaults-out.hs−2
@@ -4,7 +4,6 @@ class Foo a where type FooBar a = Int
44
55-- | Something.
66class Bar a where
7−
87 -- Define bar
98 type
109 BarBar a =
@@ -18,7 +17,6 @@ class Bar a where
1817 a
1918
2019class Baz a where
21−
2220 type
2321 BazBar
2422 a
data/examples/declaration/class/associated-types1-out.hs−1
@@ -4,7 +4,6 @@ class Foo a where type FooBar a
44
55-- | Something.
66class Bar a where
7−
87 -- | Bar bar
98 type BarBar a
109
data/examples/declaration/class/associated-types2-out.hs+2−1
@@ -1,8 +1,9 @@
11{-# LANGUAGE TypeFamilies #-}
22
3+module Main where
4+
35-- | Something more.
46class Baz a where
5−
67 -- | Baz bar
78 type
89 BazBar
data/examples/declaration/class/associated-types2.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13{-# LANGUAGE TypeFamilies #-}
24
35-- | Something more.
data/examples/declaration/class/default-implementations-comments-out.hs+7−6
@@ -1,18 +1,19 @@
1+module Main where
2+
13-- | Baz
24class Baz a where
3−
45 foobar :: a -> a
56 foobar a =
67 barbaz (bazbar a)
78
89 -- | Bar baz
9− barbaz
10− :: a -> a
10+ barbaz ::
11+ a -> a
1112
1213 -- | Baz bar
13− bazbar
14− :: a
15− -> a
14+ bazbar ::
15+ a ->
16+ a
1617
1718 -- First comment
1819 barbaz a =
data/examples/declaration/class/default-implementations-comments.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Baz
24class Baz a where
35 foobar :: a -> a
data/examples/declaration/class/default-implementations-out.hs+5−3
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Foo
24class Foo a where
35 foo :: a -> a
@@ -5,7 +7,7 @@ class Foo a where
57
68-- | Bar
79class Bar a where
8− bar
9− :: a
10− -> Int
10+ bar ::
11+ a ->
12+ Int
1113 bar = const 0
data/examples/declaration/class/default-implementations.hs+2−1
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Foo
24class Foo a where
35 foo :: a -> a
@@ -9,4 +11,3 @@ class Bar a where
911 a
1012 -> Int
1113 bar = const 0
12−
data/examples/declaration/class/default-signatures-out.hs+13−13
@@ -1,22 +1,22 @@
11{-# LANGUAGE DefaultSignatures #-}
22
3+module Main where
4+
35-- | Something else.
46class Bar a where
5−
67 -- | Bar
7− bar
8− :: String
9− -> String
10− -> a
11−
8+ bar ::
9+ String ->
10+ String ->
11+ a
1212 -- Pointless comment
13− default bar
14− :: ( Read a,
15− Semigroup a
16− )
17− => a
18− -> a
19− -> a
13+ default bar ::
14+ ( Read a,
15+ Semigroup a
16+ ) =>
17+ a ->
18+ a ->
19+ a
2020 -- Even more pointless comment
2121 bar
2222 a
data/examples/declaration/class/default-signatures-simple-out.hs+2−2
@@ -1,8 +1,8 @@
1+module Main where
2+
13-- | Something.
24class Foo a where
3−
45 -- | Foo
56 foo :: a -> String
6−
77 default foo :: Show a => a -> String
88 foo = show
data/examples/declaration/class/default-signatures-simple.hs+2−1
@@ -1,7 +1,8 @@
1+module Main where
2+
13-- | Something.
24class Foo a where
35 -- | Foo
46 foo :: a -> String
57 default foo :: Show a => a -> String
68 foo = show
7−
data/examples/declaration/class/default-signatures.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13{-# LANGUAGE DefaultSignatures #-}
24
35-- | Something else.
data/examples/declaration/class/dependency-super-classes-out.hs+11−11
@@ -1,25 +1,25 @@
11{-# LANGUAGE FunctionalDependencies #-}
22
3+module Main where
4+
35-- | Something.
46class (MonadReader r s, MonadWriter w m) => MonadState s m | m -> s where
5−
67 get :: m s
7−
88 put :: s -> m ()
99
1010-- | 'MonadParsec'
1111class
1212 ( Stream s, -- Token streams
1313 MonadPlus m -- Potential for failure
14− )
15− => MonadParsec e s m
16− | m -> e s where
17−
14+ ) =>
15+ MonadParsec e s m
16+ | m -> e s
17+ where
1818 -- | 'getState' returns state
19− getState
20− :: m s
19+ getState ::
20+ m s
2121
2222 -- | 'putState' sets state
23− putState
24− :: s
25− -> m ()
23+ putState ::
24+ s ->
25+ m ()
data/examples/declaration/class/dependency-super-classes.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13{-# LANGUAGE FunctionalDependencies #-}
24
35-- | Something.
data/examples/declaration/class/empty-classes-out.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Foo!
24class Foo a
35
data/examples/declaration/class/empty-classes.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Foo!
24class Foo a where
35-- | Bar!
data/examples/declaration/class/functional-dependencies-out.hs+4−1
@@ -1,5 +1,7 @@
11{-# LANGUAGE FunctionalDependencies #-}
22
3+module Main where
4+
35-- | Something.
46class Foo a b | a -> b
57
@@ -12,5 +14,6 @@ class
1214 b c -> a d, -- Bar
1315 a c -> b d, -- Baz
1416 a c d -> b,
15− a b d -> a b c d where
17+ a b d -> a b c d
18+ where
1619 baz :: a -> b
data/examples/declaration/class/functional-dependencies.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13{-# LANGUAGE FunctionalDependencies #-}
24
35-- | Something.
data/examples/declaration/class/multi-parameters1-out.hs+5−5
@@ -4,11 +4,11 @@ class Foo a b where foo :: a -> b
44
55-- | Something.
66class Bar a b c d where
7− bar
8− :: a
9− -> b
10− -> c
11− -> d
7+ bar ::
8+ a ->
9+ b ->
10+ c ->
11+ d
1212
1313class -- Before name
1414 Baz where
data/examples/declaration/class/multi-parameters2-out.hs+9−8
@@ -1,5 +1,7 @@
11{-# LANGUAGE MultiParamTypeClasses #-}
22
3+module Main where
4+
35-- | Something else.
46class
57 BarBaz
@@ -8,11 +10,10 @@ class
810 c -- Baz bar
911 d -- Baz baz
1012 e -- Rest
11− f where
12−
13− barbaz
14− :: a -> f
15−
16− bazbar
17− :: e
18− -> f
13+ f
14+ where
15+ barbaz ::
16+ a -> f
17+ bazbar ::
18+ e ->
19+ f
data/examples/declaration/class/multi-parameters2.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13{-# LANGUAGE MultiParamTypeClasses #-}
24
35-- | Something else.
data/examples/declaration/class/newlines-after-where-out.hsnew file+5
@@ -0,0 +1,5 @@
1+class Num a where
2+ (+) :: a -> a -> a
3+
4+class Num a where
5+ (+) :: a -> a -> a
data/examples/declaration/class/newlines-after-where.hsnew file+7
@@ -0,0 +1,7 @@
1+class Num a where
2+ (+) :: a -> a -> a
3+
4+class Num a where
5+
6+
7+ (+) :: a -> a -> a
data/examples/declaration/class/newlines-and-default-decls-out.hsnew file+11
@@ -0,0 +1,11 @@
1+class Foo a where
2+ foo :: a
3+ default foo :: ()
4+ foo = ()
5+ bar :: a
6+ default bar :: ()
7+ bar = ()
8+
9+ qux :: a
10+ default qux :: ()
11+ qux = ()
data/examples/declaration/class/newlines-and-default-decls.hsnew file+13
@@ -0,0 +1,13 @@
1+class Foo a where
2+ foo :: a
3+ default foo :: ()
4+ foo = ()
5+ bar :: a
6+ default bar :: ()
7+ bar = ()
8+
9+ qux :: a
10+
11+ default qux :: ()
12+
13+ qux = ()
data/examples/declaration/class/newlines-and-haddocks-out.hsnew file+23
@@ -0,0 +1,23 @@
1+class Foo a where
2+ -- | Haddock
3+ foo :: a
4+
5+ -- | Another Haddock
6+ bar :: a
7+
8+ baz :: a
9+ -- ^ Post-Haddock
10+
11+ raz :: a
12+ -- ^ Another Post-Haddock
13+
14+ -- | One more Haddock
15+ qux :: a
16+
17+ -- Comment before a Haddock
18+
19+ -- | And one more Haddock
20+ xyz :: a
21+
22+ -- | Haddock followed by a blank line
23+ abc :: a
data/examples/declaration/class/newlines-and-haddocks.hsnew file+19
@@ -0,0 +1,19 @@
1+class Foo a where
2+ -- | Haddock
3+ foo :: a
4+ -- | Another Haddock
5+ bar :: a
6+ baz :: a
7+ -- ^ Post-Haddock
8+ raz :: a
9+ -- ^ Another Post-Haddock
10+
11+ -- | One more Haddock
12+ qux :: a
13+ -- Comment before a Haddock
14+ -- | And one more Haddock
15+ xyz :: a
16+
17+ -- | Haddock followed by a blank line
18+
19+ abc :: a
data/examples/declaration/class/newlines-between-methods-out.hsnew file+17
@@ -0,0 +1,17 @@
1+class Num a where
2+ (+) :: a -> a -> a
3+ (-) :: a -> a -> a
4+ (*) :: a -> a -> a
5+
6+ -- Comment before definition
7+ negate :: a -> a
8+
9+ -- Comment after definition
10+
11+ -- Separator
12+
13+ abs :: a -> a
14+ signum :: a -> a
15+
16+ -- Comment between unrelated definitions
17+ fromInteger :: Integer -> a
data/examples/declaration/class/newlines-between-methods.hsnew file+15
@@ -0,0 +1,15 @@
1+class Num a where
2+ (+) :: a -> a -> a
3+ (-) :: a -> a -> a
4+ (*) :: a -> a -> a
5+
6+ -- Comment before definition
7+ negate :: a -> a
8+ -- Comment after definition
9+
10+ -- Separator
11+
12+ abs :: a -> a
13+ signum :: a -> a
14+ -- Comment between unrelated definitions
15+ fromInteger :: Integer -> a
data/examples/declaration/class/poly-kinded-classes-out.hs+3−3
@@ -4,6 +4,6 @@ class Foo (a :: k)
44
55class
66 Bar
7− ( a -- Variable
8− :: * -- Star
9− )
7+ ( a :: -- Variable
8+ * -- Star
9+ )
data/examples/declaration/class/single-parameters-out.hs+13−10
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Something.
24class Foo a where foo :: a
35
@@ -8,16 +10,17 @@ class Bar a where
810
911class Baz a where
1012 -- | Baz
11− baz
12− :: ( a,
13− a -- ^ First argument
14− )
15− -> a -- ^ Second argument
16− -> a -- ^ Return value
13+ baz ::
14+ -- | First argument
15+ ( a,
16+ a
17+ ) ->
18+ -- | Second argument
19+ a ->
20+ -- | Return value
21+ a
1722
1823class BarBaz a where
19−
20− barbaz
21− :: a -> b
22−
24+ barbaz ::
25+ a -> b
2326 bazbar :: b -> a
data/examples/declaration/class/single-parameters.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Something.
24class Foo a where foo :: a
35
data/examples/declaration/class/super-classes-out.hs+4−4
@@ -3,12 +3,12 @@ class Foo a
33class Foo a => Bar a
44
55class
6− (Foo a, Bar a)
7− => Baz a
6+ (Foo a, Bar a) =>
7+ Baz a
88
99class
1010 ( Foo a, -- Foo?
1111 Bar a, -- Bar?
1212 Baz a -- Baz
13− )
14− => BarBar a
13+ ) =>
14+ BarBar a
data/examples/declaration/class/type-operators1-out.hs+1−1
@@ -17,5 +17,5 @@ class
1717class
1818 ( f
1919 :. g
20− )
20+ )
2121 a
data/examples/declaration/class/type-operators2-out.hs+1−1
@@ -12,5 +12,5 @@ class (f `Product` g) a
1212class
1313 ( f
1414 `Sum` g
15− )
15+ )
1616 a
data/examples/declaration/class/type-operators3-out.hsnew file+10
@@ -0,0 +1,10 @@
1+{-# LANGUAGE PolyKinds #-}
2+{-# LANGUAGE TypeFamilies #-}
3+{-# LANGUAGE TypeOperators #-}
4+{-# LANGUAGE NoStarIsType #-}
5+
6+class PNum x where
7+ type (a :: x) * (b :: x)
8+
9+instance PNum Nat where
10+ type a * b = ()
data/examples/declaration/class/type-operators3.hsnew file+7
@@ -0,0 +1,7 @@
1+{-# LANGUAGE TypeFamilies, TypeOperators, NoStarIsType, PolyKinds #-}
2+
3+class PNum x where
4+ type (a :: x) * (b :: x)
5+
6+instance PNum Nat where
7+ type a * b = ()
data/examples/declaration/data/deriving-strategies-out.hs+3−1
@@ -1,10 +1,12 @@
1+module Main where
2+
13-- | Something.
24newtype Foo = Foo Int
35 deriving stock (Eq, Show, Generic)
46 deriving anyclass
57 ( ToJSON,
68 FromJSON
7− )
9+ )
810 deriving newtype (Num)
911 deriving (Monoid) via (Sum Int)
1012 deriving
data/examples/declaration/data/deriving-strategies.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Something.
24
35newtype Foo = Foo Int
data/examples/declaration/data/existential-multiline-out.hs+12
@@ -3,3 +3,15 @@
33data Foo
44 = forall a. MkFoo a (a -> Bool)
55 | forall a. Eq a => MkBar a
6+
7+data Bar
8+ = forall x y.
9+ Bar x y x y
10+
11+data Baz
12+ = forall x y.
13+ Baz
14+ x
15+ y
16+ x
17+ y
data/examples/declaration/data/existential-multiline.hs+7
@@ -3,3 +3,10 @@
33data Foo
44 = forall a. MkFoo a (a -> Bool)
55 | forall a. Eq a => MkBar a
6+
7+data Bar = forall x y.
8+ Bar x y x y
9+
10+data Baz = forall x y.
11+ Baz x y x
12+ y
data/examples/declaration/data/existential-out.hs+2
@@ -1,3 +1,5 @@
11{-# LANGUAGE ExistentialQuantification #-}
22
33data Foo = forall a. MkFoo a (a -> Bool)
4+
5+data Bar = forall a b. a + b => Bar a b
data/examples/declaration/data/existential.hs+2
@@ -1,3 +1,5 @@
11{-# LANGUAGE ExistentialQuantification #-}
22
33data Foo = forall a. MkFoo a (a -> Bool)
4+
5+data Bar = forall a b. a + b => Bar a b
data/examples/declaration/data/fat-multiline-out.hs+6−4
@@ -1,10 +1,12 @@
1+module Main where
2+
13-- | Something.
24data Foo
3− = Foo
5+ = -- | Foo
6+ Foo
47 Int
58 Int
6− -- ^ Foo
7− | Bar
9+ | -- | Bar
10+ Bar
811 Bool
912 Bool
10− -- ^ Bar
data/examples/declaration/data/fat-multiline.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Something.
24
35data Foo
data/examples/declaration/data/field-layout/gadt-out.hsnew file+11
@@ -0,0 +1,11 @@
1+module Main where
2+
3+-- | Foo.
4+data Foo a b where
5+ -- | Something
6+ Foo :: Foo Int Int
7+ -- | Something else
8+ Bar ::
9+ Foo
10+ Char
11+ Char
data/examples/declaration/data/field-layout/gadt.hsnew file+10
@@ -0,0 +1,10 @@
1+module Main where
2+
3+-- | Foo.
4+
5+data Foo a b where
6+ -- | Something
7+ Foo :: Foo Int Int
8+ -- | Something else
9+ Bar :: Foo Char
10+ Char
data/examples/declaration/data/field-layout/record-out.hsnew file+12
@@ -0,0 +1,12 @@
1+module Main where
2+
3+-- | Foo.
4+data Foo = Foo
5+ { -- | Something
6+ foo :: Foo Int Int,
7+ -- | Something else
8+ bar ::
9+ Bar
10+ Char
11+ Char
12+ }
data/examples/declaration/data/field-layout/record.hsnew file+11
@@ -0,0 +1,11 @@
1+module Main where
2+
3+-- | Foo.
4+
5+data Foo = Foo
6+ { foo :: Foo Int Int
7+ -- ^ Something
8+ , bar :: Bar Char
9+ Char
10+ -- ^ Something else
11+ }
data/examples/declaration/data/field-layout/variants-out.hsnew file+10
@@ -0,0 +1,10 @@
1+module Main where
2+
3+-- | Foo.
4+data Foo
5+ = -- | Something
6+ Foo Int Int
7+ | -- | Something else
8+ Bar
9+ Char
10+ Char
data/examples/declaration/data/field-layout/variants.hsnew file+10
@@ -0,0 +1,10 @@
1+module Main where
2+
3+-- | Foo.
4+
5+data Foo =
6+ Foo Int Int
7+ -- ^ Something
8+ | Bar Char
9+ Char
10+ -- ^ Something else
data/examples/declaration/data/gadt-syntax-out.hs+2−1
@@ -1,2 +1,3 @@
1−{-# LANUGAGE GADTSyntax #-}
1+{-# LANGUAGE GADTSyntax #-}
2+
23data Foo where MKFoo :: a -> (a -> Bool) -> Foo
data/examples/declaration/data/gadt-syntax.hs+1−1
@@ -1,3 +1,3 @@
1−{-# LANUGAGE GADTSyntax #-}
1+{-# LANGUAGE GADTSyntax #-}
22
33data Foo where { MKFoo :: a -> (a->Bool) -> Foo }
data/examples/declaration/data/gadt/multiline-out.hs+17−13
@@ -1,21 +1,25 @@
11{-# LANGUAGE ExplicitForAll #-}
22
3+module Main where
4+
35-- | Here goes a comment.
46data Foo a where
57 -- | 'Foo' is wonderful.
6− Foo
7− :: forall a b. (Show a, Eq b) -- foo
8− -- bar
9− => a
10− -> b
11− -> Foo 'Int
8+ Foo ::
9+ forall a b.
10+ (Show a, Eq b) => -- foo
11+ -- bar
12+ a ->
13+ b ->
14+ Foo 'Int
1215 -- | But 'Bar' is also not too bad.
13− Bar
14− :: Int
15− -> Maybe Text
16− -> Foo 'Bool
16+ Bar ::
17+ Int ->
18+ Maybe Text ->
19+ Foo 'Bool
1720 -- | So is 'Baz'.
18− Baz
19− :: forall a. a
20− -> Foo 'String
21+ Baz ::
22+ forall a.
23+ a ->
24+ Foo 'String
2125 (:~>) :: Foo a -> Foo a -> Foo a
data/examples/declaration/data/gadt/multiline-where-out.hsnew file+7
@@ -0,0 +1,7 @@
1+data
2+ Foo
3+ a
4+ b
5+ c
6+ where
7+ Foo :: a -> b -> c -> Foo a b c
data/examples/declaration/data/gadt/multiline-where.hsnew file+6
@@ -0,0 +1,6 @@
1+data
2+ Foo
3+ a
4+ b
5+ c where
6+ Foo :: a -> b -> c -> Foo a b c
data/examples/declaration/data/gadt/multiline.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13{-# LANGUAGE ExplicitForAll #-}
24
35-- | Here goes a comment.
data/examples/declaration/data/gadt/multiple-declaration-out.hs+6−6
@@ -3,13 +3,13 @@ data GADT0 a where
33
44data GADT1 a where
55 GADT11,
6− GADT12
7− :: Int
8− -> GADT1 a
6+ GADT12 ::
7+ Int ->
8+ GADT1 a
99
1010data GADT2 a where
1111 GADT21,
1212 GADT21,
13− GADT22
14− :: Int
15− -> GADT2 a
13+ GADT22 ::
14+ Int ->
15+ GADT2 a
data/examples/declaration/data/gadt/record-out.hs+11−9
@@ -1,12 +1,14 @@
1+module Main where
2+
13-- | Something.
24data Foo where
35 Foo :: {fooX :: Int} -> Foo
4− Bar
5− :: { fooY :: Int,
6− fooBar, fooBaz :: Bool,
7− fooFoo,
8− barBar,
9− bazBaz
10− :: Int
11− }
12− -> Foo
6+ Bar ::
7+ { fooY :: Int,
8+ fooBar, fooBaz :: Bool,
9+ fooFoo,
10+ barBar,
11+ bazBaz ::
12+ Int
13+ } ->
14+ Foo
data/examples/declaration/data/gadt/record.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Something.
24
35data Foo where
data/examples/declaration/data/gadt/simple-out.hs+12−2
@@ -1,8 +1,18 @@
11{-# LANGUAGE ExplicitForAll #-}
22
3+module Main where
4+
35-- | Here goes a comment.
46data Foo a where
57 -- | 'Foo' is wonderful.
68 Foo :: forall a b. (Show a, Eq b) => a -> b -> Foo 'Int
7− Bar :: Int -> Text -> Foo 'Bool -- ^ But 'Bar' is also not too bad.
8− Baz :: forall a. a -> Foo 'String -- ^ So is 'Baz'.
9+ Bar ::
10+ Int ->
11+ Text ->
12+ -- | But 'Bar' is also not too bad.
13+ Foo 'Bool
14+ Baz ::
15+ forall a.
16+ a ->
17+ -- | So is 'Baz'.
18+ Foo 'String
data/examples/declaration/data/gadt/simple.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13{-# LANGUAGE ExplicitForAll #-}
24
35-- | Here goes a comment.
data/examples/declaration/data/gadt/strictness-out.hs+2−1
@@ -1,2 +1,3 @@
11data Foo a where
2− Foo :: !Int -> {-# UNPACK #-} !Bool -> Foo Int
2+ Foo1 :: !Int -> {-# UNPACK #-} !Bool -> Foo Int
3+ Foo2 :: {-# UNPACK #-} Maybe Int && Bool -> Foo Int
data/examples/declaration/data/gadt/strictness.hs+2−1
@@ -1,2 +1,3 @@
11data Foo a where
2− Foo :: !Int -> {-# UNPACK #-} !Bool -> Foo Int
2+ Foo1 :: !Int -> {-# UNPACK #-} !Bool -> Foo Int
3+ Foo2 :: {-# UNPACK #-} Maybe Int && Bool -> Foo Int
data/examples/declaration/data/kind-annotations-out.hs+8
@@ -1,3 +1,11 @@
11data Something (n :: Nat) = Something
22
33data Format (k :: *) (k' :: *) (k'' :: *)
4+
5+type Parens1 = Proxy '(a :: A, b :: (B :: *))
6+
7+type Parens2 = Proxy '((a :: A), (b :: B))
8+
9+type family Foo a where
10+ Foo '(a :: Int, b :: Bool) = Int
11+ Foo '((a :: Int), (b :: Bool)) = Int
data/examples/declaration/data/kind-annotations.hs+7
@@ -1,3 +1,10 @@
11data Something (n :: Nat) = Something
22
33data Format (k :: *) (k' :: *) (k'' :: *)
4+
5+type Parens1 = Proxy '(a :: A, b :: (B :: *))
6+type Parens2 = Proxy '((a :: A), (b :: B))
7+
8+type family Foo a where
9+ Foo '(a :: Int, b :: Bool) = Int
10+ Foo '((a :: Int), (b :: Bool)) = Int
data/examples/declaration/data/multiline-arg-parens-out.hs+3−1
@@ -1,8 +1,10 @@
1+module Main where
2+
13-- | Something.
24data Foo
35 = Foo
46 Bar
57 (Set Baz) -- and here we go
6− -- and that's it
8+ -- and that's it
79 Text
810 deriving (Eq)
data/examples/declaration/data/multiline-arg-parens.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Something.
24
35data Foo
data/examples/declaration/data/multiline-names-out.hs+2−2
@@ -11,7 +11,7 @@ data (f :* g) a = f a :* g a
1111data
1212 ( f
1313 :+ g
14− )
14+ )
1515 a
1616 = L (f a)
1717 | R (g a)
@@ -23,7 +23,7 @@ data (f `Product` g) a = f a `Product` g a
2323data
2424 ( f
2525 `Sum` g
26− )
26+ )
2727 a
2828 = L' (f a)
2929 | R' (g a)
data/examples/declaration/data/multiline-out.hs+8−3
@@ -1,7 +1,12 @@
1+module Main where
2+
13-- | Here we have 'Foo'.
24data Foo
3− = Foo -- ^ One
4− | Bar Int -- ^ Two
5− | Baz -- ^ Three
5+ = -- | One
6+ Foo
7+ | -- | Two
8+ Bar Int
9+ | -- | Three
10+ Baz
611 deriving
712 (Eq, Show)
data/examples/declaration/data/multiline.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Here we have 'Foo'.
24
35data Foo
data/examples/declaration/data/newtype-out.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Something.
24newtype Foo = Foo Int
35 deriving (Eq, Show)
data/examples/declaration/data/newtype.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Something.
24
35newtype Foo = Foo Int
data/examples/declaration/data/operators-out.hsnew file+12
@@ -0,0 +1,12 @@
1+data ErrorMessage' s
2+ = -- | Show the text as is.
3+ Text s
4+ | -- | Pretty print the type.
5+ -- @ShowType :: k -> ErrorMessage@
6+ forall t. ShowType t
7+ | -- | Put two pieces of error message next
8+ -- to each other.
9+ ErrorMessage' s :<>: ErrorMessage' s
10+ | -- | Stack two pieces of error message on top
11+ -- of each other.
12+ ErrorMessage' s :$$: ErrorMessage' s
data/examples/declaration/data/operators.hsnew file+12
@@ -0,0 +1,12 @@
1+data ErrorMessage' s
2+ = -- | Show the text as is.
3+ Text s
4+ | -- | Pretty print the type.
5+ -- @ShowType :: k -> ErrorMessage@
6+ forall t. ShowType t
7+ | -- | Put two pieces of error message next
8+ -- to each other.
9+ ErrorMessage' s :<>: ErrorMessage' s
10+ | -- | Stack two pieces of error message on top
11+ -- of each other.
12+ ErrorMessage' s :$$: ErrorMessage' s
data/examples/declaration/data/partly-documented-out.hsnew file+5
@@ -0,0 +1,5 @@
1+data Optimisation
2+ = PETransform
3+ | -- | partial eval and associated transforms
4+ GeneralisedNatHack
5+ deriving (Show, Eq, Generic)
data/examples/declaration/data/partly-documented.hsnew file+2
@@ -0,0 +1,2 @@
1+data Optimisation = PETransform | GeneralisedNatHack -- ^ partial eval and associated transforms
2+ deriving (Show, Eq, Generic)
data/examples/declaration/data/record-multi-const-out.hsnew file+17
@@ -0,0 +1,17 @@
1+module Main where
2+
3+-- | Something.
4+data Foo
5+ = Foo
6+ { -- | X
7+ fooX :: Int,
8+ -- | Y
9+ fooY :: Int
10+ }
11+ | Bar
12+ { -- | X
13+ barX :: Int,
14+ -- | Y
15+ barY :: Int
16+ }
17+ deriving (Eq, Show)
data/examples/declaration/data/record-multi-const.hsnew file+13
@@ -0,0 +1,13 @@
1+module Main where
2+
3+-- | Something.
4+
5+data Foo = Foo
6+ { fooX :: Int -- ^ X
7+ , fooY :: Int -- ^ Y
8+ } |
9+ Bar
10+ { barX :: Int -- ^ X
11+ , barY :: Int -- ^ Y
12+ }
13+ deriving (Eq, Show)
data/examples/declaration/data/record-out.hs+21−16
@@ -1,18 +1,23 @@
1+module Main where
2+
13-- | Something.
2−data Foo
3− = Foo
4− { fooX :: Int, -- ^ X
5− fooY :: Int, -- ^ Y
6− fooBar, fooBaz :: NonEmpty (Identity Bool), -- ^ BarBaz
7− fooGag,
8− fooGog
9− :: NonEmpty
10− ( Indentity
11− Bool
12− ),
13− -- ^ GagGog
14− fooFoo,
15− barBar
16− :: Int -- ^ Huh!
17− }
4+data Foo = Foo
5+ { -- | X
6+ fooX :: Int,
7+ -- | Y
8+ fooY :: Int,
9+ -- | BarBaz
10+ fooBar, fooBaz :: NonEmpty (Identity Bool),
11+ -- | GagGog
12+ fooGag,
13+ fooGog ::
14+ NonEmpty
15+ ( Indentity
16+ Bool
17+ ),
18+ -- | Huh!
19+ fooFoo,
20+ barBar ::
21+ Int
22+ }
1823 deriving (Eq, Show)
data/examples/declaration/data/record-singleline-out.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Something.
24data Foo = Foo {fooX :: Int, fooY :: Int}
35 deriving (Eq, Show)
data/examples/declaration/data/record-singleline.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Something.
24
35data Foo = Foo { fooX :: Int , fooY :: Int }
data/examples/declaration/data/record.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Something.
24
35data Foo = Foo
data/examples/declaration/data/simple-broken-out.hs+3−2
@@ -1,6 +1,7 @@
1+module Main where
2+
13-- | Here we go.
2−data Foo
3− = Foo {unFoo :: Int}
4+data Foo = Foo {unFoo :: Int}
45 deriving (Eq)
56
67-- | And once again.
data/examples/declaration/data/simple-broken.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Here we go.
24
35data Foo
data/examples/declaration/data/simple-out.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | And here we have 'Foo'.
24data Foo = Foo | Bar Int | Baz
35 deriving (Eq, Show)
data/examples/declaration/data/simple.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | And here we have 'Foo'.
24
35data Foo = Foo | Bar Int | Baz
data/examples/declaration/data/strictness-out.hs+5−1
@@ -1,2 +1,6 @@
1+module Main where
2+
13-- | Something.
2−data Foo = Foo !Int {-# UNPACK #-} !Bool {-# NOUNPACK #-} !String
4+data Foo
5+ = Foo1 !Int {-# UNPACK #-} !Bool {-# NOUNPACK #-} !String
6+ | Foo2 {a :: {-# UNPACK #-} Maybe Int && Bool}
data/examples/declaration/data/strictness.hs+5−1
@@ -1,3 +1,7 @@
1+module Main where
2+
13-- | Something.
24
3−data Foo = Foo !Int {-# UNPACK #-} !Bool {-# NOUNPACK #-} !String
5+data Foo
6+ = Foo1 !Int {-# UNPACK #-} !Bool {-# NOUNPACK #-} !String
7+ | Foo2 { a :: {-# UNPACK #-} Maybe Int && Bool }
data/examples/declaration/data/unnamed-field-comment-0-out.hsnew file+7
@@ -0,0 +1,7 @@
1+data Foo
2+ = -- | Bar
3+ Bar
4+ Field1
5+ -- ^ Field 1
6+ Field2
7+ -- ^ Field 2
data/examples/declaration/data/unnamed-field-comment-0.hsnew file+5
@@ -0,0 +1,5 @@
1+data Foo
2+ = -- | Bar
3+ Bar
4+ Field1 -- ^ Field 1
5+ Field2 -- ^ Field 2
data/examples/declaration/data/unnamed-field-comment-1-out.hsnew file+5
@@ -0,0 +1,5 @@
1+data X
2+ = B
3+ !Int
4+ -- ^ y
5+ C
data/examples/declaration/data/unnamed-field-comment-1.hsnew file+4
@@ -0,0 +1,4 @@
1+data X
2+ = B
3+ !Int -- ^ y
4+ C
data/examples/declaration/data/with-comment-out.hsnew file+4
@@ -0,0 +1,4 @@
1+data A
2+ = B -- C
3+ | -- D
4+ E
data/examples/declaration/data/with-comment.hsnew file+5
@@ -0,0 +1,5 @@
1+data A =
2+ B -- C
3+
4+ -- D
5+ | E
data/examples/declaration/data/with-weird-haddock-out.hsnew file+4
@@ -0,0 +1,4 @@
1+data PlusLevel' t
2+ = -- | @n + ℓ@.
3+ Plus Integer (LevelAtom' t)
4+ deriving (Show, Data)
data/examples/declaration/data/with-weird-haddock.hsnew file+2
@@ -0,0 +1,2 @@
1+data PlusLevel' t = Plus Integer (LevelAtom' t) -- ^ @n + ℓ@.
2+ deriving (Show, Data)
data/examples/declaration/default/default-out.hs+1−1
@@ -4,4 +4,4 @@ default
44 ( Int,
55 Foo,
66 Bar
7− )
7+ )
data/examples/declaration/foreign/foreign-export-out.hs+2−1
@@ -2,7 +2,8 @@ foreign export ccall foo :: Int -> IO Int
22
33-- | 'foreignTomFun' is a very important thing
44foreign export ccall "tomography"
5− foreignTomFun :: StablePtr Storage -> TomForegin {- Storage is bad -}
5+ foreignTomFun ::
6+ StablePtr Storage {- Storage is bad -} -> TomForegin
67
78foreign export {- We can't use capi here -} ccall "dynamic"
89 export_nullaryMeth :: (IO HRESULT) -> IO (Ptr ())
data/examples/declaration/foreign/foreign-import-out.hs+10−10
@@ -10,16 +10,16 @@ foreign import stdcall unsafe "boo"
1010 boo :: Int -> Text -> IO Array
1111
1212foreign import javascript
13− baz
14− :: String
15− -> Int
16− -> IO Foo
13+ baz ::
14+ String ->
15+ Int ->
16+ IO Foo
1717
1818foreign import {- We use capi here -} capi "pi.h value pi" c_pi :: CDouble
1919
20−foreign import stdcall "dynamic" {- This is a bad place for a comment -}
21− dyn_gluBeginSurface
22− :: FunPtr (Ptr GLUnurbs -> IO ())
23− -- ^ This 'FunPtr' is extremely dangerous, beware
24− -> Ptr GLUnurbs
25− -> IO ()
20+foreign import stdcall {- This is a bad place for a comment -} "dynamic"
21+ dyn_gluBeginSurface ::
22+ -- | This 'FunPtr' is extremely dangerous, beware
23+ FunPtr (Ptr GLUnurbs -> IO ()) ->
24+ Ptr GLUnurbs ->
25+ IO ()
data/examples/declaration/instance/associated-data-out.hs−2
@@ -11,9 +11,7 @@ instance Foo Double where
1111 Double
1212
1313instance Foo [a] where
14−
1514 data Bar [a]
1615 = ListBar [Bar a]
17−
1816 data Baz [a]
1917 = ListBaz
data/examples/declaration/instance/associated-data.hs+1
@@ -13,6 +13,7 @@ instance Foo Double where
1313
1414instance Foo [a]
1515 where
16+
1617 data Bar [a] =
1718 ListBar [Bar a]
1819 data Baz [a] =
data/examples/declaration/instance/associated-types-out.hs−1
@@ -3,7 +3,6 @@
33instance Foo Int where type Bar Int = Double
44
55instance Foo Double where
6−
76 type
87 Bar
98 Double =
data/examples/declaration/instance/associated-types.hs+2
@@ -9,5 +9,7 @@ instance Foo Double
99 Double
1010 =
1111 [Double]
12+
13+
1214 type instance Baz Double
1315 = [Double]
data/examples/declaration/instance/contexts-comments-out.hs+8−8
@@ -4,14 +4,14 @@ instance
44 Read
55 ( c, -- Bar
66 d
7− )
7+ )
8+ ) =>
9+ Read
10+ ( a, -- Baz
11+ b,
12+ ( c, -- Quux
13+ d
14+ )
815 )
9− => Read
10− ( a, -- Baz
11− b,
12− ( c, -- Quux
13− d
14− )
15− )
1616 where
1717 readsPrec = undefined
data/examples/declaration/instance/contexts-out.hs+7−7
@@ -3,16 +3,16 @@ instance Eq a => Eq [a] where (==) _ _ = False
33instance
44 ( Ord a,
55 Ord b
6− )
7− => Ord (a, b)
6+ ) =>
7+ Ord (a, b)
88 where
99 compare _ _ = GT
1010
1111instance
12− (Show a, Show b)
13− => Show
14− ( a,
15− b
16− )
12+ (Show a, Show b) =>
13+ Show
14+ ( a,
15+ b
16+ )
1717 where
1818 showsPrec _ _ = showString ""
data/examples/declaration/instance/data-family-instances-gadt-out.hs+8−6
@@ -2,10 +2,12 @@
22{-# LANGUAGE TypeFamilies #-}
33
44data instance Bar Int a where
5− SameBar
6− :: Bar Int
7− Int
5+ SameBar ::
6+ Bar
7+ Int
8+ Int
89 CloseBar :: Bar Int Double
9− OtherBar
10− :: Bar Int
11− a
10+ OtherBar ::
11+ Bar
12+ Int
13+ a
data/examples/declaration/instance/data-family-instances-newtype-out.hs+3−4
@@ -1,7 +1,6 @@
11{-# LANGUAGE GADTSyntax #-}
22{-# LANGUAGE TypeFamilies #-}
33
4−newtype instance Foo [Double]
5− = DoubleListFoo
6− { unDoubleListFoo :: Double
7− }
4+newtype instance Foo [Double] = DoubleListFoo
5+ { unDoubleListFoo :: Double
6+ }
data/examples/declaration/instance/data-family-instances-out.hs+2−2
@@ -9,10 +9,10 @@ data instance
99 = IntListFoo
1010 ( Int,
1111 Int
12− )
12+ )
1313 ( Double,
1414 Double
15− )
15+ )
1616
1717data instance Bar Double a
1818 = DoubleBar
data/examples/declaration/instance/instance-sigs-multiple-out.hs+5−7
@@ -1,12 +1,10 @@
11{-# LANGUAGE InstanceSigs #-}
22
33instance Applicative [] where
4−
5− pure
6− :: a
7− -> [a]
4+ pure ::
5+ a ->
6+ [a]
87 pure a = [a]
9−
10− (<*>)
11− :: [a] -> [a] -> [a]
8+ (<*>) ::
9+ [a] -> [a] -> [a]
1210 (<*>) _ _ = []
data/examples/declaration/instance/instance-sigs-out.hs+4−4
@@ -5,10 +5,10 @@ instance Eq Int where
55 (==) _ _ = False
66
77instance Ord Int where
8− compare
9− :: Int
10− -> Int
11− -> Ordering
8+ compare ::
9+ Int ->
10+ Int ->
11+ Ordering
1212 compare
1313 _
1414 _ =
data/examples/declaration/instance/multi-parameter-out.hs−2
@@ -1,7 +1,5 @@
11instance MonadReader a ((->) a) where ask = id
22
33instance MonadState s (State s) where
4−
54 get = State.get
6−
75 put = State.put
data/examples/declaration/instance/newlines-after-where-out.hsnew file+5
@@ -0,0 +1,5 @@
1+instance Num X where
2+ (+) = undefined
3+
4+instance Num Y where
5+ (+) = undefined
data/examples/declaration/instance/newlines-after-where.hsnew file+7
@@ -0,0 +1,7 @@
1+instance Num X where
2+ (+) = undefined
3+
4+instance Num Y where
5+
6+
7+ (+) = undefined
data/examples/declaration/instance/newlines-between-methods-out.hsnew file+18
@@ -0,0 +1,18 @@
1+instance Num a => Num (Diff a) where
2+ D u dudx + D v dvdx = D (u + v) (dudx + dvdx)
3+ D u dudx - D v dvdx = D (u - v) (dudx - dvdx)
4+ D u dudx * D v dvdx = D (u * v) (u * dvdx + v * dudx)
5+
6+ -- Comment before definition
7+ negate (D u dudx) = D (- u) (- dudx)
8+ negate (Z u dudx) = undefined
9+
10+ -- Comment after definition
11+
12+ -- Separator
13+
14+ abs (D u _) = D (abs u) (signum u)
15+ signum (D u _) = D (signum u) 0
16+
17+ -- Comment between unrelated definitions
18+ fromInteger n = D (fromInteger n) 0
data/examples/declaration/instance/newlines-between-methods.hsnew file+16
@@ -0,0 +1,16 @@
1+instance Num a => Num (Diff a) where
2+ D u dudx + D v dvdx = D (u + v) (dudx + dvdx)
3+ D u dudx - D v dvdx = D (u - v) (dudx - dvdx)
4+ D u dudx * D v dvdx = D (u * v) (u * dvdx + v * dudx)
5+
6+ -- Comment before definition
7+ negate (D u dudx) = D (-u) (-dudx)
8+ negate (Z u dudx) = undefined
9+ -- Comment after definition
10+
11+ -- Separator
12+
13+ abs (D u _) = D (abs u) (signum u)
14+ signum (D u _) = D (signum u) 0
15+ -- Comment between unrelated definitions
16+ fromInteger n = D (fromInteger n) 0
data/examples/declaration/instance/single-parameter-out.hs−2
@@ -1,9 +1,7 @@
11instance Monoid Int where (<>) x y = x + y
22
33instance Enum Int where
4−
54 fromEnum x = x
6−
75 toEnum =
86 \x ->
97 x
data/examples/declaration/instance/type-family-instances-out.hs+2−2
@@ -7,7 +7,7 @@ type instance
77 [Int] =
88 ( Int,
99 Int
10− )
10+ )
1111
1212type instance Bar Int [Int] Double = (Int, Double)
1313
@@ -18,4 +18,4 @@ type instance
1818 Double =
1919 ( Int,
2020 Double
21− )
21+ )
data/examples/declaration/rewrite-rule/basic1-out.hs+2−1
@@ -10,7 +10,8 @@
1010
1111{-# RULES
1212"map/map"
13− map f
13+ map
14+ f
1415 (map g xs) =
1516 map
1617 (f . g)
data/examples/declaration/rewrite-rule/forall-out.hs → data/examples/declaration/rewrite-rule/forall-0-out.hsrenamed

The content is the same.

data/examples/declaration/rewrite-rule/forall.hs → data/examples/declaration/rewrite-rule/forall-0.hsrenamed

The content is the same.

data/examples/declaration/rewrite-rule/forall-1-out.hsnew file+23
@@ -0,0 +1,23 @@
1+{-# RULES "rd_tyvs" forall a. forall (x :: a). id x = x #-}
2+
3+{-# RULES "rd_tyvs'" forall f a. forall (x :: f a). id x = x #-}
4+
5+{-# RULES "rd_tyvs''" forall (a :: *). forall (x :: a). id x = x #-}
6+
7+{-# RULES
8+"rd_tyvs_multiline1" forall (a :: *). forall (x :: a).
9+ id x =
10+ x
11+ #-}
12+
13+{-# RULES
14+"rd_tyvs_multiline2" forall
15+ ( a ::
16+ *
17+ ). forall
18+ ( x ::
19+ a
20+ ).
21+ id x =
22+ x
23+ #-}
data/examples/declaration/rewrite-rule/forall-1.hsnew file+17
@@ -0,0 +1,17 @@
1+{-# RULES "rd_tyvs" forall a. forall (x :: a). id x = x #-}
2+
3+{-# RULES "rd_tyvs'" forall f a. forall (x :: f a). id x = x #-}
4+
5+{-# RULES "rd_tyvs''" forall (a :: *). forall (x :: a). id x = x #-}
6+
7+{-# RULES "rd_tyvs_multiline1"
8+ forall (a :: *).
9+ forall (x :: a).
10+ id x = x #-}
11+
12+{-# RULES "rd_tyvs_multiline2"
13+ forall (a ::
14+ *).
15+ forall (x ::
16+ a).
17+ id x = x #-}
data/examples/declaration/rewrite-rule/phase-out.hs+4−2
@@ -1,6 +1,7 @@
11{-# RULES
22"map/map" [2]
3− map f
3+ map
4+ f
45 (map g xs) =
56 map
67 (f . g)
@@ -9,7 +10,8 @@
910
1011{-# RULES
1112"map/map" [1] forall x y z.
12− map f
13+ map
14+ f
1315 (map g xs) =
1416 map
1517 (f . g)
data/examples/declaration/rewrite-rule/prelude2-out.hs+1
@@ -17,6 +17,7 @@
1717-- So I've disabled it for now. We could have special cases
1818-- for short lists, I suppose.
1919-- "foldr/cons" forall k z x xs. foldr k z (x:xs) = k x (foldr k z xs)
20+
2021"foldr/single" forall k z x. foldr k z [x] = k x z
2122"foldr/nil" forall k z. foldr k z [] = z
2223"augment/build" forall
data/examples/declaration/rewrite-rule/prelude2.hs−1
@@ -27,4 +27,3 @@
2727"augment/nil" forall (g::forall b. (a->b->b) -> b -> b) .
2828 augment g [] = build g
2929 #-}
30−
data/examples/declaration/rewrite-rule/type-signature-out.hs+6−5
@@ -6,11 +6,12 @@
66"fold/build" forall
77 k
88 z
9− ( g
10− :: forall b. (a -> b -> b)
11− -> b
12− -> b
13− ).
9+ ( g ::
10+ forall b.
11+ (a -> b -> b) ->
12+ b ->
13+ b
14+ ).
1415 foldr k z (build g) =
1516 g k z
1617 #-}
data/examples/declaration/signature/complete/complete-out.hs+2−2
@@ -5,6 +5,6 @@
55{-# COMPLETE
66 A,
77 B,
8− C
9− :: Foo
8+ C ::
9+ Foo
1010 #-}
data/examples/declaration/signature/inline/inline-out.hs+4
@@ -9,3 +9,7 @@ bar = id
99baz :: Int -> Int
1010baz = id
1111{-# INLINE [~2] baz #-}
12+
13+reVector :: Bundle u a -> Bundle v a
14+{-# INLINE reVector #-}
15+reVector = M.reVector
data/examples/declaration/signature/inline/inline.hs+5
@@ -11,3 +11,8 @@ bar = id
1111baz :: Int -> Int
1212baz = id
1313{-# INLINE [~2] baz #-}
14+
15+reVector :: Bundle u a -> Bundle v a
16+
17+{-# INLINE reVector #-}
18+reVector = M.reVector
data/examples/declaration/signature/minimal/minimal-out.hs+1−3
@@ -1,5 +1,4 @@
11class Foo a where
2−
32 {-# MINIMAL (==) | ((/=), foo) #-}
43
54 {-# MINIMAL
@@ -7,10 +6,9 @@ class Foo a where
76 | ( b, c, d
87 | e,
98 f
10− )
9+ )
1110 | g
1211 #-}
1312
1413 (==) :: a -> a -> Bool
15−
1614 (/=) :: a -> a -> Bool
data/examples/declaration/signature/pattern/multiline-out.hs+9−9
@@ -1,19 +1,19 @@
11{-# LANGUAGE PatternSynonyms #-}
22
3−pattern Arrow
4− :: Type
5− -> Type
6− -> Type
3+pattern Arrow ::
4+ Type ->
5+ Type ->
6+ Type
77
88pattern
99 Foo,
10− Bar
11− :: Type -> Type -> Type
10+ Bar ::
11+ Type -> Type -> Type
1212
1313pattern
1414 TypeSignature,
1515 FunctionBody,
1616 PatternSignature,
17− WarningPragma
18− :: [RdrName]
19− -> HsDecl GhcPs
17+ WarningPragma ::
18+ [RdrName] ->
19+ HsDecl GhcPs
data/examples/declaration/signature/specialize/specialize-instance-out.hs+1−5
@@ -3,16 +3,12 @@ data Foo a = Foo a
33data VT v m r = VT v m r
44
55instance (Eq a) => Eq (Foo a) where
6−
76 {-# SPECIALIZE instance Eq (Foo [(Int, Bar)]) #-}
8−
97 (==) (Foo a) (Foo b) = (==) a b
108
119instance (Num r, V.Vector v r, Factored m r) => Num (VT v m r) where
12−
1310 {-# SPECIALIZE instance
1411 ( Factored m Int => Num (VT U.Vector m Int)
15− )
12+ )
1613 #-}
17−
1814 VT x + VT y = VT $ V.zipWith (+) x y
data/examples/declaration/signature/specialize/specialize-out.hs+6−6
@@ -9,15 +9,15 @@ bar = id
99
1010baz :: Num a => a -> a
1111baz = id
12−{-# SPECIALIZE [~2] baz
13− :: Int
14− -> Int
12+{-# SPECIALIZE [~2] baz ::
13+ Int ->
14+ Int
1515 #-}
1616
1717{-# SPECIALIZE fits13Bits :: Int -> Bool, Integer -> Bool #-}
18−{-# SPECIALIZE fits13Bits
19− :: Int
20− -> Bool,
18+{-# SPECIALIZE fits13Bits ::
19+ Int ->
20+ Bool,
2121 Integer -> Bool
2222 #-}
2323fits13Bits :: Integral a => a -> Bool
data/examples/declaration/signature/standalone-kind-out.hsnew file+13
@@ -0,0 +1,13 @@
1+{-# LANGUAGE StandaloneKindSignatures #-}
2+
3+type T ::
4+ (k -> Type) ->
5+ k ->
6+ Type
7+data T m a = MkT (m a) (T Maybe (m a))
8+
9+type C1 :: Type -> Constraint
10+class C1 a
11+
12+type F :: Type -> Type
13+type family F
data/examples/declaration/signature/standalone-kind.hsnew file+13
@@ -0,0 +1,13 @@
1+{-# LANGUAGE StandaloneKindSignatures #-}
2+
3+type T :: (k -> Type)
4+ -> k
5+ -> Type
6+
7+data T m a = MkT (m a) (T Maybe (m a))
8+
9+type C1 :: Type -> Constraint
10+class C1 a
11+
12+type F :: Type -> Type
13+type family F
data/examples/declaration/signature/type/arguments-out.hs+14−13
@@ -1,15 +1,16 @@
11{-# LANGUAGE RankNTypes #-}
22
3−functionName
4− :: (C1, C2, C3, C4, C5)
5− => a
6− -> b
7− -> ( forall a. (C6, C7)
8− => LongDataTypeName
9− -> a
10− -> AnotherLongDataTypeName
11− -> b
12− -> c
13− )
14− -> (c -> d)
15− -> (a, b, c, d)
3+functionName ::
4+ (C1, C2, C3, C4, C5) =>
5+ a ->
6+ b ->
7+ ( forall a.
8+ (C6, C7) =>
9+ LongDataTypeName ->
10+ a ->
11+ AnotherLongDataTypeName ->
12+ b ->
13+ c
14+ ) ->
15+ (c -> d) ->
16+ (a, b, c, d)
data/examples/declaration/signature/type/context-multi-line-out.hs+10−10
@@ -1,10 +1,10 @@
1−functionName
2− :: ( C1,
3− C2,
4− C3
5− )
6− => a
7− -> b
8− -> c
9− -> d
10− -> (a, b, c, d)
1+functionName ::
2+ ( C1,
3+ C2,
4+ C3
5+ ) =>
6+ a ->
7+ b ->
8+ c ->
9+ d ->
10+ (a, b, c, d)
data/examples/declaration/signature/type/context-single-line-out.hs+7−7
@@ -1,7 +1,7 @@
1−functionName
2− :: (C1, C2, C3)
3− => a
4− -> b
5− -> c
6− -> d
7− -> (a, b, c, d)
1+functionName ::
2+ (C1, C2, C3) =>
3+ a ->
4+ b ->
5+ c ->
6+ d ->
7+ (a, b, c, d)
data/examples/declaration/signature/type/infix-promoted-type-constructor-out.hs−1
@@ -1,3 +1,2 @@
11fun1 :: Def ('[Ref s (Stored Uint32), IBool] 'T.:-> IBool)
2−
32fun2 :: Def ('[Ref s (Stored Uint32), IBool] ':-> IBool)
data/examples/declaration/signature/type/long-function-name-out.hs+6−6
@@ -1,6 +1,6 @@
1−longFunctionName
2− :: a
3− -> b
4− -> c
5− -> d
6− -> (a, b, c, d)
1+longFunctionName ::
2+ a ->
3+ b ->
4+ c ->
5+ d ->
6+ (a, b, c, d)
data/examples/declaration/signature/type/long-multiline-applications-out.hs+16−15
@@ -1,15 +1,16 @@
1−functionName
2− :: (C1, C2, C3, C4, C5)
3− => a
4− -> b
5− -> ( LongDataTypeName
6− AnotherLongDataTypeName
7− AnotherLongDataTypeName2
8− AnotherLongDataTypeName3
9− -> a
10− -> AnotherLongDataTypeName4
11− -> b
12− -> c
13− )
14− -> (c -> d)
15− -> (a, b, c, d)
1+functionName ::
2+ (C1, C2, C3, C4, C5) =>
3+ forall a b c.
4+ a ->
5+ b ->
6+ ( LongDataTypeName
7+ AnotherLongDataTypeName
8+ AnotherLongDataTypeName2
9+ AnotherLongDataTypeName3 ->
10+ a ->
11+ AnotherLongDataTypeName4 ->
12+ b ->
13+ c
14+ ) ->
15+ (c -> d) ->
16+ (a, b, c, d)
data/examples/declaration/signature/type/long-multiline-applications.hs+2−1
@@ -1,6 +1,7 @@
11functionName
22 :: (C1, C2, C3, C4, C5)
3− => a
3+ => forall a b c
4+ . a
45 -> b
56 -> ( LongDataTypeName
67 AnotherLongDataTypeName
data/examples/declaration/signature/type/multi-value-out.hs+7−2
@@ -2,9 +2,14 @@ foo, bar :: Int
22foo = 1
33bar = 2
44
5+a, b, c :: Int
6+a = 1
7+b = 2
8+c = 3
9+
510foo,
611 bar,
7− baz
8− :: Int
12+ baz ::
13+ Int
914bar = 2
1015baz = 3
data/examples/declaration/signature/type/multi-value.hs+5
@@ -2,6 +2,11 @@ foo, bar :: Int
22foo = 1
33bar = 2
44
5+a, b, c :: Int
6+a = 1
7+b = 2
8+c = 3
9+
510foo,
611 bar,
712 baz :: Int
data/examples/declaration/signature/type/unrelated-out.hsnew file+4
@@ -0,0 +1,4 @@
1+clientFunc1 :: SomeType1
2+clientFunc2 :: SomeType2
3+clientFunc3 :: SomeType3
4+clientFunc1 :<|> clientFunc2 :<|> clientFunc3 = hoistClient foo bar baz
data/examples/declaration/signature/type/unrelated.hsnew file+4
@@ -0,0 +1,4 @@
1+clientFunc1 :: SomeType1
2+clientFunc2 :: SomeType2
3+clientFunc3 :: SomeType3
4+clientFunc1 :<|> clientFunc2 :<|> clientFunc3 = hoistClient foo bar baz
data/examples/declaration/splice/bracket-declaration-out.hs+1−1
@@ -23,4 +23,4 @@ $( singletons
2323 data T = T
2424 deriving (Eq, Ord, Enum, Bounded, Show)
2525 |]
26− )
26+ )
data/examples/declaration/splice/grouped-splices-out.hsnew file+3
@@ -0,0 +1,3 @@
1+$(deriveJSON fieldLabelMod ''A)
2+$(deriveJSON fieldLabelMod ''B)
3+$(deriveJSON fieldLabelMod ''C)
data/examples/declaration/splice/grouped-splices.hsnew file+3
@@ -0,0 +1,3 @@
1+$(deriveJSON fieldLabelMod ''A)
2+$(deriveJSON fieldLabelMod ''B)
3+$(deriveJSON fieldLabelMod ''C)
data/examples/declaration/splice/splice-decl.hs−1
@@ -15,4 +15,3 @@ foo bar
1515-- TemplateHaskell allows Q () at the top level
1616do
1717 pure []
18−
data/examples/declaration/splice/typed-splice-out.hs+1−1
@@ -2,6 +2,6 @@
22
33x =
44 $$( foo bar
5− )
5+ )
66
77x = $$foo
data/examples/declaration/splice/untyped-splice-out.hs+1−1
@@ -5,6 +5,6 @@ x = $(foo bar)
55x =
66 $( foo
77 bar
8− )
8+ )
99
1010x = $foo
data/examples/declaration/type-families/closed-type-family/multi-line-out.hs+9−8
@@ -1,7 +1,7 @@
11type family
2− Id a
3− = result
4− | result -> a where
2+ Id a =
3+ result | result -> a
4+ where
55 Id a =
66 a
77
@@ -9,15 +9,16 @@ type family
99 G
1010 (a :: k)
1111 b
12− c
13− = foo
14− | foo -> k b where
12+ c =
13+ foo | foo -> k b
14+ where
1515 G a b c =
1616 (a, b)
1717
1818type family
19− F a
20− :: * -> * where
19+ F a ::
20+ * -> *
21+ where
2122 F Int = Double
2223 F Bool =
2324 Char
data/examples/declaration/type-families/closed-type-family/simple-out.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Documentation.
24type family F a :: * -> * where
35 F Int = Double
data/examples/declaration/type-families/closed-type-family/simple.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Documentation.
24
35type family F a :: * -> * where
data/examples/declaration/type-families/closed-type-family/with-equal-sign-out.hsnew file+2
@@ -0,0 +1,2 @@
1+type family TF a b = result where
2+ TF a b = Int
data/examples/declaration/type-families/closed-type-family/with-equal-sign.hsnew file+2
@@ -0,0 +1,2 @@
1+type family TF a b = result where
2+ TF a b = Int
data/examples/declaration/type-families/closed-type-family/with-forall-out.hsnew file+3
@@ -0,0 +1,3 @@
1+type family G a b where
2+ forall x y. G [x] (Proxy y) = Double
3+ forall z. z `G` z = Bool
data/examples/declaration/type-families/closed-type-family/with-forall.hsnew file+3
@@ -0,0 +1,3 @@
1+type family G a b where
2+ forall x y. G [x] (Proxy y) = Double
3+ forall z. z `G` z = Bool
data/examples/declaration/type-families/data-family/no-annotation-out.hs+2
@@ -1,2 +1,4 @@
1+module Main where
2+
13-- | Documentation.
24data family Array e
data/examples/declaration/type-families/data-family/no-annotation.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Documentation.
24
35data family Array e
data/examples/declaration/type-families/data-family/simple-out.hs+2
@@ -1,2 +1,4 @@
1+module Main where
2+
13-- | Documentation.
24data family GMap k :: Type -> Type
data/examples/declaration/type-families/data-family/simple.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Documentation.
24
35data family GMap k :: Type -> Type
data/examples/declaration/type-families/type-family/no-annotation-out.hs+2
@@ -1,2 +1,4 @@
1+module Main where
2+
13-- | Documentation.
24type family F a b :: Type -> Type
data/examples/declaration/type-families/type-family/no-annotation.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Documentation.
24
35type family F a b :: Type -> Type
data/examples/declaration/type-families/type-family/operator-out.hsnew file+3
@@ -0,0 +1,3 @@
1+type family a ! b
2+
3+type family a . b
data/examples/declaration/type-families/type-family/operator.hsnew file+2
@@ -0,0 +1,2 @@
1+type family a ! b
2+type family a . b
data/examples/declaration/type-families/type-family/simple-out.hs+2
@@ -1,2 +1,4 @@
1+module Main where
2+
13-- | Documentation.
24type family Elem c :: Type
data/examples/declaration/type-families/type-family/simple.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Documentation.
24
35type family Elem c :: Type
data/examples/declaration/type-synonyms/multi-line-out.hs+12−15
@@ -1,21 +1,18 @@
1−type Foo a b c
2− = Bar c a b
1+type Foo a b c =
2+ Bar c a b
33
44type Foo
55 a
66 b
7− c
8− = Bar c a b
7+ c =
8+ Bar c a b
99
10−type Foo
11− = Bar
12− Baz
13− Quux
10+type Foo =
11+ Bar
12+ Baz
13+ Quux
1414
15−type API
16− = "route1" :> ApiRoute1
17− :<|> "route2"
18− :> ApiRoute2 -- comment here
19− :<|> OmitDocs
20− :> "i"
21− :> ASomething API
15+type API =
16+ "route1" :> ApiRoute1
17+ :<|> "route2" :> ApiRoute2 -- comment here
18+ :<|> OmitDocs :> "i" :> ASomething API
data/examples/declaration/type-synonyms/multi-line.hs−3
@@ -15,6 +15,3 @@ type API
1515 = "route1" :> ApiRoute1
1616 :<|> "route2" :> ApiRoute2 -- comment here
1717 :<|> OmitDocs :> "i" :> ASomething API
18−
19−
20−
data/examples/declaration/type-synonyms/simple-out.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Documentation.
24type Foo a b c = Bar c a b
35
data/examples/declaration/type-synonyms/simple.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Documentation.
24
35type Foo a b c = Bar c a b
data/examples/declaration/type-synonyms/with-weird-haddock-out.hsnew file+3
@@ -0,0 +1,3 @@
1+type Elims =
2+ -- | eliminations ordered left-to-right.
3+ [Elim]
data/examples/declaration/type-synonyms/with-weird-haddock.hsnew file+1
@@ -0,0 +1 @@
1+type Elims = [Elim] -- ^ eliminations ordered left-to-right.
data/examples/declaration/type/forall-out.hsnew file+4
@@ -0,0 +1,4 @@
1+type CoerceLocalSig m m' =
2+ forall r a.
3+ LocalSig m r a ->
4+ LocalSig m' r a
data/examples/declaration/type/forall.hsnew file+4
@@ -0,0 +1,4 @@
1+type CoerceLocalSig m m' =
2+ forall r a.
3+ LocalSig m r a ->
4+ LocalSig m' r a
data/examples/declaration/type/lits-out.hsnew file+6
@@ -0,0 +1,6 @@
1+type A = "foo"
2+
3+type B =
4+ "foo\
5+ \bar" ->
6+ ()
data/examples/declaration/type/lits.hsnew file+4
@@ -0,0 +1,4 @@
1+type A = "foo"
2+
3+type B = "foo\
4+ \bar" -> ()
data/examples/declaration/type/type-applications-out.hsnew file+3
@@ -0,0 +1,3 @@
1+{-# LANGUAGE TypeApplications #-}
2+
3+type P = K @Bool @(Bool :: *) 'True 'False
data/examples/declaration/type/type-applications.hsnew file+3
@@ -0,0 +1,3 @@
1+{-# LANGUAGE TypeApplications #-}
2+
3+type P = K @Bool @(Bool :: *) 'True 'False
data/examples/declaration/type/visible-forall-out.hsnew file+2
@@ -0,0 +1,2 @@
1+-- source: https://github.com/ghc-proposals/ghc-proposals/blob/master/proposals/0081-forall-arrow.rst
2+data T :: forall k -> k -> Type
data/examples/declaration/type/visible-forall.hsnew file+2
@@ -0,0 +1,2 @@
1+-- source: https://github.com/ghc-proposals/ghc-proposals/blob/master/proposals/0081-forall-arrow.rst
2+data T :: forall k -> k -> Type
data/examples/declaration/value/function/application-0-out.hsnew file+17
@@ -0,0 +1,17 @@
1+foo =
2+ f1
3+ p1
4+ p2
5+ p3
6+
7+foo' =
8+ f2
9+ p1
10+ p2
11+ p3
12+
13+foo'' =
14+ f3
15+ p1
16+ p2
17+ p3
data/examples/declaration/value/function/application-0.hsnew file+12
@@ -0,0 +1,12 @@
1+foo =
2+ f1
3+ p1
4+ p2 p3
5+
6+foo' = f2 p1
7+ p2
8+ p3
9+
10+foo'' =
11+ f3 p1 p2
12+ p3
data/examples/declaration/value/function/application-1-out.hsnew file+19
@@ -0,0 +1,19 @@
1+main =
2+ do
3+ x
4+ y
5+ z
6+
7+main =
8+ case foo of
9+ x -> a
10+ foo
11+ a
12+ b
13+
14+main =
15+ do
16+ if x then y else z
17+ foo
18+ a
19+ b
data/examples/declaration/value/function/application-1.hsnew file+14
@@ -0,0 +1,14 @@
1+main =
2+ do
3+ x
4+ y
5+ z
6+
7+main =
8+ case foo of
9+ x -> a
10+ foo a b
11+
12+main = do
13+ if x then y else z
14+ foo a b
data/examples/declaration/value/function/arg-breakpoints-out.hsnew file+3
@@ -0,0 +1,3 @@
1+foo
2+ bar =
3+ body
data/examples/declaration/value/function/arg-breakpoints.hsnew file+3
@@ -0,0 +1,3 @@
1+foo
2+ bar =
3+ body
data/examples/declaration/value/function/arithmetic-sequences-out.hs+2−2
@@ -5,13 +5,13 @@ foo' = [0 .. 5]
55bar x =
66 [ 0
77 .. x
8− ]
8+ ]
99
1010baz x =
1111 [ 1,
1212 3
1313 .. x
14− ]
14+ ]
1515
1616barbaz x = [0, 1 ..]
1717
data/examples/declaration/value/function/arrow/expression-applications-out.hsdeleted−9
@@ -1,9 +0,0 @@
1−{-# LANGUAGE Arrows #-}
2−
3−foo x y = x -< y
4−
5−bar f x =
6− f x -< -- Hello
7− x -- World
8−
9−baz x y = x -<< y
data/examples/declaration/value/function/arrow/expression-applications.hsdeleted−9
@@ -1,9 +0,0 @@
1−{-# LANGUAGE Arrows #-}
2−
3−foo x y = x -< y
4−
5−bar f x
6− = f x -- Hello
7− -< x -- World
8−
9−baz x y = x -<< y
data/examples/declaration/value/function/arrow/expression-forms-out.hsdeleted−13
@@ -1,13 +0,0 @@
1−{-# LANGUAGE Arrows #-}
2−
3−foo f g x y = (|test (f -< x) (g -< y)|)
4−
5−bar f g x y =
6− (| test
7− ( f -<
8− x
9− )
10− ( g -<
11− y
12− )
13− |)
data/examples/declaration/value/function/arrow/expression-forms.hsdeleted−11
@@ -1,11 +0,0 @@
1−{-# LANGUAGE Arrows #-}
2−
3−foo f g x y = (| test (f -< x) (g -< y) |)
4−
5−bar f g x y = (|
6− test
7− (f
8− -< x)
9− (g
10− -< y)
11− |)
data/examples/declaration/value/function/arrow/multiline-case-out.hsnew file+8
@@ -0,0 +1,8 @@
1+{-# LANGUAGE Arrows #-}
2+
3+f = proc x -> do
4+ x <-
5+ case x of X -> x
6+ -<
7+ y
8+ a -< b
data/examples/declaration/value/function/arrow/multiline-case.hsnew file+7
@@ -0,0 +1,7 @@
1+{-# LANGUAGE Arrows #-}
2+
3+f = proc x -> do
4+ x
5+ <- case x of X -> x
6+ -< y
7+ a -< b
data/examples/declaration/value/function/arrow/proc-applications-out.hs+5−4
@@ -9,10 +9,11 @@ bar f x =
99 w
1010 )
1111 ->
12− f -< -- The value
13− ( x, -- Foo
14− w, -- Bar
15− z -- Baz
12+ f -- The value
13+ -<
14+ ( x, -- Foo
15+ w, -- Bar
16+ z -- Baz
1617 )
1718
1819baz x = proc a -> a -<< x
data/examples/declaration/value/function/arrow/proc-do-complex-out.hs+27−26
@@ -16,16 +16,16 @@ foo
1616 f -- Call into f
1717 ( a,
1818 c -- Tuple together arguments
19− )
19+ )
2020 ( b,
2121 d
22− ) -<
23− ( b + 1, -- Funnel into arrow
24− d * b
22+ )
23+ -<
24+ ( b + 1, -- Funnel into arrow
25+ d * b
2526 )
2627 if x `mod` y == 0 -- Basic condition
27− then
28− case e of -- Only left case is relevant
28+ then case e of -- Only left case is relevant
2929 Left
3030 ( z,
3131 w
@@ -33,29 +33,30 @@ foo
3333 let v =
3434 u -- Actually never used
3535 ^ 2
36− in ( returnA -<
37− -- Just do the calculation
38− (x + y * z)
39− )
40− else
41− do
36+ in ( returnA
37+ -<
38+ -- Just do the calculation
39+ (x + y * z)
40+ )
41+ else do
4242 let u = x -- Let bindings bind expressions, not commands
43− -- Could pattern match directly on x
44− i <-
45− case u of
46− 0 -> (g . h -< u)
47− n ->
48− ( ( h . g -<
43+ -- Could pattern match directly on x
44+ i <- case u of
45+ 0 -> (g . h -< u)
46+ n ->
47+ ( ( h . g
48+ -<
4949 y -- First actual use of y
50− )
51− )
50+ )
51+ )
5252 returnA -< ()
5353 -- Sometimes execute effects
5454 if i > 0
55− then ma -< ()
56− else returnA -< ()
57− returnA -<
58− ( i
59− + x
60− * y -- Just do the calculation
55+ then ma -< ()
56+ else returnA -< ()
57+ returnA
58+ -<
59+ ( i
60+ + x
61+ * y -- Just do the calculation
6162 )
data/examples/declaration/value/function/arrow/proc-do-simple1-out.hs+3−2
@@ -13,5 +13,6 @@ barbaz f g = proc (a, b) -> do
1313
1414bazbar f = proc a -> do
1515 a <-
16− f -<
17− a
16+ f
17+ -<
18+ a
data/examples/declaration/value/function/arrow/proc-do-simple2-out.hs+8−6
@@ -11,10 +11,12 @@ bazbaz f g h = proc (a, b, c) -> do
1111 z <-
1212 h
1313 x
14− y -<
15− ( a,
16− b,
17− c
14+ y
15+ -<
16+ ( a,
17+ b,
18+ c
1819 )
19− returnA -<
20− (x, y, z)
20+ returnA
21+ -<
22+ (x, y, z)
data/examples/declaration/value/function/arrow/proc-forms1-out.hs+16−13
@@ -1,18 +1,21 @@
11{-# LANGUAGE Arrows #-}
22
3−foo0 f g x y = proc _ -> (|f (g -< (x, y))|)
3+foo0 f g x y = proc _ -> (| f (g -< (x, y)) |)
44
55foo1 f g h x =
66 proc (y, z) ->
7− (| test
8− ( h f
9− . h g -<
10− y x
11− . y z
12− )
13− ( h g
14− . h f -<
15− y z
16− . y x
17− )
18− |)
7+ (|
8+ test
9+ ( h f
10+ . h g
11+ -<
12+ y x
13+ . y z
14+ )
15+ ( h g
16+ . h f
17+ -<
18+ y z
19+ . y x
20+ )
21+ |)
data/examples/declaration/value/function/arrow/proc-forms2-out.hs+11−7
@@ -2,17 +2,21 @@
22
33bar0 f g h x =
44 proc (y, z) ->
5− (|test (h f . (h g) -< (y x) . y z) ((h g) . h f -< y z . (y x))|)
5+ (| test (h f . (h g) -< (y x) . y z) ((h g) . h f -< y z . (y x)) |)
66
7−bar1 f g x y = proc _ -> f -< x &&& g -< y
7+bar1 f g x y = proc _ -> (f -< x) &&& (g -< y)
88
99bar2 f g h x =
1010 proc (y, z) ->
11− h f . (h g) -< (y x) . y z ||| (h g) . h f -< y z . (y x)
11+ (h f . (h g) -< (y x) . y z) ||| ((h g) . h f -< y z . (y x))
1212
1313bar3 f g h x =
1414 proc (y, z) ->
15− (h f . h g) -<
16− (y x) . y z
17− ||| (h g . h f) -<
18− y z . (y x)
15+ ( (h f . h g)
16+ -<
17+ (y x) . y z
18+ ) |||
19+ ( (h g . h f)
20+ -<
21+ y z . (y x)
22+ )
data/examples/declaration/value/function/arrow/proc-forms2.hs+6−6
@@ -4,16 +4,16 @@ bar0 f g h x =
44 proc (y, z) ->
55 (| test (h f.(h g) -< (y x).y z)((h g) . h f-<y z . (y x)) |)
66
7−bar1 f g x y = proc _ -> f -< x&&&g -< y
7+bar1 f g x y = proc _ -> (f -< x)&&&(g -< y)
88
99bar2 f g h x =
1010 proc (y, z) ->
11− h f.(h g) -< (y x).y z ||| (h g) . h f-<y z . (y x)
11+ (h f.(h g) -< (y x).y z) ||| ((h g) . h f-<y z . (y x))
1212
1313bar3 f g h x =
1414 proc (y, z) ->
15− (h f.h g)
16− -< (y x).y z
15+ ((h f.h g)
16+ -< (y x).y z)
1717 |||
18− (h g . h f)
19− -<y z . (y x)
18+ ((h g . h f)
19+ -<y z . (y x))
data/examples/declaration/value/function/arrow/proc-ifs-out.hs+9−7
@@ -4,10 +4,12 @@ foo f = proc a -> if a then f -< 0 else f -< 1
44
55bar f g = proc a ->
66 if f a
7− then
8− f
9− . g -<
10− a
11− else
12− g -<
13− b
7+ then
8+ f
9+ . g
10+ -<
11+ a
12+ else
13+ g
14+ -<
15+ b
data/examples/declaration/value/function/arrow/proc-lets-out.hs+1−1
@@ -9,4 +9,4 @@ bar f g = proc a ->
99 j =
1010 g
1111 . h
12− in id -< (h, j)
12+ in id -< (h, j)
data/examples/declaration/value/function/arrow/proc-parentheses-out.hs+6−5
@@ -5,14 +5,15 @@ foo f = proc a -> (f -< a)
55bar f g = proc a ->
66 ( ( (f)
77 ( g
8− )
9− ) -<
10− ( ( ( ( ( ( g
11− a
8+ )
9+ )
10+ -<
11+ ( ( ( ( ( ( g
12+ a
1213 )
1314 )
1415 )
1516 )
1617 )
1718 )
18− )
19+ )
data/examples/declaration/value/function/arrow/recursive-procs-out.hs+13−9
@@ -3,17 +3,21 @@
33foo f g = proc (x, y) -> do
44 rec a <- f y -< x
55 b <-
6− g x -<
7− y
8− bar -<
9− ( a,
10− b
6+ g x
7+ -<
8+ y
9+ bar
10+ -<
11+ ( a,
12+ b
1113 )
1214 rec p <-
1315 f
14− p -<
15− a
16+ p
17+ -<
18+ a
1619 rec q <-
1720 g
18− q -<
19− b
21+ q
22+ -<
23+ b
data/examples/declaration/value/function/awkward-comment-0-out.hsnew file+6
@@ -0,0 +1,6 @@
1+mergeErrorReply :: ParseError -> Reply s u a -> Reply s u a
2+mergeErrorReply err1 reply -- XXX where to put it?
3+ =
4+ case reply of
5+ Ok x state err2 -> Ok x state (mergeError err1 err2)
6+ Error err2 -> Error (mergeError err1 err2)
data/examples/declaration/value/function/awkward-comment-0.hsnew file+5
@@ -0,0 +1,5 @@
1+mergeErrorReply :: ParseError -> Reply s u a -> Reply s u a
2+mergeErrorReply err1 reply -- XXX where to put it?
3+ = case reply of
4+ Ok x state err2 -> Ok x state (mergeError err1 err2)
5+ Error err2 -> Error (mergeError err1 err2)
data/examples/declaration/value/function/awkward-comment-1-out.hsnew file+9
@@ -0,0 +1,9 @@
1+doForeign :: Vars -> [Name] -> [Term] -> Idris LExp
2+doForeign x = x
3+ where
4+ splitArg tm | (_, [_, _, l, r]) <- unApply tm -- pair, two implicits
5+ =
6+ do
7+ let l' = toFDesc l
8+ r' <- irTerm (sMN 0 "__foreignCall") vs env r
9+ return (l', r')
data/examples/declaration/value/function/awkward-comment-1.hsnew file+7
@@ -0,0 +1,7 @@
1+doForeign :: Vars -> [Name] -> [Term] -> Idris LExp
2+doForeign x = x
3+ where
4+ splitArg tm | (_, [_,_,l,r]) <- unApply tm -- pair, two implicits
5+ = do let l' = toFDesc l
6+ r' <- irTerm (sMN 0 "__foreignCall") vs env r
7+ return (l', r')
data/examples/declaration/value/function/blank-lines-let-out.hsnew file+6
@@ -0,0 +1,6 @@
1+foo =
2+ let x = 10
3+
4+ y = 11
5+ z = 12
6+ in x + y + z
data/examples/declaration/value/function/blank-lines-let.hsnew file+9
@@ -0,0 +1,9 @@
1+foo =
2+ let
3+
4+ x = 10
5+
6+ y = 11
7+ z = 12
8+
9+ in x + y + z
data/examples/declaration/value/function/blank-lines-where-out.hsnew file+6
@@ -0,0 +1,6 @@
1+foo = x + y + z
2+ where
3+ x = 10
4+
5+ y = 11
6+ z = 12
data/examples/declaration/value/function/blank-lines-where.hsnew file+7
@@ -0,0 +1,7 @@
1+foo = x + y + z
2+ where
3+
4+ x = 10
5+
6+ y = 11
7+ z = 12
data/examples/declaration/value/function/block-arguments-out.hs+14−10
@@ -1,13 +1,11 @@
11f1 = foo do bar
22
3−f2 =
4− foo do
5− bar
3+f2 = foo do
4+ bar
65
7−f3 =
8− foo case True of
9− True -> bar
10− False -> baz
6+f3 = foo case True of
7+ True -> bar
8+ False -> baz
119
1210f4 = foo let a = 3 in b
1311
@@ -25,6 +23,12 @@ f6 =
2523
2624f7 = foo \x -> y
2725
28−f8 =
29− foo \x ->
30− y
26+f8 = foo \x ->
27+ y
28+
29+f9 = foo do { bar } baz
30+
31+f10 = foo
32+ do a
33+ do b
34+ do c
data/examples/declaration/value/function/block-arguments.hs+7
@@ -21,3 +21,10 @@ f7 = foo \x -> y
2121
2222f8 = foo \x ->
2323 y
24+
25+f9 = foo do { bar } baz
26+
27+f10 = foo
28+ do { a }
29+ do { b }
30+ do c
data/examples/declaration/value/function/case-multi-line-guards-out.hs+4−2
@@ -9,6 +9,8 @@ withGuards x =
99 _ -> 20
1010
1111case x of
12− '-' | not isUrl ->
12+ '-' | not isUrl -> case xs of
13+ _ -> emitc '-'
14+ '*' | not isUrl ->
1315 case xs of
14− _ -> emitc '-'
16+ _ -> emitc '*'
data/examples/declaration/value/function/case-multi-line-guards.hs+3
@@ -10,3 +10,6 @@ withGuards x =
1010case x of
1111 '-' | not isUrl -> case xs of
1212 _ -> emitc '-'
13+ '*' | not isUrl ->
14+ case xs of
15+ _ -> emitc '*'
data/examples/declaration/value/function/complex-list-out.hs+2−2
@@ -4,7 +4,7 @@ handleStuff =
44 something,
55 \ExceptionB ->
66 somethingElse
7− ]
7+ ]
88
99handleStuff =
1010 handle
@@ -12,4 +12,4 @@ handleStuff =
1212 bar,
1313 baz
1414 qux
15− ]
15+ ]
data/examples/declaration/value/function/comprehension/transform-multi-line1-out.hs+5−4
@@ -3,9 +3,10 @@
33foo' xs ys =
44 [ ( x,
55 y
6− )
6+ )
77 | x <- xs,
88 y <- ys,
9− -- First comment
10− then reverse -- Second comment
11− ]
9+ then
10+ -- First comment
11+ reverse -- Second comment
12+ ]
data/examples/declaration/value/function/comprehension/transform-multi-line2-out.hs+6−5
@@ -3,13 +3,14 @@
33bar' xs ys =
44 [ ( x,
55 y
6− )
6+ )
77 | x <- xs,
88 y <- ys,
9− -- First comment
10− then sortWith
9+ then
10+ -- First comment
11+ sortWith
1112 by
1213 ( x
1314 + y -- Second comment
14− )
15− ]
15+ )
16+ ]
data/examples/declaration/value/function/comprehension/transform-multi-line3-out.hs+5−4
@@ -3,9 +3,10 @@
33baz' xs ys =
44 [ ( x,
55 y
6− )
6+ )
77 | x <- xs,
88 y <- ys,
9− -- First comment
10− then group using permutations -- Second comment
11− ]
9+ then group using
10+ -- First comment
11+ permutations -- Second comment
12+ ]
data/examples/declaration/value/function/comprehension/transform-multi-line3.hs−1
@@ -10,4 +10,3 @@ baz' xs ys = [
1010 using -- First comment
1111 permutations -- Second comment
1212 ]
13−
data/examples/declaration/value/function/comprehension/transform-multi-line4-out.hs+7−6
@@ -3,14 +3,15 @@
33quux' xs ys =
44 [ ( x,
55 y
6− )
6+ )
77 | x <- xs,
88 y <- ys,
9− -- First comment
109 then group by
10+ -- First comment
1111 ( x
1212 + y
13− )
14− -- Second comment
15− using groupWith -- Third comment
16− ]
13+ )
14+ using
15+ -- Second comment
16+ groupWith -- Third comment
17+ ]
data/examples/declaration/value/function/do/applications-and-parens-out.hsnew file+9
@@ -0,0 +1,9 @@
1+warningFor var place = do
2+ guard $ isVariableName var
3+ guard . not $ isInArray var place || isGuarded place
4+ ( if includeGlobals || isLocal var
5+ then warningForLocals
6+ else warningForGlobals
7+ )
8+ var
9+ place
data/examples/declaration/value/function/do/applications-and-parens.hsnew file+6
@@ -0,0 +1,6 @@
1+warningFor var place = do
2+ guard $ isVariableName var
3+ guard . not $ isInArray var place || isGuarded place
4+ (if includeGlobals || isLocal var
5+ then warningForLocals
6+ else warningForGlobals) var place
data/examples/declaration/value/function/do/blocks-out.hs+1
@@ -15,4 +15,5 @@ readInClause = do
1515 <|> do
1616 optional g_Semi
1717 void allspacing
18+
1819 return things
data/examples/declaration/value/function/do/comment-alignment-out.hsnew file+9
@@ -0,0 +1,9 @@
1+main = do
2+ case blah of
3+ Nothing -> return ()
4+ Just xs -> do
5+ forM_ xs foo
6+ bar
7+ -- and here it goes
8+ unless bobla $
9+ quux
data/examples/declaration/value/function/do/comment-alignment.hsnew file+9
@@ -0,0 +1,9 @@
1+main = do
2+ case blah of
3+ Nothing -> return ()
4+ Just xs -> do
5+ forM_ xs foo
6+ bar
7+ -- and here it goes
8+ unless bobla $
9+ quux
data/examples/declaration/value/function/do/comment-spacing-out.hsnew file+7
@@ -0,0 +1,7 @@
1+foo = do
2+ bar
3+ -- foo
4+ baz
5+
6+ -- foo
7+ quux
data/examples/declaration/value/function/do/comment-spacing.hsnew file+7
@@ -0,0 +1,7 @@
1+foo = do
2+ bar
3+ -- foo
4+ baz
5+
6+ -- foo
7+ quux
data/examples/declaration/value/function/do/expr.hs−1
@@ -8,4 +8,3 @@ quux = something $ do
88 then x
99 else y
1010 baz
11−
data/examples/declaration/value/function/do/hang-rhs-arrow-out.hsnew file+9
@@ -0,0 +1,9 @@
1+foo = do
2+ something <- case bar of
3+ Foo -> return 1
4+ Bar -> return 2
5+ somethingElse <-
6+ case boom of
7+ Foo -> return 1
8+ Bar -> return 2
9+ quux something somethingElse
data/examples/declaration/value/function/do/hang-rhs-arrow.hsnew file+9
@@ -0,0 +1,9 @@
1+foo = do
2+ something <- case bar of
3+ Foo -> return 1
4+ Bar -> return 2
5+ somethingElse <-
6+ case boom of
7+ Foo -> return 1
8+ Bar -> return 2
9+ quux something somethingElse
data/examples/declaration/value/function/do/hanging-out.hsdeleted

No changes to the content.

data/examples/declaration/value/function/do/hanging.hsdeleted

No changes to the content.

data/examples/declaration/value/function/do/operator-and-parens-out.hsnew file+7
@@ -0,0 +1,7 @@
1+scientifically :: (Scientific -> a) -> Parser a
2+scientifically h = do
3+ something
4+ ( I.satisfy (\w -> w == 'e' || w == 'E')
5+ *> fmap (h . Sci.scientific signedCoeff . (e +)) (signed decimal)
6+ )
7+ <|> return (h $ Sci.scientific signedCoeff e)
data/examples/declaration/value/function/do/operator-and-parens.hsnew file+7
@@ -0,0 +1,7 @@
1+scientifically :: (Scientific -> a) -> Parser a
2+scientifically h = do
3+ something
4+ ( I.satisfy (\w -> w == 'e' || w == 'E')
5+ *> fmap (h . Sci.scientific signedCoeff . (e +)) (signed decimal)
6+ )
7+ <|> return (h $ Sci.scientific signedCoeff e)
data/examples/declaration/value/function/do/recursive-do-rec-out.hs+5
@@ -2,13 +2,18 @@
22
33foo = do
44 rec a <- b + 5
5+
56 let d = c
7+
68 b <- a * 5
9+
710 something
11+
812 c <- a + b
913 print c
1014 rec something $ do
1115 x <- a
1216 print x
17+
1318 y <- c
1419 print y
data/examples/declaration/value/function/explicit-type-out.hs+2−2
@@ -1,5 +1,5 @@
11foo = 5 :: Int
22
33bar =
4− 5
5− :: Int
4+ 5 ::
5+ Int
data/examples/declaration/value/function/fancy-forall-0-out.hsnew file+10
@@ -0,0 +1,10 @@
1+wrapError ::
2+ forall outertag innertag t outer inner m a.
3+ ( forall x. Coercible (t m x) (m x),
4+ forall m'.
5+ HasCatch outertag outer m' =>
6+ HasCatch innertag inner (t m'),
7+ HasCatch outertag outer m
8+ ) =>
9+ (forall m'. HasCatch innertag inner m' => m' a) ->
10+ m a
data/examples/declaration/value/function/fancy-forall-0.hsnew file+6
@@ -0,0 +1,6 @@
1+wrapError :: forall outertag innertag t outer inner m a.
2+ ( forall x. Coercible (t m x) (m x)
3+ , forall m'. HasCatch outertag outer m'
4+ => HasCatch innertag inner (t m')
5+ , HasCatch outertag outer m )
6+ => (forall m'. HasCatch innertag inner m' => m' a) -> m a
data/examples/declaration/value/function/fancy-forall-1-out.hsnew file+10
@@ -0,0 +1,10 @@
1+magnify ::
2+ forall outertag innertag t outer inner m a.
3+ ( forall x. Coercible (t m x) (m x),
4+ forall m'.
5+ HasReader outertag outer m' =>
6+ HasReader innertag inner (t m'),
7+ HasReader outertag outer m
8+ ) =>
9+ (forall m'. HasReader innertag inner m' => m' a) ->
10+ m a
data/examples/declaration/value/function/fancy-forall-1.hsnew file+6
@@ -0,0 +1,6 @@
1+magnify :: forall outertag innertag t outer inner m a.
2+ ( forall x. Coercible (t m x) (m x)
3+ , forall m'. HasReader outertag outer m'
4+ => HasReader innertag inner (t m')
5+ , HasReader outertag outer m )
6+ => (forall m'. HasReader innertag inner m' => m' a) -> m a
data/examples/declaration/value/function/if-with-comment-out.hsnew file+8
@@ -0,0 +1,8 @@
1+foo =
2+ if undefined
3+ then -- then comment
4+ undefined
5+ else -- else comment
6+
7+ do
8+ undefined
data/examples/declaration/value/function/if-with-comment.hsnew file+8
@@ -0,0 +1,8 @@
1+foo =
2+ if undefined
3+ -- then comment
4+ then undefined
5+ -- else comment
6+ else
7+ do
8+ undefined
data/examples/declaration/value/function/implicit-params-out.hs+8−7
@@ -1,15 +1,16 @@
11{-# LANGUAGE ImplicitParams #-}
22
33sortBy :: (a -> a -> Bool) -> [a] -> [a]
4+sortBy = undefined
45
56sort :: (?cmp :: a -> a -> Bool) => [a] -> [a]
67sort = sortBy ?cmp
78
8−sort'
9− :: ( ?cmp
10− :: a -> a -> Bool,
11− ?foo :: Int
12− )
13− => [a]
14− -> [a]
9+sort' ::
10+ ( ?cmp ::
11+ a -> a -> Bool,
12+ ?foo :: Int
13+ ) =>
14+ [a] ->
15+ [a]
1516sort' = sort
data/examples/declaration/value/function/implicit-params.hs+2
@@ -1,6 +1,8 @@
11{-# LANGUAGE ImplicitParams #-}
22sortBy :: (a -> a -> Bool) -> [a] -> [a]
33
4+sortBy = undefined
5+
46sort :: (?cmp :: a -> a -> Bool) => [a] -> [a]
57sort = sortBy ?cmp
68
data/examples/declaration/value/function/infix/applicative.hs−2
@@ -1,6 +1,4 @@
1−
21f =
32 Foo <$> bar
43 <*> baz
54 <*> baz'
6−
data/examples/declaration/value/function/infix/comments-out.hs+3−5
@@ -1,10 +1,8 @@
11main =
2− bar
3− $ baz -- bar
4− -- baz
2+ bar $ -- bar
3+ baz -- baz
54
6−bar
7− $
5+bar $
86 {- foo
97 -}
108 bar
data/examples/declaration/value/function/infix/dollar-chains-out.hsnew file+22
@@ -0,0 +1,22 @@
1+module Main where
2+
3+foo =
4+ fmap escapeLeadingDollar
5+ . dropPaddingSpace
6+ . dropWhileEnd T.null
7+ . fmap (T.stripEnd . T.pack)
8+ . lines
9+ $ unpackHDS docStr
10+
11+foo =
12+ when (GHC.xopt Cpp dynFlags && not cfgTolerateCpp) $
13+ throwIO (OrmoluCppEnabled path)
14+
15+foo =
16+ bar $
17+ baz $
18+ quux
19+
20+x =
21+ case l of { A -> B } $
22+ case q of r -> s
data/examples/declaration/value/function/infix/dollar-chains.hsnew file+22
@@ -0,0 +1,22 @@
1+module Main where
2+
3+foo =
4+ fmap escapeLeadingDollar
5+ . dropPaddingSpace
6+ . dropWhileEnd T.null
7+ . fmap (T.stripEnd . T.pack)
8+ . lines
9+ $ unpackHDS docStr
10+
11+foo =
12+ when (GHC.xopt Cpp dynFlags && not cfgTolerateCpp) $
13+ throwIO (OrmoluCppEnabled path)
14+
15+foo =
16+ bar
17+ $ baz
18+ $ quux
19+
20+x =
21+ case l of { A -> B } $
22+ case q of r -> s
data/examples/declaration/value/function/infix/hanging-out.hs+7−6
@@ -4,9 +4,9 @@ f = unFoo . foo bar baz 3 $ do
44
55g = unFoo
66 . foo
7− bar
8− baz
9− 3
7+ bar
8+ baz
9+ 3
1010 $ do
1111 act
1212 ret
@@ -17,6 +17,7 @@ update =
1717 `catch` \case
1818 a -> a
1919
20−foo = bar
21− ++ case foo of
22− a -> a
20+foo =
21+ bar
22+ ++ case foo of
23+ a -> a
data/examples/declaration/value/function/infix/lenses-out.hs+20−10
@@ -1,11 +1,21 @@
11lenses =
2− Just $ M.fromList
3− $ "type"
4− .= ("user.connection" :: Text)
5− # "connection"
6− .= uc
7− # "user"
8− .= case name of
9− Just n -> Just $ object ["name" .= n]
10− Nothing -> Nothing
11− # []
2+ Just $
3+ M.fromList $
4+ "type" .= ("user.connection" :: Text)
5+ # "connection" .= uc
6+ # "user" .= case name of
7+ Just n -> Just $ object ["name" .= n]
8+ Nothing -> Nothing
9+ # []
10+
11+foo =
12+ a
13+ & b .~ 2
14+ & c .~ 3
15+
16+wreq =
17+ let opts =
18+ defaults & auth ?~ awsAuth AWSv4 "key" "secret"
19+ & header "Accept" .~ ["application/json"]
20+ & header "Runscope-Bucket-Auth" .~ ["1example-1111-4yyyy-zzzz-xxxxxxxx"]
21+ in getWith opts
data/examples/declaration/value/function/infix/lenses.hs+9
@@ -5,3 +5,12 @@ lenses = Just $ M.fromList
55 Just n -> Just $ object ["name" .= n]
66 Nothing -> Nothing
77 # []
8+
9+foo = a
10+ & b .~ 2 & c .~ 3
11+
12+wreq =
13+ let opts = defaults & auth ?~ awsAuth AWSv4 "key" "secret"
14+ & header "Accept" .~ ["application/json"]
15+ & header "Runscope-Bucket-Auth" .~ ["1example-1111-4yyyy-zzzz-xxxxxxxx"]
16+ in getWith opts
data/examples/declaration/value/function/lambda-multi-line1-out.hs+3−3
@@ -9,7 +9,7 @@ bar x = \y ->
99 else 12
1010
1111foo =
12− prop "is inverse to closure"
13− $ \(f :: StaticPtr (Int -> Int))
14− (x :: Int) ->
12+ prop "is inverse to closure" $
13+ \(f :: StaticPtr (Int -> Int))
14+ (x :: Int) ->
1515 (unclosure . closure) f x == deRefStaticPtr f x
data/examples/declaration/value/function/lambda-multi-line2-out.hs+4−4
@@ -3,10 +3,10 @@ tricky0 =
33 canUnify poly_given_ok wt gt || go False wt gt
44
55tricky1 =
6− flip all (zip ws gs)
7− $ \(wt, gt) -> canUnify poly_given_ok wt gt || go False wt gt
6+ flip all (zip ws gs) $
7+ \(wt, gt) -> canUnify poly_given_ok wt gt || go False wt gt
88
99tricky2 =
10− flip all (zip ws gs)
11− $ \(wt, gt) ->
10+ flip all (zip ws gs) $
11+ \(wt, gt) ->
1212 canUnify poly_given_ok wt gt || go False wt gt
data/examples/declaration/value/function/lambda-single-line-out.hs+2
@@ -1,3 +1,5 @@
1+{-# LANGUAGE BangPatterns #-}
2+
13foo :: a -> a -> a
24foo x = \y -> x
35
data/examples/declaration/value/function/lambda-single-line.hs+2
@@ -1,3 +1,5 @@
1+{-# LANGUAGE BangPatterns #-}
2+
13foo :: a -> a -> a
24foo x = \y -> x
35
data/examples/declaration/value/function/let-multi-line-out.hs+3−3
@@ -23,6 +23,6 @@ implicitParams =
2323 in foo cs
2424
2525sitting =
26− foo
27− $ let x = 20
28− in x
26+ foo $
27+ let x = 20
28+ in x
data/examples/declaration/value/function/let-single-line-out.hs−1
@@ -5,7 +5,6 @@ foo x = let x = z where { z = 2 }; a = 3 in x
55foo x = let g :: Int -> Int; g = id in ()
66
77let a = b; c = do { foo; bar }; d = baz in b
8−
98let a = case True of { True -> foo; False -> bar }; b = foo a in b
109
1110foo x = let ?g = id; ?f = g in x
data/examples/declaration/value/function/list-comprehensions-out.hs+3−4
@@ -10,8 +10,7 @@ barbaz x y z w =
1010 any even [a, b],
1111 c <-
1212 z
13− * z
14− ^ 2, -- Bar baz
13+ * z ^ 2, -- Bar baz
1514 d <-
1615 w
1716 + w, -- Baz bar
@@ -21,5 +20,5 @@ barbaz x y z w =
2120 b,
2221 c,
2322 d
24− ]
25− ]
23+ ]
24+ ]
data/examples/declaration/value/function/list-notation-0-out.hsnew file+5
@@ -0,0 +1,5 @@
1+foo =
2+ testCase "Foo" testFoo :
3+ testCase "Bar" testBar :
4+ testCase "Baz" testBaz :
5+ []
data/examples/declaration/value/function/list-notation-0.hsnew file+5
@@ -0,0 +1,5 @@
1+foo =
2+ testCase "Foo" testFoo :
3+ testCase "Bar" testBar :
4+ testCase "Baz" testBaz :
5+ []
data/examples/declaration/value/function/list-notation-1-out.hsnew file+8
@@ -0,0 +1,8 @@
1+instance A.ToJSON UpdateTable where
2+ toJSON a =
3+ A.object $
4+ "TableName" .= updateTableName a :
5+ "ProvisionedThroughput" .= updateProvisionedThroughput a :
6+ case updateGlobalSecondaryIndexUpdates a of
7+ [] -> []
8+ l -> ["GlobalSecondaryIndexUpdates" .= l]
data/examples/declaration/value/function/list-notation-1.hsnew file+7
@@ -0,0 +1,7 @@
1+instance A.ToJSON UpdateTable where
2+ toJSON a = A.object
3+ $ "TableName" .= updateTableName a
4+ : "ProvisionedThroughput" .= updateProvisionedThroughput a
5+ : case updateGlobalSecondaryIndexUpdates a of
6+ [] -> []
7+ l -> [ "GlobalSecondaryIndexUpdates" .= l ]
data/examples/declaration/value/function/list-notation-2-out.hsnew file+6
@@ -0,0 +1,6 @@
1+-- A list of the element and all its parents up to the root node.
2+getPath tree t =
3+ t :
4+ case Map.lookup (getId t) tree of
5+ Nothing -> []
6+ Just parent -> getPath tree parent
data/examples/declaration/value/function/list-notation-2.hsnew file+5
@@ -0,0 +1,5 @@
1+-- A list of the element and all its parents up to the root node.
2+getPath tree t = t :
3+ case Map.lookup (getId t) tree of
4+ Nothing -> []
5+ Just parent -> getPath tree parent
data/examples/declaration/value/function/list-notation-3-out.hsnew file+12
@@ -0,0 +1,12 @@
1+foo =
2+ reportSDoc "tc.cc" 30 $
3+ sep $ do
4+ (prettyTCM q <+> " before compilation") : do
5+ map (prettyTCM . map unArg . clPats) cls
6+
7+foo =
8+ reportSDoc "tc.cc" 30 $
9+ sep $ do
10+ (prettyTCM q <+> " before compilation") :
11+ do
12+ map (prettyTCM . map unArg . clPats) cls
data/examples/declaration/value/function/list-notation-3.hsnew file+10
@@ -0,0 +1,10 @@
1+foo =
2+ reportSDoc "tc.cc" 30 $ sep $ do
3+ (prettyTCM q <+> " before compilation") : do
4+ map (prettyTCM . map unArg . clPats) cls
5+
6+foo =
7+ reportSDoc "tc.cc" 30 $ sep $ do
8+ (prettyTCM q <+> " before compilation") :
9+ do
10+ map (prettyTCM . map unArg . clPats) cls
data/examples/declaration/value/function/multi-way-if-out.hs+10−4
@@ -4,7 +4,13 @@ foo x = if | x == 5 -> 5
44
55bar x y =
66 if
7− | x > y -> x
8− | x < y ->
9− y
10− | otherwise -> x
7+ | x > y -> x
8+ | x < y ->
9+ y
10+ | otherwise -> x
11+
12+baz =
13+ if
14+ | p -> f
15+ | otherwise -> g
16+ x
data/examples/declaration/value/function/multi-way-if.hs+5
@@ -7,3 +7,8 @@ bar x y = if
77 | x < y
88 -> y
99 | otherwise -> x
10+
11+baz =
12+ if | p -> f
13+ | otherwise -> g
14+ x
data/examples/declaration/value/function/operator-comments-out.hs → data/examples/declaration/value/function/operator-comments-0-out.hsrenamed+2−2
@@ -7,10 +7,10 @@ foo =
77
88foo =
99 bar
10− ++ case foo of {- some comment -}
10+ ++ {- some comment -} case foo of
1111 a -> a
1212
1313foo =
1414 bar
15− ++ case foo of {- some comment -}
15+ ++ case foo {- some comment -} of
1616 a -> a
data/examples/declaration/value/function/operator-comments.hs → data/examples/declaration/value/function/operator-comments-0.hsrenamed

The content is the same.

data/examples/declaration/value/function/operator-comments-1-out.hsnew file+16
@@ -0,0 +1,16 @@
1+foo =
2+ bar
3+ ++
4+ -- some comment
5+ case foo of
6+ a -> a
7+
8+foo =
9+ bar
10+ ++ case foo of -- some comment
11+ a -> a
12+
13+foo =
14+ bar
15+ ++ case foo of -- some comment
16+ a -> a
data/examples/declaration/value/function/operator-comments-1.hsnew file+17
@@ -0,0 +1,17 @@
1+foo =
2+ bar
3+ ++
4+ -- some comment
5+ case foo of
6+ a -> a
7+
8+foo =
9+ bar
10+ ++ -- some comment
11+ case foo of
12+ a -> a
13+
14+foo =
15+ bar
16+ ++ case foo of -- some comment
17+ a -> a
data/examples/declaration/value/function/operator-comments-2-out.hsnew file+5
@@ -0,0 +1,5 @@
1+x =
2+ y
3+ ++ f g -- commentA
4+ -- commentB
5+ -- commentC
data/examples/declaration/value/function/operator-comments-2.hsnew file+4
@@ -0,0 +1,4 @@
1+x =
2+ y ++ -- commentA
3+-- commentB
4+ f g -- commentC
data/examples/declaration/value/function/operator-sections-out.hs+2−2
@@ -5,9 +5,9 @@ bar = (<> "hello")
55baz =
66 ( 1 * 2
77 +
8− )
8+ )
99 ( *
1010 3 ^ 5
11− )
11+ )
1212
1313quux = (,) <$> foo <$> bar
data/examples/declaration/value/function/operators-0-out.hsnew file+5
@@ -0,0 +1,5 @@
1+a =
2+ b & c .~ d
3+ & e
4+ %~ f
5+ g
data/examples/declaration/value/function/operators-0.hsnew file+4
@@ -0,0 +1,4 @@
1+a =
2+ b & c .~ d
3+ & e %~ f
4+ g
data/examples/declaration/value/function/operators-1-out.hsnew file+4
@@ -0,0 +1,4 @@
1+foo =
2+ f
3+ . g
4+ =<< h . i
data/examples/declaration/value/function/operators-1.hsnew file+3
@@ -0,0 +1,3 @@
1+foo = f
2+ . g
3+ =<< h . i
data/examples/declaration/value/function/operators-2-out.hsnew file+4
@@ -0,0 +1,4 @@
1+foo n
2+ | x || y && z || n ** x
3+ || x && n =
4+ 42
data/examples/declaration/value/function/operators-2.hsnew file+4
@@ -0,0 +1,4 @@
1+foo n
2+ | x || y && z || n ** x
3+ || x && n =
4+ 42
data/examples/declaration/value/function/operators-3-out.hsnew file+3
@@ -0,0 +1,3 @@
1+foo =
2+ op <> n <+> colon <+> prettySe <+> text "="
3+ <+> prettySe <> text sc
data/examples/declaration/value/function/operators-3.hsnew file+3
@@ -0,0 +1,3 @@
1+foo =
2+ op <> n <+> colon <+> prettySe <+> text "=" <+>
3+ prettySe <> text sc
data/examples/declaration/value/function/operators-4-out.hsnew file+3
@@ -0,0 +1,3 @@
1+foo =
2+ line <> bindingOf <+> text "=" <+> tPretty <+> colon
3+ <+> align <> prettyPs
data/examples/declaration/value/function/operators-4.hsnew file+3
@@ -0,0 +1,3 @@
1+foo =
2+ line <> bindingOf <+> text "=" <+> tPretty <+> colon <+>
3+ align <> prettyPs
data/examples/declaration/value/function/operators-5-out.hsnew file+5
@@ -0,0 +1,5 @@
1+foo =
2+ map bar $
3+ [ baz
4+ ]
5+ ++ quux
data/examples/declaration/value/function/operators-5.hsnew file+4
@@ -0,0 +1,4 @@
1+foo =
2+ map bar $
3+ [ baz
4+ ] ++ quux
data/examples/declaration/value/function/operators-6-out.hsnew file+9
@@ -0,0 +1,9 @@
1+type PermuteRef =
2+ "a"
3+ :> ( "b" :> "c" :> End
4+ :<|> "c" :> "b" :> End
5+ )
6+ :<|> "b"
7+ :> ( "a" :> "c" :> End
8+ :<|> "c" :> "a" :> End
9+ )
data/examples/declaration/value/function/operators-6.hsnew file+7
@@ -0,0 +1,7 @@
1+type PermuteRef =
2+ "a" :> ( "b" :> "c" :> End
3+ :<|> "c" :> "b" :> End
4+ )
5+ :<|> "b" :> ( "a" :> "c" :> End
6+ :<|> "c" :> "a" :> End
7+ )
data/examples/declaration/value/function/overindentation-out.hsnew file+11
@@ -0,0 +1,11 @@
1+reallyincrediblyLongName =
2+ f
3+ a
4+ A
5+ { reallyincrediblyLongName =
6+ f
7+ a
8+ A
9+ { reallyincrediblyLongName
10+ }
11+ }
data/examples/declaration/value/function/overindentation.hsnew file+9
@@ -0,0 +1,9 @@
1+reallyincrediblyLongName = f
2+ a
3+ A
4+ { reallyincrediblyLongName = f
5+ a
6+ A
7+ { reallyincrediblyLongName
8+ }
9+ }
data/examples/declaration/value/function/parallel-comprehensions-complex-out.hs+2−2
@@ -9,7 +9,7 @@ baz x y z w =
99 h,
1010 i,
1111 j
12− )
12+ )
1313 | a <- -- Foo 1
1414 x, -- Foo 2
1515 b <- -- Bar 1
@@ -32,4 +32,4 @@ baz x y z w =
3232 -- Bar bar 3
3333 j <- -- Bar baz 1
3434 a + b -- Bar baz 2
35− ]
35+ ]
data/examples/declaration/value/function/parens-out.hsnew file+1
@@ -0,0 +1 @@
1+f = p (do foo; bar) baz
data/examples/declaration/value/function/parens.hsnew file+1
@@ -0,0 +1 @@
1+f = p (do foo; bar) baz
data/examples/declaration/value/function/pattern/famous-cardano-pattern-out.hs+8−8
@@ -1,8 +1,8 @@
1−( getNodeSettingsR :<|>
2− getNodeInfoR :<|>
3− getNextUpdateR :<|>
4− restartNodeR
5− ) :<|>
6− ( getUtxoR :<|>
7− getConfirmedProposalsR
8− ) = client nodeV1Api
1+( getNodeSettingsR
2+ :<|> getNodeInfoR
3+ :<|> getNextUpdateR
4+ :<|> restartNodeR
5+ )
6+ :<|> ( getUtxoR
7+ :<|> getConfirmedProposalsR
8+ ) = client nodeV1Api
data/examples/declaration/value/function/pattern/multiline-case-pattern-out.hs+2−2
@@ -10,6 +10,6 @@ f xs = case xs of
1010 ] -> a + b
1111
1212g xs = case xs of
13− ( a :
14− bs
13+ ( a
14+ : bs
1515 ) -> a + b
data/examples/declaration/value/function/pattern/record-patterns-out.hs+1−1
@@ -16,4 +16,4 @@ quux
1616 { boom = a,
1717 foom = b,
1818 ..
19− } = a + b
19+ } = a + b
data/examples/declaration/value/function/pattern/sig-pattern-out.hs+2−2
@@ -2,6 +2,6 @@ f = do
22 x :: a <- g
33
44f = do
5− (x, y)
6− :: (a, b) <-
5+ (x, y) ::
6+ (a, b) <-
77 g
data/examples/declaration/value/function/pattern/splice-pattern-out.hs+2−2
@@ -7,7 +7,7 @@ singleLine = case () of
77multiline = case () of
88 $( x
99 + y
10− ) -> ()
10+ ) -> ()
1111 $( y
1212 "something"
13− ) -> ()
13+ ) -> ()
data/examples/declaration/value/function/pattern/strictness-out.hs+2
@@ -1,3 +1,5 @@
1+{-# LANGUAGE BangPatterns #-}
2+
13!a = ()
24
35~b = ()
data/examples/declaration/value/function/pattern/strictness.hs+2
@@ -1,2 +1,4 @@
1+{-# LANGUAGE BangPatterns #-}
2+
13!a = ()
24~b = ()
data/examples/declaration/value/function/pattern/unboxed-sum-pattern-out.hs+5−3
@@ -18,7 +18,9 @@ z = True
1818
1919z_multiline = True
2020 where
21− (# | | _x
21+ (#
22+ | | _x
2223 #) =
23− (# | | True
24− #)
24+ (#
25+ | | True
26+ #)
data/examples/declaration/value/function/pattern/view-pattern-out.hs−3
@@ -13,6 +13,3 @@ multiline
1313 bar
1414 baz
1515 ) = True
16−
17−-- https://github.com/tweag/ormolu/issues/343
18−foo = (f -> 4)
data/examples/declaration/value/function/pattern/view-pattern.hs−3
@@ -10,6 +10,3 @@ g ((f, _), f -> 4) = True
1010multiline (t -> Foo
1111 bar
1212 baz) = True
13−
14−-- https://github.com/tweag/ormolu/issues/343
15−foo = (f -> 4)
data/examples/declaration/value/function/record-constructors-out.hsdeleted−26
@@ -1,26 +0,0 @@
1−foo = Foo {a = 3}
2−
3−bar = Bar
4− { abc = foo,
5− def = Foo {a = 10}
6− }
7−
8−baz = Baz {}
9−
10−aLongVariableName =
11− ALongRecordName
12− { short = baz,
13− aLongRecordFieldName = YetAnotherLongRecordName
14− { yetAnotherLongRecordFieldName = "a long string"
15− },
16− aLongRecordFieldName2 =
17− Just YetAnotherLongRecordName
18− { yetAnotherLongRecordFieldName = "a long string",
19− yetAnotherLongRecordFieldName =
20− Just
21− "a long string"
22− },
23− aLongRecordFieldName3 = do
24− foo
25− bar
26− }
data/examples/declaration/value/function/record/constructors-out.hsnew file+31
@@ -0,0 +1,31 @@
1+foo = Foo {a = 3}
2+
3+bar =
4+ Bar
5+ { abc = foo,
6+ def = Foo {a = 10}
7+ }
8+
9+baz = Baz {}
10+
11+sym = Foo {(+) = 3}
12+
13+aLongVariableName =
14+ ALongRecordName
15+ { short = baz,
16+ aLongRecordFieldName =
17+ YetAnotherLongRecordName
18+ { yetAnotherLongRecordFieldName = "a long string"
19+ },
20+ aLongRecordFieldName2 =
21+ Just
22+ YetAnotherLongRecordName
23+ { yetAnotherLongRecordFieldName = "a long string",
24+ yetAnotherLongRecordFieldName =
25+ Just
26+ "a long string"
27+ },
28+ aLongRecordFieldName3 = do
29+ foo
30+ bar
31+ }
data/examples/declaration/value/function/record-constructors.hs → data/examples/declaration/value/function/record/constructors.hsrenamed+1−1
@@ -4,7 +4,7 @@ bar = Bar {
44 def = Foo {a = 10}
55}
66baz = Baz{ }
7−
7+sym = Foo { (+) = 3 }
88aLongVariableName =
99 ALongRecordName
1010 { short = baz,
data/examples/declaration/value/function/record/dot-out.hsnew file+15
@@ -0,0 +1,15 @@
1+{-# OPTIONS_GHC -fplugin=RecordDotPreprocessor #-}
2+
3+data Foo = Foo {bar :: Int}
4+
5+mfoo = fmap (.bar) $ Nothing
6+
7+bar = (Foo 1).bar
8+
9+fooplus f n = f{foo = f.bar + n}
10+
11+fooplus' f n = f {foo = f.bar + n}
12+
13+fooplus'' f n = f {foo = f.bar + n}
14+
15+fooplus''' f n = f {foo = f.bar + n}
data/examples/declaration/value/function/record/dot.hsnew file+14
@@ -0,0 +1,14 @@
1+{-# OPTIONS_GHC -fplugin=RecordDotPreprocessor #-}
2+data Foo = Foo { bar :: Int }
3+
4+mfoo = fmap (.bar) $ Nothing
5+
6+bar = ( Foo 1).bar
7+
8+fooplus f n = f{foo = f.bar + n}
9+
10+fooplus' f n = f { foo = f.bar + n}
11+
12+fooplus'' f n = f {foo = f.bar + n}
13+
14+fooplus''' f n = f{ foo = f.bar + n}
data/examples/declaration/value/function/record/hanging-after-equal-con-out.hsnew file+8
@@ -0,0 +1,8 @@
1+foo =
2+ Foo
3+ { foo =
4+ -- Blah blah
5+ case x of
6+ Blah -> 1
7+ Blim -> 2
8+ }
data/examples/declaration/value/function/record/hanging-after-equal-con.hsnew file+7
@@ -0,0 +1,7 @@
1+foo = Foo
2+ { foo =
3+ -- Blah blah
4+ case x of
5+ Blah -> 1
6+ Blim -> 2
7+ }
data/examples/declaration/value/function/record/hanging-after-equal-update-out.hsnew file+8
@@ -0,0 +1,8 @@
1+foo =
2+ foo
3+ { foo =
4+ -- Blah blah
5+ case x of
6+ Blah -> 1
7+ Blim -> 2
8+ }
data/examples/declaration/value/function/record/hanging-after-equal-update.hsnew file+7
@@ -0,0 +1,7 @@
1+foo = foo
2+ { foo =
3+ -- Blah blah
4+ case x of
5+ Blah -> 1
6+ Blim -> 2
7+ }
data/examples/declaration/value/function/record/inter-comments-out.hsnew file+13
@@ -0,0 +1,13 @@
1+x =
2+ Just
3+ -- comment
4+ A
5+ { x
6+ }
7+
8+x =
9+ Just
10+ -- comment
11+ a
12+ { x
13+ }
data/examples/declaration/value/function/record/inter-comments.hsnew file+11
@@ -0,0 +1,11 @@
1+x = Just
2+ -- comment
3+ A
4+ { x
5+ }
6+
7+x = Just
8+ -- comment
9+ a
10+ { x
11+ }
data/examples/declaration/value/function/record-updaters-out.hs → data/examples/declaration/value/function/record/updaters-out.hsrenamed+3−1
@@ -4,6 +4,8 @@ bar x =
44 x
55 { abc = foo,
66 def = Foo {a = 10}
7− }
7+ }
88
99baz x = x {}
10+
11+sym x = x {(+) = 4}
data/examples/declaration/value/function/record-updaters.hs → data/examples/declaration/value/function/record/updaters.hsrenamed+1
@@ -4,3 +4,4 @@ bar x = x {
44 def = Foo {a = 10}
55}
66baz x = x{ }
7+sym x = x { (+) = 4 }
data/examples/declaration/value/function/record-wildcards-out.hs → data/examples/declaration/value/function/record/wildcards-out.hsrenamed+6−5
@@ -3,11 +3,12 @@
33
44foo x y = Foo {x, y}
55
6−bar x y z = Bar
7− { x,
8− y,
9− z,
10− ..
6+bar x y z =
7+ Bar
8+ { x,
9+ y,
10+ z,
11+ ..
1112 }
1213
1314baz = Baz {..}
data/examples/declaration/value/function/record-wildcards.hs → data/examples/declaration/value/function/record/wildcards.hsrenamed

The content is the same.

data/examples/declaration/value/function/static-pointers-out.hs+4−3
@@ -9,11 +9,12 @@ bar =
99 [ 1,
1010 2,
1111 3
12− ]
12+ ]
1313
1414baz :: StaticPtr Bool
1515baz =
1616 static
17− ( fun 1
17+ ( fun
18+ 1
1819 2
19− )
20+ )
data/examples/declaration/value/function/strings-out.hsnew file+10
@@ -0,0 +1,10 @@
1+{-# LANGUAGE MagicHash #-}
2+
3+foo = "foobar"
4+
5+bar = "foo\&barbaz"
6+
7+baz =
8+ "foo\
9+ \bar\
10+ \baz"
data/examples/declaration/value/function/strings.hsnew file+7
@@ -0,0 +1,7 @@
1+{-# LANGUAGE MagicHash #-}
2+
3+foo = "foobar"
4+bar = "foo\&bar\ \baz"
5+baz = "foo\
6+ \bar\
7+ \baz"
data/examples/declaration/value/function/tricky-parens-out.hs+1−1
@@ -1,4 +1,4 @@
11handleStuff =
22 ( let foo = foo
33 in foo
4− )
4+ )
data/examples/declaration/value/function/tuples-out.hs+2−2
@@ -4,11 +4,11 @@ bar =
44 ( 1,
55 2,
66 3
7− )
7+ )
88
99handleStuff =
1010 ( let foo = foo
1111 in foo,
1212 let bar = bar
1313 in bar
14− )
14+ )
data/examples/declaration/value/function/type-applications-and-splice-out.hsnew file+4
@@ -0,0 +1,4 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+{-# LANGUAGE TypeApplications #-}
3+
4+staticKey name = [|sing @ $(symFQN name)|]
data/examples/declaration/value/function/type-applications-and-splice.hsnew file+4
@@ -0,0 +1,4 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+{-# LANGUAGE TypeApplications #-}
3+
4+staticKey name = [| sing @ $(symFQN name) |]
data/examples/declaration/value/function/type-applications-out.hs+6
@@ -8,3 +8,9 @@ baz =
88 f @Int @String
99 a
1010 b
11+
12+goo =
13+ hash
14+ @(HASH TPraosStandardCrypto)
15+ @ByteString
16+ "And the lamb lies down on Broadway"
data/examples/declaration/value/function/type-applications.hs+5
@@ -6,3 +6,8 @@ bar = f @(Maybe Int) a b
66
77baz = f @Int @String
88 a b
9+
10+goo = hash
11+ @(HASH TPraosStandardCrypto)
12+ @ByteString
13+ "And the lamb lies down on Broadway"
data/examples/declaration/value/function/typed-expressions-out.hs+2−2
@@ -1,5 +1,5 @@
11foo x = x :: Int
22
33bar x =
4− Just x
5− :: Maybe String
4+ Just x ::
5+ Maybe String
data/examples/declaration/value/function/unboxed-sums-out.hs+3−2
@@ -5,5 +5,6 @@ foo = (# 1 | #)
55bar = (# | | 2 | #)
66
77baz =
8− (# | | | 10 | | | | |
9− #)
8+ (#
9+ | | | 10 | | | | |
10+ #)
data/examples/declaration/value/function/unboxed-tuples-out.hs+5−4
@@ -3,7 +3,8 @@
33foo = (# 1, 2, 3 #)
44
55bar =
6− (# 1,
7− 2,
8− 3
9− #)
6+ (#
7+ 1,
8+ 2,
9+ 3
10+ #)
data/examples/declaration/value/function/where-nested.hs−1
@@ -10,4 +10,3 @@ foo = bar
1010foo2 = bar
1111 where
1212 { f1 = f1 where { f1 = 3; f1' = 4 }; f2 = f2 where { f2 = 3; f2' = 4 } }
13−
data/examples/declaration/value/other/comments-get-before-op-out.hs+1−1
@@ -6,5 +6,5 @@ main = do
66 migration3
77 -- When adding migrations here, don't forget to update
88 -- 'schemaVersion' in Galley.Data
9− ]
9+ ]
1010 `finally` Log.close
data/examples/declaration/value/other/line-multi-line-out.hs+1−1
@@ -3,4 +3,4 @@ x =
33 [ 1,
44 2,
55 somethingSomething 3
6− ]
6+ ]
data/examples/declaration/value/pattern-synonyms/bidirectional-out.hs+14−14
@@ -8,21 +8,21 @@ pattern Arrow {t1, t2} = App "->" [t1, t2]
88pattern Arrow
99 { t1,
1010 t2
11− }
12− = App "->" [t1, t2]
11+ } =
12+ App "->" [t1, t2]
1313
14−pattern Int
15− = App "Int" []
14+pattern Int =
15+ App "Int" []
1616
17−pattern Maybe {t}
18− = App
19− "Maybe"
20− [t]
17+pattern Maybe {t} =
18+ App
19+ "Maybe"
20+ [t]
2121
22−pattern Maybe t
23− = App
24− "Maybe"
25− [t]
22+pattern Maybe t =
23+ App
24+ "Maybe"
25+ [t]
2626
27−pattern a :< b
28− <- (a, b)
27+pattern a :< b <-
28+ (a, b)
data/examples/declaration/value/pattern-synonyms/explicitely-bidirectional-out.hs+8−8
@@ -1,21 +1,21 @@
11{-# LANGUAGE PatternSynonyms #-}
22
3−pattern HeadC x
4− <- x : xs
3+pattern HeadC x <-
4+ x : xs
55 where
66 HeadC x = [x]
77
8−pattern HeadC' x
9− <- x : xs
8+pattern HeadC' x <-
9+ x : xs
1010 where
1111 HeadC' x = [x]
1212
13−pattern Simple
14− <- "Simple"
13+pattern Simple <-
14+ "Simple"
1515 where
1616 Simple = "Complicated"
1717
18−pattern a :< b
19− <- (a, b)
18+pattern a :< b <-
19+ (a, b)
2020 where
2121 a :< b = (a, b)
data/examples/declaration/value/pattern-synonyms/unidirectional-out.hs+8−8
@@ -2,20 +2,20 @@
22
33pattern Head x <- x : xs
44
5−pattern Head' x
6− <- x : xs
5+pattern Head' x <-
6+ x : xs
77
8−pattern Head'' {x}
9− <- x : xs
8+pattern Head'' {x} <-
9+ x : xs
1010
11−pattern FirstTwo {x, y}
12− <- x : (y : xs)
11+pattern FirstTwo {x, y} <-
12+ x : (y : xs)
1313
1414pattern FirstTwo'
1515 { x,
1616 y
17− }
18− <- x : (y : xs)
17+ } <-
18+ x : (y : xs)
1919
2020pattern Simple <- "Simple"
2121
data/examples/declaration/warning/warning-multiline-out.hs+1−1
@@ -3,7 +3,7 @@
33 foo
44 [ "These are bad functions",
55 "Really bad!"
6− ]
6+ ]
77 #-}
88test :: IO ()
99test = pure ()
data/examples/import/comments-inside-imports-out.hsnew file+7
@@ -0,0 +1,7 @@
1+-- x
2+
3+import qualified -- x
4+ Bar
5+import qualified -- x
6+ Baz
7+import Foo
data/examples/import/comments-inside-imports.hsnew file+9
@@ -0,0 +1,9 @@
1+import -- x
2+ Foo
3+
4+import -- x
5+ qualified Bar
6+
7+import qualified
8+ -- x
9+ Baz
data/examples/import/deduplication-bug-out.hsnew file+6
@@ -0,0 +1,6 @@
1+import Foo1 (Bar1 (..), Baz1)
2+import Foo2 (Bar2 (..), Baz2)
3+import Foo3 (Bar3 (x1, x2, x3))
4+import Foo4 (Bar4 (x1, x2))
5+import Foo5 (Bar5 (x1))
6+import Foo6 (Bar6 (..))
data/examples/import/deduplication-bug.hsnew file+6
@@ -0,0 +1,6 @@
1+import Foo1 (Bar1, Baz1, Bar1(..))
2+import Foo2 (Bar2(..), Baz2, Bar2)
3+import Foo3 (Bar3(x1,x3), Bar3(x1, x2))
4+import Foo4 (Bar4(x1), Bar4(x2))
5+import Foo5 (Bar5, Bar5(x1))
6+import Foo6 (Bar6(x1), Bar6(..))
data/examples/import/explicit-imports-out.hs+6−6
@@ -1,12 +1,12 @@
11import qualified MegaModule as M
2− ( (<<<),
3− (>>>),
4− Either,
2+ ( Either,
53 Maybe (Just, Nothing),
64 MaybeT (..),
7− Monad ((>>), (>>=), return),
5+ Monad (return, (>>), (>>=)),
86 MonadBaseControl,
97 join,
108 liftIO,
11− void
12− )
9+ void,
10+ (<<<),
11+ (>>>),
12+ )
data/examples/import/explicit-imports-with-comments-out.hs+4−3
@@ -1,6 +1,7 @@
11import qualified MegaModule as M
22 ( -- (1)
3− (<<<), -- (2)
3+ -- (2)
4+ Either, -- (3)
5+ (<<<),
46 (>>>),
5− Either -- (3)
6− )
7+ )
data/examples/import/merging-0-out.hsnew file+3
@@ -0,0 +1,3 @@
1+import Foo
2+import Foo (bar, foo)
3+import Foo as F
data/examples/import/merging-0.hsnew file+4
@@ -0,0 +1,4 @@
1+import Foo
2+import Foo (foo)
3+import Foo (bar)
4+import Foo as F
data/examples/import/merging-1-out.hsnew file+2
@@ -0,0 +1,2 @@
1+import "bar" Foo (bar)
2+import "foo" Foo (baz, foo)
data/examples/import/merging-1.hsnew file+3
@@ -0,0 +1,3 @@
1+import "foo" Foo (foo)
2+import "bar" Foo (bar)
3+import "foo" Foo (baz)
data/examples/import/merging-2-out.hsnew file+2
@@ -0,0 +1,2 @@
1+import Foo hiding (bar4, foo2)
2+import qualified Foo (bar3, foo1)
data/examples/import/merging-2.hsnew file+4
@@ -0,0 +1,4 @@
1+import qualified Foo (foo1)
2+import Foo hiding (foo2)
3+import qualified Foo (bar3)
4+import Foo hiding (bar4)
data/examples/import/misc-out.hs+1−7
@@ -1,11 +1,5 @@
11import A hiding
22 ( foobarbazqux,
3− foobarbazqux,
4− foobarbazqux,
5− foobarbazqux,
6− foobarbazqux,
7− foobarbazqux,
8− foobarbazqux
9− )
3+ )
104import {-# SOURCE #-} safe qualified Module as M hiding (a, b, c, d, e, f)
115import Name hiding ()
data/examples/import/nested-explicit-imports-out.hs+8−8
@@ -1,10 +1,10 @@
11import qualified MegaModule as M
2− ( (<<<),
3− (>>>),
4− Either,
2+ ( Either,
53 Monad
6− ( (>>),
7− (>>=),
8− return
9− )
10− )
4+ ( return,
5+ (>>),
6+ (>>=)
7+ ),
8+ (<<<),
9+ (>>>),
10+ )
data/examples/import/qualified-post-out.hsnew file+5
@@ -0,0 +1,5 @@
1+{-# LANGUAGE ImportQualifiedPost #-}
2+
3+import Data.Text qualified (a, b, c)
4+import Data.Text qualified hiding (a, b, c)
5+import Data.Text qualified as T
data/examples/import/qualified-post.hsnew file+5
@@ -0,0 +1,5 @@
1+{-# LANGUAGE ImportQualifiedPost #-}
2+
3+import qualified Data.Text as T
4+import qualified Data.Text (a, c, b)
5+import Data.Text qualified hiding (c, b, a)
data/examples/import/qualified-prelude-out.hs+1−1
@@ -1,4 +1,4 @@
11module P where
22
3−import Prelude hiding ((.), id)
3+import Prelude hiding (id, (.))
44import qualified Prelude
data/examples/import/simple-out.hs+2−3
@@ -1,6 +1,5 @@
11import Data.Text
2−import Data.Text
3−import qualified Data.Text as T
4−import qualified Data.Text (a, b, c)
52import Data.Text (a, b, c)
63import Data.Text hiding (a, b, c)
4+import qualified Data.Text (a, b, c)
5+import qualified Data.Text as T
data/examples/import/simple.hs+2
@@ -4,3 +4,5 @@ import qualified Data.Text as T
44import qualified Data.Text (a, c, b)
55import Data.Text (a, b, c)
66import Data.Text hiding (c, b, a)
7+import Data.Text (a, b, c, b, a)
8+import Data.Text hiding (c, b, a, b, c)
data/examples/import/sorted-export-list-out.hsnew file+1
@@ -0,0 +1 @@
1+import Linear.Vector (Additive (..), (*^), (^*))
data/examples/import/sorted-export-list.hsnew file+1
@@ -0,0 +1 @@
1+import Linear.Vector (Additive (..), (*^), (^*))
data/examples/module-header/double-dot-with-names-out.hs+1−6
@@ -1,11 +1,6 @@
11{-# LANGUAGE PatternSynonyms #-}
22
3−module ExportSyntax
4− ( A (.., NoA),
5− Q (F, ..),
6− G (T, .., U)
7− )
8−where
3+module ExportSyntax (A (.., NoA), Q (F, ..), G (T, .., U)) where
94
105data A = A | B
116
data/examples/module-header/leading-empty-line-out.hsnew file+11
@@ -0,0 +1,11 @@
1+-- |
2+-- Module : Text.Megaparsec
3+-- Copyright : © 2015–2019 Megaparsec contributors
4+-- © 2007 Paolo Martini
5+-- © 1999–2001 Daan Leijen
6+-- License : FreeBSD
7+--
8+-- Maintainer : Mark Karpov <markkarpov92@gmail.com>
9+-- Stability : experimental
10+-- Portability : portable
11+module Main where
data/examples/module-header/leading-empty-line.hsnew file+11
@@ -0,0 +1,11 @@
1+-- |
2+-- Module : Text.Megaparsec
3+-- Copyright : © 2015–2019 Megaparsec contributors
4+-- © 2007 Paolo Martini
5+-- © 1999–2001 Daan Leijen
6+-- License : FreeBSD
7+--
8+-- Maintainer : Mark Karpov <markkarpov92@gmail.com>
9+-- Stability : experimental
10+-- Portability : portable
11+module Main where
data/examples/module-header/multiline-out.hs+2−2
@@ -1,6 +1,6 @@
11module Foo
22 ( foo,
33 bar,
4− baz
5− )
4+ baz,
5+ )
66where
data/examples/module-header/multiline-with-comments-out.hs+3−2
@@ -6,6 +6,7 @@ module My.Module
66 ( -- * Something
77 foo,
88 bar,
9+
910 -- * Another thing
1011 (<?>),
1112 {- some other thing -} foo2, -- yet another
@@ -14,8 +15,8 @@ module My.Module
1415 bar2, -- a multiline comment
1516 -- the second line
1617 bar3,
17− module Foo.Bar.Baz
18− )
18+ module Foo.Bar.Baz,
19+ )
1920where
2021
2122-- Wow
data/examples/module-header/multiline2-out.hs+2−2
@@ -1,6 +1,6 @@
11module Foo
22 ( foo,
33 bar,
4− baz
5− )
4+ baz,
5+ )
66where
data/examples/module-header/multiline2.hs+2−2
@@ -1,2 +1,2 @@
1−module Foo
2− (foo, bar, baz) where
1+module Foo (
2+ foo, bar, baz) where
data/examples/module-header/named-section-out.hsnew file+13
@@ -0,0 +1,13 @@
1+module Magic
2+ ( -- * Something
3+ -- $explanation
4+
5+ -- ** Another level
6+ foo,
7+ bar,
8+ )
9+where
10+
11+-- $explanation
12+--
13+-- Here it goes.
data/examples/module-header/named-section.hsnew file+13
@@ -0,0 +1,13 @@
1+module Magic
2+ ( -- * Something
3+ -- $explanation
4+
5+ -- ** Another level
6+ foo
7+ , bar
8+ )
9+where
10+
11+-- $explanation
12+--
13+-- Here it goes.
data/examples/module-header/preceding-comment-with-haddock-out.hsnew file+8
@@ -0,0 +1,8 @@
1+{-
2+ Here we go.
3+-}
4+
5+-- | This is the module's Haddock.
6+module Main (main) where
7+
8+main = return ()
data/examples/module-header/preceding-comment-with-haddock.hsnew file+8
@@ -0,0 +1,8 @@
1+{-
2+ Here we go.
3+-}
4+
5+-- | This is the module's Haddock.
6+module Main (main) where
7+
8+main = return ()
data/examples/module-header/shebang-out.hsnew file+6
@@ -0,0 +1,6 @@
1+#! /usr/bin/env runhaskell
2+
3+import Prelude
4+
5+main :: IO ()
6+main = putStrLn "hello world"
data/examples/module-header/shebang-with-pragmas-out.hsnew file+5
@@ -0,0 +1,5 @@
1+#!/usr/bin/env stack
2+
3+{-# LANGUAGE OverloadedStrings #-}
4+
5+main = pure ()
data/examples/module-header/shebang-with-pragmas.hsnew file+5
@@ -0,0 +1,5 @@
1+#!/usr/bin/env stack
2+
3+{-# LANGUAGE OverloadedStrings #-}
4+
5+main = pure ()
data/examples/module-header/shebang.hsnew file+6
@@ -0,0 +1,6 @@
1+#! /usr/bin/env runhaskell
2+
3+import Prelude
4+
5+main :: IO ()
6+main = putStrLn "hello world"
data/examples/module-header/singleline-empty-out.hs+1−4
@@ -1,5 +1,2 @@
11-- | This demonstrates a BUG.
2−module Foo
3− (
4− )
5−where
2+module Foo () where
data/examples/module-header/stack-header-0-out.hsnew file+7
@@ -0,0 +1,7 @@
1+-- stack runhaskell
2+
3+{-# LANGUAGE OverloadedStrings #-}
4+
5+main = return ()
6+
7+-- stack runhaskell
data/examples/module-header/stack-header-0.hsnew file+4
@@ -0,0 +1,4 @@
1+-- stack runhaskell
2+{-# LANGUAGE OverloadedStrings #-}
3+main = return ()
4+-- stack runhaskell
data/examples/module-header/stack-header-1-out.hsnew file+8
@@ -0,0 +1,8 @@
1+#!/usr/bin/env stack
2+-- stack runhaskell
3+
4+{-# LANGUAGE OverloadedStrings #-}
5+
6+main = return ()
7+
8+-- stack runhaskell
data/examples/module-header/stack-header-1.hsnew file+5
@@ -0,0 +1,5 @@
1+#!/usr/bin/env stack
2+-- stack runhaskell
3+{-# LANGUAGE OverloadedStrings #-}
4+main = return ()
5+-- stack runhaskell
data/examples/module-header/stack-header-2-out.hsnew file+12
@@ -0,0 +1,12 @@
1+#!/usr/bin/env stack
2+{- stack
3+ script
4+ --resolver lts-6.25
5+ --package turtle
6+ --package "stm async"
7+ --package http-client,http-conduit
8+-}
9+
10+{-# LANGUAGE OverloadedStrings #-}
11+
12+main = return ()
data/examples/module-header/stack-header-2.hsnew file+12
@@ -0,0 +1,12 @@
1+#!/usr/bin/env stack
2+{- stack
3+ script
4+ --resolver lts-6.25
5+ --package turtle
6+ --package "stm async"
7+ --package http-client,http-conduit
8+-}
9+
10+{-# LANGUAGE OverloadedStrings #-}
11+
12+main = return ()
data/examples/module-header/warning-pragma-list-multiline-out.hs+3−3
@@ -2,10 +2,10 @@ module Test
22 {-# DEPRECATED
33 [ "This module is deprecated.",
44 "Please use OtherModule instead."
5− ]
5+ ]
66 #-}
77 ( foo,
88 bar,
9− baz
10− )
9+ baz,
10+ )
1111where
data/examples/module-header/warning-pragma-multiline-out.hs+1−4
@@ -1,9 +1,6 @@
11module Test
22 {-# DEPRECATED "This module is unstable" #-}
3− ( foo,
4− bar,
5− baz
6− )
3+ (foo, bar, baz)
74where
85
96import Blah
data/examples/module-header/warning-pragma-out.hs+3−1
@@ -1,3 +1,5 @@
11module Test
2− {-# WARNING "This module is very internal" #-}
2+ {-# WARNING
3+ "This module is very internal"
4+ #-}
35where
data/examples/other/argument-comment-out.hs+14−12
@@ -1,14 +1,16 @@
1−foo
2− :: Int -- ^ Documentation
3− -> Bool
1+foo ::
2+ -- | Documentation
3+ Int ->
4+ Bool
45foo _ = True
56
6−foo
7− :: Foo a
8− => Int -- ^ Foo
9− -> Int
10−
11−foo
12− :: Foo a
13− => Int -- ^ Foo
14− -> Int
7+foo ::
8+ Foo a =>
9+ -- | Foo
10+ Int ->
11+ Int
12+foo ::
13+ Foo a =>
14+ -- | Foo
15+ Int ->
16+ Int
data/examples/other/comment-after-preceding-haddock-out.hsnew file+12
@@ -0,0 +1,12 @@
1+module Main where
2+
3+-- | A
4+
5+-- B
6+
7+type D = E
8+
9+-- | This is 'f'
10+
11+-- * Comment
12+f :: a -> b
data/examples/other/comment-after-preceding-haddock.hsnew file+12
@@ -0,0 +1,12 @@
1+module Main where
2+
3+-- | A
4+
5+-- B
6+
7+type D = E
8+
9+-- | This is 'f'
10+
11+-- * Comment
12+f :: a -> b
data/examples/other/comment-alignment-out.hs+4−4
@@ -1,9 +1,9 @@
11class Foo a where
2−
32 -- | Foo.
4− foo
5− :: Int
6− -> a -- ^ Something
3+ foo ::
4+ Int ->
5+ -- | Something
6+ a
77
88 -- | Bar.
99 bar :: a
data/examples/other/comment-before-hanging-out.hsnew file+5
@@ -0,0 +1,5 @@
1+x = Just
2+ -- comment
3+ do
4+ foo
5+ bar
data/examples/other/comment-before-hanging.hsnew file+5
@@ -0,0 +1,5 @@
1+x = Just
2+ -- comment
3+ do
4+ foo
5+ bar
data/examples/other/comment-following-preceding-gap-out.hsnew file+6
@@ -0,0 +1,6 @@
1+foo = bar
2+ where
3+ baz = return (quux) -- Foo
4+
5+ -- Bar
6+ meme = gege
data/examples/other/comment-following-preceding-gap.hsnew file+6
@@ -0,0 +1,6 @@
1+foo = bar
2+ where
3+ baz = return (quux) -- Foo
4+
5+ -- Bar
6+ meme = gege
data/examples/other/comment-glued-together-out.hsnew file+7
@@ -0,0 +1,7 @@
1+module Main (main) where
2+
3+-- | Foo.
4+
5+-- Bar
6+main :: IO ()
7+main = return ()
data/examples/other/comment-glued-together.hsnew file+6
@@ -0,0 +1,6 @@
1+module Main (main) where
2+
3+{- | Foo. -}
4+-- Bar
5+main :: IO ()
6+main = return ()
data/examples/other/comment-inside-construct-out.hs+2−2
@@ -3,6 +3,6 @@ xs =
33 [ inner list first item,
44 inner list second item
55 -- inner list last item commented
6− ],
6+ ],
77 outer list item
8− ]
8+ ]
data/examples/other/comment-multiline-after-out.hsnew file+7
@@ -0,0 +1,7 @@
1+foo ::
2+ -- | start index
3+ Int ->
4+ -- | length
5+ Int ->
6+ t a ->
7+ t a
data/examples/other/comment-multiline-after.hsnew file+1
@@ -0,0 +1 @@
1+foo :: Int {- ^ start index -} -> Int {- ^ length -} -> t a -> t a
data/examples/other/comment-style-transform-out.hsnew file+17
@@ -0,0 +1,17 @@
1+-- |
2+-- Module: Data.Aeson.TH
3+-- Copyright: (c) 2011-2016 Bryan O'Sullivan
4+-- (c) 2011 MailRank, Inc.
5+-- License: BSD3
6+-- Stability: experimental
7+-- Portability: portable
8+module Main where
9+
10+-- |
11+--
12+-- Here is a snippet:
13+--
14+-- @
15+-- x = y + 2
16+-- @
17+x = y + 2
data/examples/other/comment-style-transform.hsnew file+22
@@ -0,0 +1,22 @@
1+{-|
2+Module: Data.Aeson.TH
3+Copyright: (c) 2011-2016 Bryan O'Sullivan
4+ (c) 2011 MailRank, Inc.
5+License: BSD3
6+Stability: experimental
7+Portability: portable
8+-}
9+
10+module Main where
11+
12+{- |
13+
14+Here is a snippet:
15+
16+@
17+x = y + 2
18+@
19+
20+-}
21+
22+x = y + 2
data/examples/other/comment-trailing-space-out.hsnew file+9
@@ -0,0 +1,9 @@
1+data T
2+ = {-
3+
4+ some multi-line comment
5+
6+ with empty lines
7+
8+ -}
9+ A
data/examples/other/comment-trailing-space.hsnew file+9
@@ -0,0 +1,9 @@
1+data T
2+ = {-
3+
4+ some multi-line comment
5+
6+ with empty lines
7+
8+ -}
9+ A
data/examples/other/comment-two-blocks-out.hsnew file+8
@@ -0,0 +1,8 @@
1+newNames :: [(String, String)]
2+newNames =
3+ let (*) = flip (,)
4+ in [ "Control" * "Monad"
5+ -- Foo
6+
7+ -- Bar
8+ ]
data/examples/other/comment-two-blocks.hsnew file+9
@@ -0,0 +1,9 @@
1+newNames :: [(String, String)]
2+newNames = let (*) = flip (,) in
3+ ["Control" * "Monad"
4+
5+ -- Foo
6+
7+ -- Bar
8+
9+ ]
data/examples/other/consequetive-pipe-comments-out.hsnew file+7
@@ -0,0 +1,7 @@
1+module Main where
2+
3+-- | Foo.
4+
5+-- | Bar.
6+bar :: Int
7+bar = 5
data/examples/other/consequetive-pipe-comments.hsnew file+8
@@ -0,0 +1,8 @@
1+module Main where
2+
3+-- | Foo.
4+
5+-- | Bar.
6+
7+bar :: Int
8+bar = 5
data/examples/other/cpp/continuation-out.hsnew file+8
@@ -0,0 +1,8 @@
1+foo :: Int
2+foo = 5
3+
4+#define message_for(a, b) \
5+ printf(#a " and " #b ": We love you!\n")
6+
7+bar :: Int
8+bar = 6
data/examples/other/cpp/continuation.hsnew file+8
@@ -0,0 +1,8 @@
1+foo :: Int
2+foo = 5
3+
4+#define message_for(a, b) \
5+ printf(#a " and " #b ": We love you!\n")
6+
7+bar :: Int
8+bar = 6
data/examples/other/cpp/lonely-hash-out.hsnew file+14
@@ -0,0 +1,14 @@
1+module Main (main) where
2+
3+import Data.Void
4+import Test.Hspec
5+import Test.Hspec.Megaparsec
6+import Text.Megaparsec
7+import Text.Megaparsec.Char
8+
9+# if !MIN_VERSION_base(4,13,0)
10+import Data.Semigroup ((<>))
11+# endif
12+
13+main :: IO ()
14+main = return ()
data/examples/other/cpp/lonely-hash.hsnew file+14
@@ -0,0 +1,14 @@
1+module Main (main) where
2+
3+import Data.Void
4+import Test.Hspec
5+import Test.Hspec.Megaparsec
6+import Text.Megaparsec
7+import Text.Megaparsec.Char
8+
9+# if !MIN_VERSION_base(4,13,0)
10+import Data.Semigroup ((<>))
11+# endif
12+
13+main :: IO ()
14+main = return ()
data/examples/other/cpp/separation-0a-out.hsnew file+7
@@ -0,0 +1,7 @@
1+instance Stream s => Monad (ParsecT e s m) where
2+ return = pure
3+ (>>=) = pBind
4+
5+#if !(MIN_VERSION_base(4,13,0))
6+ fail = Fail.fail
7+#endif
data/examples/other/cpp/separation-0a.hsnew file+6
@@ -0,0 +1,6 @@
1+instance Stream s => Monad (ParsecT e s m) where
2+ return = pure
3+ (>>=) = pBind
4+#if !(MIN_VERSION_base(4,13,0))
5+ fail = Fail.fail
6+#endif
data/examples/other/cpp/separation-0b-out.hsnew file+10
@@ -0,0 +1,10 @@
1+instance Stream s => Monad (ParsecT e s m) where
2+ return = pure
3+ (>>=) = pBind
4+
5+#if !(MIN_VERSION_base(4,13,0))
6+ fail = Fail.fail
7+#endif
8+
9+foo :: Int
10+foo = undefined
data/examples/other/cpp/separation-0b.hsnew file+9
@@ -0,0 +1,9 @@
1+instance Stream s => Monad (ParsecT e s m) where
2+ return = pure
3+ (>>=) = pBind
4+#if !(MIN_VERSION_base(4,13,0))
5+ fail = Fail.fail
6+#endif
7+
8+foo :: Int
9+foo = undefined
data/examples/other/cpp/separation-1a-out.hsnew file+12
@@ -0,0 +1,12 @@
1+decompressingPipe ::
2+ (PrimMonad m, MonadThrow m, MonadResource m) =>
3+ CompressionMethod ->
4+ ConduitT ByteString ByteString m ()
5+decompressingPipe Store = C.awaitForever C.yield
6+decompressingPipe Deflate = Z.decompress $ Z.WindowBits (-15)
7+
8+#ifdef ENABLE_BZIP2
9+decompressingPipe BZip2 = BZ.bunzip2
10+#else
11+decompressingPipe BZip2 = throwM BZip2Unsupported
12+#endif
data/examples/other/cpp/separation-1a.hsnew file+11
@@ -0,0 +1,11 @@
1+decompressingPipe
2+ :: (PrimMonad m, MonadThrow m, MonadResource m)
3+ => CompressionMethod
4+ -> ConduitT ByteString ByteString m ()
5+decompressingPipe Store = C.awaitForever C.yield
6+decompressingPipe Deflate = Z.decompress $ Z.WindowBits (-15)
7+#ifdef ENABLE_BZIP2
8+decompressingPipe BZip2 = BZ.bunzip2
9+#else
10+decompressingPipe BZip2 = throwM BZip2Unsupported
11+#endif
data/examples/other/cpp/separation-1b-out.hsnew file+15
@@ -0,0 +1,15 @@
1+decompressingPipe ::
2+ (PrimMonad m, MonadThrow m, MonadResource m) =>
3+ CompressionMethod ->
4+ ConduitT ByteString ByteString m ()
5+decompressingPipe Store = C.awaitForever C.yield
6+decompressingPipe Deflate = Z.decompress $ Z.WindowBits (-15)
7+
8+#ifdef ENABLE_BZIP2
9+decompressingPipe BZip2 = BZ.bunzip2
10+#else
11+decompressingPipe BZip2 = throwM BZip2Unsupported
12+#endif
13+
14+foo :: Int
15+foo = undefined
data/examples/other/cpp/separation-1b.hsnew file+14
@@ -0,0 +1,14 @@
1+decompressingPipe
2+ :: (PrimMonad m, MonadThrow m, MonadResource m)
3+ => CompressionMethod
4+ -> ConduitT ByteString ByteString m ()
5+decompressingPipe Store = C.awaitForever C.yield
6+decompressingPipe Deflate = Z.decompress $ Z.WindowBits (-15)
7+#ifdef ENABLE_BZIP2
8+decompressingPipe BZip2 = BZ.bunzip2
9+#else
10+decompressingPipe BZip2 = throwM BZip2Unsupported
11+#endif
12+
13+foo :: Int
14+foo = undefined
data/examples/other/cpp/separation-2a-out.hsnew file+9
@@ -0,0 +1,9 @@
1+ffff, ffffffff :: Natural
2+
3+#ifdef HASKELL_ZIP_DEV_MODE
4+ffff = 200
5+ffffffff = 5000
6+#else
7+ffff = 0xffff
8+ffffffff = 0xffffffff
9+#endif
data/examples/other/cpp/separation-2a.hsnew file+8
@@ -0,0 +1,8 @@
1+ffff, ffffffff :: Natural
2+#ifdef HASKELL_ZIP_DEV_MODE
3+ffff = 200
4+ffffffff = 5000
5+#else
6+ffff = 0xffff
7+ffffffff = 0xffffffff
8+#endif
data/examples/other/cpp/separation-2b-out.hsnew file+11
@@ -0,0 +1,11 @@
1+ffff, ffffffff :: Natural
2+#ifdef HASKELL_ZIP_DEV_MODE
3+ffff = 200
4+ffffffff = 5000
5+#else
6+ffff = 0xffff
7+ffffffff = 0xffffffff
8+#endif
9+
10+foo :: Int
11+foo = undefined
data/examples/other/cpp/separation-2b.hsnew file+11
@@ -0,0 +1,11 @@
1+ffff, ffffffff :: Natural
2+#ifdef HASKELL_ZIP_DEV_MODE
3+ffff = 200
4+ffffffff = 5000
5+#else
6+ffff = 0xffff
7+ffffffff = 0xffffffff
8+#endif
9+
10+foo :: Int
11+foo = undefined
data/examples/other/cpp/shifted-out.hsnew file+21
@@ -0,0 +1,21 @@
1+sinkData h compression = do
2+ (uncompressedSize, crc32, compressedSize) <-
3+ case compression of
4+ Store ->
5+ withCompression
6+ dataSink
7+ Deflate ->
8+ withCompression $
9+ Z.compress 9 (Z.WindowBits (-15)) .| dataSink
10+#ifdef ENABLE_BZIP2
11+ BZip2 -> withCompression $
12+ BZ.bzip2 .| dataSink
13+#else
14+ BZip2 -> throwM BZip2Unsupported
15+#endif
16+ return
17+ DataDescriptor
18+ { ddCRC32 = fromIntegral crc32,
19+ ddCompressedSize = compressedSize,
20+ ddUncompressedSize = uncompressedSize
21+ }
data/examples/other/cpp/shifted.hsnew file+17
@@ -0,0 +1,17 @@
1+sinkData h compression = do
2+ (uncompressedSize, crc32, compressedSize) <-
3+ case compression of
4+ Store -> withCompression
5+ dataSink
6+ Deflate -> withCompression $
7+ Z.compress 9 (Z.WindowBits (-15)) .| dataSink
8+#ifdef ENABLE_BZIP2
9+ BZip2 -> withCompression $
10+ BZ.bzip2 .| dataSink
11+#else
12+ BZip2 -> throwM BZip2Unsupported
13+#endif
14+ return DataDescriptor
15+ { ddCRC32 = fromIntegral crc32
16+ , ddCompressedSize = compressedSize
17+ , ddUncompressedSize = uncompressedSize }
data/examples/other/cpp/simple-import-out.hsnew file+14
@@ -0,0 +1,14 @@
1+module Main (main) where
2+
3+import Data.Void
4+import Test.Hspec
5+import Test.Hspec.Megaparsec
6+import Text.Megaparsec
7+import Text.Megaparsec.Char
8+
9+#if !MIN_VERSION_base(4,13,0)
10+import Data.Semigroup ((<>))
11+#endif
12+
13+main :: IO ()
14+main = return ()
data/examples/other/cpp/simple-import.hsnew file+14
@@ -0,0 +1,14 @@
1+module Main (main) where
2+
3+import Data.Void
4+import Test.Hspec
5+import Test.Hspec.Megaparsec
6+import Text.Megaparsec
7+import Text.Megaparsec.Char
8+
9+#if !MIN_VERSION_base(4,13,0)
10+import Data.Semigroup ((<>))
11+#endif
12+
13+main :: IO ()
14+main = return ()
data/examples/other/disabling/indented-fragment-out.hsnew file+7
@@ -0,0 +1,7 @@
1+foo =
2+ {- ORMOLU_DISABLE -}
3+ testCase "Foo" testFoo :
4+ testCase "Bar" testBar :
5+ testCase "Baz" testBaz :
6+ {- ORMOLU_ENABLE -}
7+ []
data/examples/other/disabling/indented-fragment.hsnew file+7
@@ -0,0 +1,7 @@
1+foo =
2+ {- ORMOLU_DISABLE -}
3+ testCase "Foo" testFoo :
4+ testCase "Bar" testBar :
5+ testCase "Baz" testBaz :
6+ {- ORMOLU_ENABLE -}
7+ []
data/examples/other/disabling/single-definition-out.hsnew file+10
@@ -0,0 +1,10 @@
1+module Foo (foo, bar) where
2+
3+{- ORMOLU_DISABLE -}
4+foo :: Int -> Int
5+foo = (+5)
6+{- ORMOLU_ENABLE -}
7+
8+bar :: Bool -> Bool
9+bar True = True
10+bar False = True
data/examples/other/disabling/single-definition.hsnew file+10
@@ -0,0 +1,10 @@
1+module Foo (foo,bar) where
2+
3+{- ORMOLU_DISABLE -}
4+foo :: Int -> Int
5+foo = (+5)
6+{- ORMOLU_ENABLE -}
7+
8+bar :: Bool -> Bool
9+bar True = True
10+bar False = True
data/examples/other/disabling/whole-file-out.hsnew file+10
@@ -0,0 +1,10 @@
1+{- ORMOLU_DISABLE -}
2+
3+module Foo (foo,bar) where
4+
5+foo :: Int -> Int
6+foo = (+5)
7+
8+bar :: Bool -> Bool
9+bar True = True
10+bar False = True
data/examples/other/disabling/whole-file.hsnew file+10
@@ -0,0 +1,10 @@
1+{- ORMOLU_DISABLE -}
2+
3+module Foo (foo,bar) where
4+
5+foo :: Int -> Int
6+foo = (+5)
7+
8+bar :: Bool -> Bool
9+bar True = True
10+bar False = True
data/examples/other/empty-forall-out.hsnew file+18
@@ -0,0 +1,18 @@
1+-- Empty foralls are handled correctly in different situations.
2+
3+data D = forall. D Int
4+
5+data G where
6+ G :: forall. Int -> G
7+
8+f :: forall. a -> a
9+f x = x
10+
11+type family T x where
12+ forall. T x = x
13+
14+{-# RULES
15+"r"
16+ r a =
17+ ()
18+ #-}
data/examples/other/empty-forall.hsnew file+17
@@ -0,0 +1,17 @@
1+-- Empty foralls are handled correctly in different situations.
2+
3+data D = forall. D Int
4+
5+data G where
6+ G :: forall. Int -> G
7+
8+f :: forall. a -> a
9+f x = x
10+
11+type family T x where
12+ forall. T x = x
13+
14+{-# RULES
15+ "r"
16+ forall. r a = ()
17+#-}
data/examples/other/empty-haddock-out.hsnew file+5
@@ -0,0 +1,5 @@
1+module Main where
2+
3+-- |
4+foo :: Int
5+foo = 5
data/examples/other/empty-haddock.hsnew file+6
@@ -0,0 +1,6 @@
1+module Main where
2+
3+-- |
4+
5+foo :: Int
6+foo = 5
data/examples/other/following-comment-last-0-out.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Another datatype...
24data D'
35-- ^ ...with two docstrings.
data/examples/other/following-comment-last-0.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Another datatype...
24data D'
35-- ^ ...with two docstrings.
data/examples/other/following-comment-last-1-out.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Another datatype...
24data D'
35 deriving (Show)
data/examples/other/following-comment-last-1.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Another datatype...
24data D'
35 deriving (Show)
data/examples/other/following-comment-last-2-out.hs+3
@@ -1,7 +1,10 @@
1+module Main where
2+
13-- | Another datatype...
24data D'
35 deriving (Show)
46-- ^ ...with two docstrings.
57
68-- more
9+
710data B
data/examples/other/following-comment-last-2.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Another datatype...
24data D'
35 deriving (Show)
data/examples/other/following-comment-last-3-out.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Another datatype...
24data D'
35-- ^ ...with two docstrings.
data/examples/other/following-comment-last-3.hs+2
@@ -1,3 +1,5 @@
1+module Main where
2+
13-- | Another datatype...
24data D'
35-- ^ ...with two docstrings.
data/examples/other/haddock-sections-out.hsnew file+7
@@ -0,0 +1,7 @@
1+-- $weird #anchor#
2+--
3+-- Section 1
4+
5+-- $normal
6+--
7+-- Section 2
data/examples/other/haddock-sections.hsnew file+7
@@ -0,0 +1,7 @@
1+-- $weird #anchor#
2+--
3+-- Section 1
4+
5+-- $normal
6+--
7+-- Section 2
data/examples/other/inline-comment-0-out.hsnew file+3
@@ -0,0 +1,3 @@
1+x = ({-a-} b, c)
2+
3+y = ({-a-} b)
data/examples/other/inline-comment-0.hsnew file+3
@@ -0,0 +1,3 @@
1+x = ({-a-}b, c)
2+
3+y = ({-a-}b)
data/examples/other/inline-comment-1-out.hsnew file+12
@@ -0,0 +1,12 @@
1+showPs env ((n, _, Let _ t v) : bs) =
2+ " " ++ show n ++ " : "
3+ ++ showEnv env ({- normalise ctxt env -} t)
4+ ++ " = "
5+ ++ showEnv env ({- normalise ctxt env -} v)
6+ ++ "\n"
7+ ++ showPs env bs
8+showPs env ((n, _, b) : bs) =
9+ " " ++ show n ++ " : "
10+ ++ showEnv env ({- normalise ctxt env -} (binderTy b))
11+ ++ "\n"
12+ ++ showPs env bs
data/examples/other/inline-comment-1.hsnew file+9
@@ -0,0 +1,9 @@
1+showPs env ((n, _, Let _ t v):bs)
2+ = " " ++ show n ++ " : " ++
3+ showEnv env ({- normalise ctxt env -} t) ++ " = " ++
4+ showEnv env ({- normalise ctxt env -} v) ++
5+ "\n" ++ showPs env bs
6+showPs env ((n, _, b):bs)
7+ = " " ++ show n ++ " : " ++
8+ showEnv env ({- normalise ctxt env -} (binderTy b)) ++
9+ "\n" ++ showPs env bs
data/examples/other/merging-comments-out.hsnew file+12
@@ -0,0 +1,12 @@
1+foo xs = baz
2+ where
3+ bar =
4+ catMaybes
5+ [ lookup langKey gets, -- 1
6+ lookup langKey cookies, -- 2
7+ lookupText langKey session -- 3
8+ ]
9+ ++ xs -- 4
10+
11+ -- Blah
12+ baz = addTwoLetters (id, Set.empty) bar
data/examples/other/merging-comments.hsnew file+9
@@ -0,0 +1,9 @@
1+foo xs = baz
2+ where
3+ bar = catMaybes [ lookup langKey gets -- 1
4+ , lookup langKey cookies -- 2
5+ , lookupText langKey session -- 3
6+ ] ++ xs -- 4
7+
8+ -- Blah
9+ baz = addTwoLetters (id, Set.empty) bar
data/examples/other/multiline-forall-out.hsnew file+58
@@ -0,0 +1,58 @@
1+{-# LANGUAGE GADTs #-}
2+{-# LANGUAGE PolyKinds #-}
3+{-# LANGUAGE RankNTypes #-}
4+{-# LANGUAGE TypeFamilies #-}
5+
6+-- Multiline foralls are consistent across all declarations
7+
8+data D
9+ = forall
10+ ( f ::
11+ * -> * -> *
12+ )
13+ (x :: *)
14+ (y :: *).
15+ D (f x y)
16+
17+data G where
18+ G ::
19+ forall
20+ ( f ::
21+ * -> * -> *
22+ )
23+ (x :: *)
24+ (y :: *).
25+ f x y ->
26+ G
27+
28+f ::
29+ forall
30+ ( f ::
31+ * -> * -> *
32+ )
33+ (x :: *)
34+ (y :: *).
35+ f x y ->
36+ ()
37+f = const ()
38+
39+type family T f x y where
40+ forall
41+ ( f ::
42+ * -> * -> *
43+ )
44+ (x :: *)
45+ (y :: *).
46+ T f x y =
47+ f x y
48+
49+{-# RULES
50+"r" forall
51+ ( f ::
52+ * -> * -> *
53+ )
54+ (x :: *)
55+ (y :: *).
56+ r (a :: f x y) =
57+ ()
58+ #-}
data/examples/other/multiline-forall.hsnew file+46
@@ -0,0 +1,46 @@
1+{-# LANGUAGE RankNTypes, PolyKinds, GADTs, TypeFamilies #-}
2+
3+-- Multiline foralls are consistent across all declarations
4+
5+data D =
6+ forall
7+ (f ::
8+ * -> * -> *)
9+ (x :: *)
10+ (y :: *)
11+ . D (f x y)
12+
13+data G where
14+ G :: forall
15+ (f ::
16+ * -> * -> *)
17+ (x :: *)
18+ (y :: *)
19+ . f x y -> G
20+
21+f :: forall
22+ (f ::
23+ * -> * -> *)
24+ (x :: *)
25+ (y :: *)
26+ . f x y -> ()
27+f = const ()
28+
29+type family T f x y where
30+ forall
31+ (f ::
32+ * -> * -> *)
33+ (x :: *)
34+ (y :: *)
35+ . T f x y = f x y
36+
37+{-# RULES
38+ "r"
39+ forall
40+ (f ::
41+ * -> * -> *)
42+ (x :: *)
43+ (y :: *)
44+ . r (a :: f x y) =
45+ ()
46+ #-}
data/examples/other/multiple-blank-line-comment-out.hsnew file+9
@@ -0,0 +1,9 @@
1+module A where
2+
3+a =
4+ b
5+ [ f
6+ {-,
7+
8+ -}
9+ ]
data/examples/other/multiple-blank-line-comment.hsnew file+10
@@ -0,0 +1,10 @@
1+module A where
2+
3+a =
4+ b
5+ [ f
6+ {-,
7+
8+
9+ -}
10+ ]
data/examples/other/overly-indented-out.hsnew file+11
@@ -0,0 +1,11 @@
1+tagCloudField ::
2+ -- | Destination key
3+ String ->
4+ -- | Smallest font size, in percent
5+ Double ->
6+ -- | Biggest font size, in percent
7+ Double ->
8+ -- | Input tags
9+ Tags ->
10+ -- | Context
11+ Context a
data/examples/other/overly-indented.hsnew file+10
@@ -0,0 +1,10 @@
1+tagCloudField :: String
2+ -- ^ Destination key
3+ -> Double
4+ -- ^ Smallest font size, in percent
5+ -> Double
6+ -- ^ Biggest font size, in percent
7+ -> Tags
8+ -- ^ Input tags
9+ -> Context a
10+ -- ^ Context
data/examples/other/pragma-comments-after-out.hsnew file+4
@@ -0,0 +1,4 @@
1+{-# LANGUAGE AllowAmbiguousTypes #-}
2+{-# LANGUAGE ConstraintKinds #-}
3+-- TODO: Fix and delete this pragma
4+{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
data/examples/other/pragma-comments-after.hsnew file+3
@@ -0,0 +1,3 @@
1+{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-} -- TODO: Fix and delete this pragma
2+{-# LANGUAGE AllowAmbiguousTypes #-}
3+{-# LANGUAGE ConstraintKinds #-}
data/examples/other/pragma-comments-out.hsnew file+8
@@ -0,0 +1,8 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+-- TODO This extension is probably too dangerous, remove it.
3+{-# LANGUAGE RecordWildCards #-}
4+-- Avoid warning produced by TH.
5+{-# OPTIONS_GHC -fno-warn-overlapping-patterns #-}
6+
7+-- | Header comment.
8+module Foo () where
data/examples/other/pragma-comments.hsnew file+11
@@ -0,0 +1,11 @@
1+-- | Header comment.
2+
3+{-# LANGUAGE OverloadedStrings #-}
4+
5+-- Avoid warning produced by TH.
6+{-# OPTIONS_GHC -fno-warn-overlapping-patterns #-}
7+
8+-- TODO This extension is probably too dangerous, remove it.
9+{-# LANGUAGE RecordWildCards #-}
10+
11+module Foo () where
data/examples/other/pragma-out.hs+1−4
@@ -9,7 +9,4 @@
99{-# OPTIONS_HADDOCK prune, show-extensions #-}
1010
1111-- | Header comment.
12−module Foo
13− (
14− )
15−where
12+module Foo () where
data/examples/other/pragma-sorting-out.hsnew file+11
@@ -0,0 +1,11 @@
1+{-# LANGUAGE NondecreasingIndentation #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+{-# LANGUAGE TypeFamilies #-}
4+-- This gap is necessary for stylish Haskell not to re-arrange
5+-- NoMonoLocalBinds before TypeFamilies
6+{-# LANGUAGE NoMonoLocalBinds #-}
7+
8+module Foo
9+ ( bar,
10+ )
11+where
data/examples/other/pragma-sorting.hsnew file+10
@@ -0,0 +1,10 @@
1+{-# LANGUAGE ScopedTypeVariables #-}
2+{-# LANGUAGE TypeFamilies #-}
3+{-# LANGUAGE NondecreasingIndentation #-}
4+-- This gap is necessary for stylish Haskell not to re-arrange
5+-- NoMonoLocalBinds before TypeFamilies
6+{-# LANGUAGE NoMonoLocalBinds #-}
7+
8+module Foo (
9+ bar
10+ ) where
data/printer/list0-multi.hsdeleted−4
@@ -1,4 +0,0 @@
1−[ foo,
2− bar,
3− baz
4− ]
data/printer/list0-single.hsdeleted−1
@@ -1 +0,0 @@
1−[foo, bar, baz]
data/printer/list1-multi.hsdeleted−8
@@ -1,8 +0,0 @@
1−[ foo,
2− bar,
3− foo
4− :: ( Int
5− -> Int
6− )
7− -> Bool
8− ]
data/printer/list1-single.hsdeleted−1
@@ -1 +0,0 @@
1−[foo, bar, foo :: (Int -> Int) -> Bool]
data/printer/mhdr-multi.hsdeleted−7
@@ -1,7 +0,0 @@
1−module MyModule
2− ( R,
3− runR,
4− txt,
5− blah
6− )
7−where
data/printer/mhdr-single.hsdeleted−3
@@ -1,3 +0,0 @@
1−module MyModule
2− (R, runR, txt, blah)
3−where
data/printer/ssig-multi.hsdeleted−5
@@ -1,5 +0,0 @@
1−foo
2− :: ( Int
3− -> Int
4− )
5− -> Bool
data/printer/ssig-single.hsdeleted−1
@@ -1 +0,0 @@
1−foo :: (Int -> Int) -> Bool
default.nix+122−36
@@ -1,12 +1,14 @@
1−{ pkgs ? (import ./nix/nixpkgs) }:
1+{ pkgs ? (import ./nix/nixpkgs { inherit system; })
2+, system ? builtins.currentSystem
3+, ormoluCompiler ? "ghc884" # the shell doesn't work with ghc8101 yet
4+}:
25
36let
4− ormoluCompiler = "ghc865";
5− source = pkgs.lib.sourceByRegex ./.[
7+ source = pkgs.lib.sourceByRegex ./. [
68 "^.*\.md$"
79 "^app.*$"
810 "^data.*$"
9− "^ormolu.cabal$"
11+ "^ormolu\.cabal$"
1012 "^src.*$"
1113 "^tests.*$"
1214 ];
@@ -14,28 +16,72 @@ let
1416 overrides = ormoluOverlay;
1517 };
1618 ormoluOverlay = self: super: {
17− "ormolu" = super.callCabal2nix "ormolu" source { };
19+ "ormolu" = super.callCabal2nixWithOptions "ormolu" source "-fdev" { };
1820 };
1921 ormolize = import ./nix/ormolize {
2022 inherit pkgs;
2123 inherit haskellPackages;
2224 };
25+ expectedFailures = [
26+ "Agda"
27+ "aws"
28+ "distributed-process"
29+ "esqueleto"
30+ "fay"
31+ "hlint"
32+ "idris"
33+ "intero"
34+ "leksah"
35+ "pandoc"
36+ "pipes"
37+ "postgrest"
38+ "purescript"
39+ "tensorflow"
40+ ] ++ (if ormoluCompiler == "ghc8101" then [] else ["lens"]);
2341 ormolizedPackages = doCheck:
24− pkgs.lib.mapAttrs (_: v: ormolize { package = v; inherit doCheck; }) haskellPackages;
42+ pkgs.lib.mapAttrs (name: p: ormolize {
43+ package = p;
44+ inherit doCheck;
45+ expectedFailures =
46+ if pkgs.lib.lists.any (x: x == name) expectedFailures
47+ then ./expected-failures + "/${name}.txt"
48+ else null;
49+ }) haskellPackages;
2550in {
2651 ormolu = haskellPackages.ormolu;
27− ormoluShell = haskellPackages.shellFor {
28− packages = ps: [ ps.ormolu ];
29− buildInputs = [ haskellPackages.cabal-install haskellPackages.ghcid ];
52+ # We put the derivations in another attribute set to avoid building them
53+ # when nix-build is run.
54+ dev = {
55+ ormoluShell =
56+ haskellPackages.shellFor {
57+ packages = ps: [
58+ ps.ormolu
59+ ];
60+ buildInputs = [
61+ haskellPackages.cabal-install
62+ haskellPackages.ghcid
63+ ];
64+ };
65+ withOrmolu = haskellPackages.shellFor {
66+ packages = ps: [];
67+ buildInputs = [
68+ haskellPackages.cabal-install
69+ haskellPackages.ormolu
70+ ];
71+ };
3072 };
3173 inherit ormoluOverlay ormoluCompiler;
3274 hackage = ormolizedPackages false;
3375 hackageTests = with pkgs.lib; pkgs.recurseIntoAttrs (
3476 let ps = [
77+ "Agda"
3578 "QuickCheck"
3679 "ShellCheck"
3780 "aeson"
3881 "attoparsec"
82+ "aws"
83+ "brick"
84+ "capability"
3985 "cassava"
4086 "conduit"
4187 "cryptonite"
@@ -43,41 +89,81 @@ in {
4389 "distributed-process"
4490 "esqueleto"
4591 "fay"
92+ "hakyll"
93+ "haxl"
4694 "hedgehog"
95+ "hledger"
4796 "hlint"
97+ "http-client"
98+ "idris"
99+ "intero"
100+ "leksah"
101+ "lens"
48102 "megaparsec"
103+ "optics"
104+ "ormolu"
105+ "pandoc"
106+ "parsec3"
107+ "pipes"
49108 "postgrest"
109+ "purescript"
50110 "servant"
51111 "servant-server"
112+ "stack"
52113 "tensorflow"
53−
54− # Comment idempotence issue
55−
56− # "Agda"
57− # "aws"
58− # "brick"
59− # "hakyll"
60− # "haxl"
61− # "hledger"
62− # "http-client"
63− # "idris"
64− # "intero"
65− # "leksah"
66− # "lens"
67− # "ormolu"
68− # "pandoc"
69− # "pipes"
70− # "purescript"
71− # "stack"
72− # "tls"
73− # "yesod-core"
74−
75− # Missing language extension
76−
77− # "lens" #fixed in master
78− # "purescript"
79−
114+ "text_1_2_4_0"
115+ "tls"
116+ "yesod-core"
80117 ];
81118 in listToAttrs (map (p: nameValuePair p (ormolizedPackages true).${p}) ps)
82119 );
120+ regionTests = pkgs.stdenv.mkDerivation {
121+ name = "ormolu-region-tests";
122+ src = ./region-tests;
123+ buildInputs = [
124+ haskellPackages.ormolu
125+ pkgs.diffutils
126+ ];
127+ doCheck = true;
128+ buildPhase = ''
129+ cp src.hs result-all-implicit.hs
130+ ormolu --check-idempotence --mode inplace result-all-implicit.hs
131+ cp src.hs result-all-explicit.hs
132+ ormolu --check-idempotence --mode inplace --start-line 1 --end-line 18 result-all-explicit.hs
133+ cp src.hs result-only-start.hs
134+ ormolu --check-idempotence --mode inplace --start-line 1 result-only-start.hs
135+ cp src.hs result-only-end.hs
136+ ormolu --check-idempotence --mode inplace --end-line 18 result-only-end.hs
137+ cp src.hs result-6-7.hs
138+ ormolu --check-idempotence --mode inplace --start-line 6 --end-line 7 result-6-7.hs
139+ cp src.hs result-6-8.hs
140+ ormolu --check-idempotence --mode inplace --start-line 6 --end-line 8 result-6-8.hs
141+ cp src.hs result-9-12.hs
142+ ormolu --check-idempotence --mode inplace --start-line 9 --end-line 12 result-9-12.hs
143+ cp src.hs result-17-18.hs
144+ ormolu --check-idempotence --mode inplace --start-line 17 --end-line 18 result-17-18.hs
145+ '';
146+ checkPhase = ''
147+ echo result-all-implicit.hs
148+ diff --color=always expected-result-all.hs result-all-implicit.hs
149+ echo result-all-explicit.hs
150+ diff --color=always expected-result-all.hs result-all-explicit.hs
151+ echo result-only-start.hs
152+ diff --color=always expected-result-all.hs result-only-start.hs
153+ echo result-only-end.hs
154+ diff --color=always expected-result-all.hs result-only-end.hs
155+ echo result-6-7.hs
156+ diff --color=always expected-result-6-7.hs result-6-7.hs
157+ echo result-6-8.hs
158+ diff --color=always expected-result-6-8.hs result-6-8.hs
159+ echo result-9-12.hs
160+ diff --color=always expected-result-9-12.hs result-9-12.hs
161+ echo result-17-18.hs
162+ diff --color=always expected-result-17-18.hs result-17-18.hs
163+ '';
164+ installPhase = ''
165+ mkdir "$out"
166+ find . -name '*.hs' -exec cp --parents {} $out \;
167+ '';
168+ };
83169}
expected-failures/Agda.txtnew file+11
@@ -0,0 +1,11 @@
1+Formatting is not idempotent:
2+ dist/build/Agda/Syntax/Parser/Lexer.hs<rendered>:1602:17
3+ before: " = (check_ac"
4+ after: " =\n "
5+Please, consider reporting the bug.
6+
7+Formatting is not idempotent:
8+ src/full/Agda/Syntax/Translation/InternalToAbstract.hs<rendered>:769:4
9+ before: " nes\n\n "
10+ after: " nes\n\n -- Andreas"
11+Please, consider reporting the bug.
expected-failures/aws.txtnew file+9
@@ -0,0 +1,9 @@
1+The GHC parser (in Haddock mode) failed:
2+ Examples/PutBucketNearLine.hs:5:1-6
3+ parse error on input `import'
4+
5+The GHC parser (in Haddock mode) failed:
6+ Examples/Sqs.hs:(88,3)-(90,4)
7+ parse error on input `{- | Let's make sure the queue was actually deleted and that the same number of queues exist at when
8+ | the program ends as when it started.
9+ -}'
expected-failures/distributed-process.txtnew file+7
@@ -0,0 +1,7 @@
1+The GHC parser (in Haddock mode) failed:
2+ benchmarks/Channels.hs:2:1-6
3+ parse error on input `import'
4+
5+The GHC parser (in Haddock mode) failed:
6+ benchmarks/Spawns.hs:5:1-6
7+ parse error on input `import'
expected-failures/esqueleto.txtnew file+7
@@ -0,0 +1,7 @@
1+The GHC parser (in Haddock mode) failed:
2+ src/Database/Esqueleto/Internal/Internal.hs:379:1
3+ lexical error in string/character literal at character 's'
4+
5+The GHC parser (in Haddock mode) failed:
6+ test/PostgreSQL/Test.hs:562:9-41
7+ parse error on input `-- | Check the result is not null'
expected-failures/fay.txtnew file+18
@@ -0,0 +1,18 @@
1+The GHC parser (in Haddock mode) failed:
2+ examples/Separated.hs:12:1-6
3+ parse error on input `module'
4+
5+The GHC parser (in Haddock mode) failed:
6+ examples/calc.hs:(4,1)-(6,2)
7+ parse error on input `-- $ fay -p --html-wrapper --html-js-lib jquery.min.js examples/calc.hs
8+-- You also need to download jquery.min.js.
9+--'
10+
11+The GHC parser (in Haddock mode) failed:
12+ examples/canvaswater.hs:(6,1)-(7,17)
13+ parse error on input `-- | A demonstration of Fay using the canvas element to display a
14+-- simple effect.'
15+
16+The GHC parser (in Haddock mode) failed:
17+ examples/data.hs:9:1-6
18+ parse error on input `module'
expected-failures/hlint.txtnew file+11
@@ -0,0 +1,11 @@
1+Formatting is not idempotent:
2+ src/Extension.hs<rendered>:19:22
3+ before: "DoRec , -} Recursive"
4+ after: "DoRec , -}\n "
5+Please, consider reporting the bug.
6+
7+Formatting is not idempotent:
8+ src/Hint/Bracket.hs<rendered>:249:50
9+ before: "\" x y [r]) {ideaSpan"
10+ after: "\" x y [r])\n "
11+Please, consider reporting the bug.
expected-failures/idris.txtnew file+7
@@ -0,0 +1,7 @@
1+The GHC parser (in Haddock mode) failed:
2+ src/Idris/Parser.hs:1052:1
3+ parse error on input `@'
4+
5+The GHC parser (in Haddock mode) failed:
6+ src/Idris/Parser/Expr.hs:75:1
7+ parse error on input `@'
expected-failures/intero.txtnew file+5
@@ -0,0 +1,5 @@
1+Formatting is not idempotent:
2+ src/InteractiveUI.hs<rendered>:3748:33
3+ before: "text \"Try\" <+> doWha"
4+ after: "text \"Try\"\n "
5+Please, consider reporting the bug.
expected-failures/leksah.txtnew file+5
@@ -0,0 +1,5 @@
1+Formatting is not idempotent:
2+ src/IDE/Pane/Modules.hs<rendered>:1184:7
3+ before: "cr\n -- show"
4+ after: "cr\n in -- show"
5+Please, consider reporting the bug.
expected-failures/lens.txtnew file+3
@@ -0,0 +1,3 @@
1+The GHC parser (in Haddock mode) failed:
2+ src/Control/Exception/Lens.hs:180:13-37
3+ parse error on input `AllocationLimitExceeded__'
expected-failures/pandoc.txtnew file+9
@@ -0,0 +1,9 @@
1+The GHC parser (in Haddock mode) failed:
2+ benchmark/weigh-pandoc.hs:14:1-6
3+ parse error on input `import'
4+
5+Formatting is not idempotent:
6+ src/Text/Pandoc/Readers/Vimwiki.hs<rendered>:613:19
7+ before: ".softbreak <$ endlin"
8+ after: ".softbreak\n <$ en"
9+Please, consider reporting the bug.
expected-failures/pipes.txtnew file+3
@@ -0,0 +1,3 @@
1+AST of input and AST of formatted code differ.
2+ at src/Pipes/Core.hs:(128,1)-(151,2)
3+Please, consider reporting the bug.
expected-failures/postgrest.txtnew file+5
@@ -0,0 +1,5 @@
1+Formatting is not idempotent:
2+ src/PostgREST/DbRequestBuilder.hs<rendered>:149:24
3+ before: " || -- clients"
4+ after: " || ( origin ="
5+Please, consider reporting the bug.
expected-failures/purescript.txtnew file+18
@@ -0,0 +1,18 @@
1+The GHC parser (in Haddock mode) failed:
2+ src/Language/PureScript/AST/Declarations.hs:479:1-17
3+ Invalid type signature: pattern ValueDecl :: ...
4+Perhaps you meant to use PatternSynonyms?
5+
6+The GHC parser (in Haddock mode) failed:
7+ src/Language/PureScript/AST/SourcePos.hs:99:1-22
8+ Invalid type signature: pattern NullSourceSpan :: ...
9+Perhaps you meant to use PatternSynonyms?
10+
11+The GHC parser (in Haddock mode) failed:
12+ src/Language/PureScript/Constants.hs:42:1-15
13+ Invalid type signature: pattern Discard :: ...
14+Perhaps you meant to use PatternSynonyms?
15+
16+The GHC parser (in Haddock mode) failed:
17+ src/Language/PureScript/Crash.hs:16:1-6
18+ parse error on input `import'
expected-failures/tensorflow.txtnew file+7
@@ -0,0 +1,7 @@
1+The GHC parser (in Haddock mode) failed:
2+ tensorflow-mnist/app/Main.hs:50:13-14
3+ parse error on input `->'
4+
5+The GHC parser (in Haddock mode) failed:
6+ tensorflow-ops/tests/RegressionTest.hs:3:1-6
7+ parse error on input `import'
format.shnew file+14
@@ -0,0 +1,14 @@
1+#!/usr/bin/env nix-shell
2+#!nix-shell default.nix -A dev.withOrmolu -i bash --pure
3+#
4+# Format Ormolu using current version of Ormolu.
5+
6+set -e
7+
8+export LANG="C.UTF-8"
9+
10+cabal format
11+
12+ormolu -m inplace $(find app -type f -name "*.hs")
13+ormolu -m inplace $(find src -type f \( -name "*.hs" -o -name "*.hs-boot" \))
14+ormolu -m inplace $(find tests -type f -name "*.hs")
nix/nixpkgs/default.nix+7−3
@@ -1,9 +1,13 @@
1+{ system ? builtins.currentSystem }:
12let
2− rev = "3f4144c30a6351dd79b177328ec4dea03e2ce45f";
3− sha256 = "1qg5n60n3fr6cypihnrjw451fadps5pysj5p0vvfb320mpfvlbjb";
3+ rev = "32b46dd897ab2143a609988a04d87452f0bbef59";
4+ sha256 = "1gzfrpjnr1bz9zljsyg3a4zrhk8r927sz761mrgcg56dwinkhpjk";
45 nixpkgs = builtins.fetchTarball {
56 url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
67 inherit sha256;
78 };
8− pkgs = import nixpkgs { config.allowUnfree = true; };
9+ pkgs = import nixpkgs {
10+ inherit system;
11+ config.allowUnfree = true;
12+ };
913in pkgs
nix/ormolize/default.nix+36−10
@@ -1,23 +1,49 @@
1−{ pkgs, haskellPackages }: { package, doCheck ? false }:
2− pkgs.stdenv.mkDerivation {
1+{ pkgs
2+, haskellPackages
3+}:
4+{ package
5+, expectedFailures ? null
6+, doCheck ? false
7+}:
8+ pkgs.stdenv.mkDerivation rec {
39 name = package.name + "-ormolized";
410 src = package.src;
511 buildInputs = [
612 haskellPackages.cpphs
7− (if doCheck
8− then haskellPackages.ormolu
9− else pkgs.haskell.lib.dontCheck haskellPackages.ormolu)
13+ haskellPackages.ormolu
14+ pkgs.diffutils
1015 pkgs.glibcLocales
1116 ];
1217 LANG = "en_US.UTF-8";
1318 buildPhase = ''
14− find . -name '*.hs' -exec bash ${./ormolize.sh} {} \; 2> log.txt
15− cat log.txt
19+ hs_files=$(find . -name '*.hs')
20+ for hs_file in $hs_files; do
21+
22+ # drop includes
23+ sed -i '/^#include/d' "$hs_file"
24+
25+ # deal with CPP
26+ cpphs "$hs_file" --noline -DARCH_X86 > "''${hs_file}-nocpp" 2> /dev/null
27+
28+ # annoyingly, cpphs cannot modify files in place
29+ mv "''${hs_file}-nocpp" "$hs_file"
30+
31+ # preserve the original
32+ cp "$hs_file" "''${hs_file}-original"
33+ done
34+
35+ (ormolu --check-idempotence --mode inplace $hs_files || true) 2> log.txt
1636 '';
1737 inherit doCheck;
18− checkPhase = ''
19− if [[ -s log.txt ]]; then exit 1; fi
20− '';
38+ checkPhase =
39+ if expectedFailures == null
40+ then ''
41+ echo "No failures expected"
42+ if [[ -s log.txt ]]; then exit 1; fi
43+ ''
44+ else ''
45+ diff --ignore-blank-lines --color=always ${expectedFailures} log.txt
46+ '';
2147 installPhase = ''
2248 mkdir "$out"
2349 find . -name '*.hs-original' -exec cp --parents {} $out \;
nix/ormolize/ormolize.shdeleted−17
@@ -1,17 +0,0 @@
1−set -euo pipefail
2−
3−# drop includes
4−sed -i '/^#include/d' "$1"
5−
6−# deal with CPP in a fairly straightforward way
7−cpphs "$1" --noline > "$1-nocpp" 2> /dev/null
8−
9−# annoyingly, cpphs cannot modify files in place
10−mv "$1-nocpp" "$1"
11−
12−# preserve the original
13−cp "$1" "$1-original"
14−
15−# run ormolu
16−ormolu --tolerate-cpp --check-idempotency --mode inplace "$1" ||
17− ormolu --tolerate-cpp --unsafe --mode inplace "$1"
ormolu.cabal+174−156
@@ -1,166 +1,184 @@
1−name: ormolu
2−version: 0.0.1.0
3−cabal-version: 1.18
4−tested-with: GHC==8.6.5
5−license: BSD3
6−license-file: LICENSE.md
7−maintainer: Mark Karpov <mark.karpov@tweag.io>
8−homepage: https://github.com/tweag/ormolu
9−bug-reports: https://github.com/tweag/ormolu/issues
10−category: Development, Formatting
11−synopsis: A formatter for Haskell source code
12−build-type: Simple
13−description: A formatter for Haskell source code.
14−extra-doc-files: CONTRIBUTING.md
15− , CHANGELOG.md
16− , DESIGN.md
17− , README.md
18−data-files: data/examples/declaration/annotation/*.hs
19− , data/examples/declaration/class/*.hs
20− , data/examples/declaration/data/*.hs
21− , data/examples/declaration/data/gadt/*.hs
22− , data/examples/declaration/default/*.hs
23− , data/examples/declaration/deriving/*.hs
24− , data/examples/declaration/foreign/*.hs
25− , data/examples/declaration/instance/*.hs
26− , data/examples/declaration/rewrite-rule/*.hs
27− , data/examples/declaration/role-annotation/*.hs
28− , data/examples/declaration/signature/complete/*.hs
29− , data/examples/declaration/signature/fixity/*.hs
30− , data/examples/declaration/signature/inline/*.hs
31− , data/examples/declaration/signature/minimal/*.hs
32− , data/examples/declaration/signature/pattern/*.hs
33− , data/examples/declaration/signature/set-cost-centre/*.hs
34− , data/examples/declaration/signature/specialize/*.hs
35− , data/examples/declaration/signature/type/*.hs
36− , data/examples/declaration/splice/*.hs
37− , data/examples/declaration/type-families/closed-type-family/*.hs
38− , data/examples/declaration/type-families/data-family/*.hs
39− , data/examples/declaration/type-families/type-family/*.hs
40− , data/examples/declaration/type-synonyms/*.hs
41− , data/examples/declaration/type/*.hs
42− , data/examples/declaration/value/function/*.hs
43− , data/examples/declaration/value/function/arrow/*.hs
44− , data/examples/declaration/value/function/comprehension/*.hs
45− , data/examples/declaration/value/function/do/*.hs
46− , data/examples/declaration/value/function/infix/*.hs
47− , data/examples/declaration/value/function/pattern/*.hs
48− , data/examples/declaration/value/other/*.hs
49− , data/examples/declaration/value/pattern-synonyms/*.hs
50− , data/examples/declaration/warning/*.hs
51− , data/examples/import/*.hs
52− , data/examples/module-header/*.hs
53− , data/examples/other/*.hs
54− , data/printer/*.hs
1+cabal-version: 1.18
2+name: ormolu
3+version: 0.1.2.0
4+license: BSD3
5+license-file: LICENSE.md
6+maintainer: Mark Karpov <mark.karpov@tweag.io>
7+tested-with: ghc ==8.6.5 ghc ==8.8.4 ghc ==8.10.1
8+homepage: https://github.com/tweag/ormolu
9+bug-reports: https://github.com/tweag/ormolu/issues
10+synopsis: A formatter for Haskell source code
11+description: A formatter for Haskell source code.
12+category: Development, Formatting
13+build-type: Simple
14+data-files:
15+ data/examples/declaration/annotation/*.hs
16+ data/examples/declaration/class/*.hs
17+ data/examples/declaration/data/*.hs
18+ data/examples/declaration/data/gadt/*.hs
19+ data/examples/declaration/default/*.hs
20+ data/examples/declaration/deriving/*.hs
21+ data/examples/declaration/foreign/*.hs
22+ data/examples/declaration/instance/*.hs
23+ data/examples/declaration/rewrite-rule/*.hs
24+ data/examples/declaration/role-annotation/*.hs
25+ data/examples/declaration/signature/complete/*.hs
26+ data/examples/declaration/signature/fixity/*.hs
27+ data/examples/declaration/signature/inline/*.hs
28+ data/examples/declaration/signature/minimal/*.hs
29+ data/examples/declaration/signature/pattern/*.hs
30+ data/examples/declaration/signature/set-cost-centre/*.hs
31+ data/examples/declaration/signature/specialize/*.hs
32+ data/examples/declaration/signature/type/*.hs
33+ data/examples/declaration/splice/*.hs
34+ data/examples/declaration/type-families/closed-type-family/*.hs
35+ data/examples/declaration/type-families/data-family/*.hs
36+ data/examples/declaration/type-families/type-family/*.hs
37+ data/examples/declaration/type-synonyms/*.hs
38+ data/examples/declaration/type/*.hs
39+ data/examples/declaration/value/function/*.hs
40+ data/examples/declaration/value/function/arrow/*.hs
41+ data/examples/declaration/value/function/comprehension/*.hs
42+ data/examples/declaration/value/function/do/*.hs
43+ data/examples/declaration/value/function/infix/*.hs
44+ data/examples/declaration/value/function/pattern/*.hs
45+ data/examples/declaration/value/other/*.hs
46+ data/examples/declaration/value/pattern-synonyms/*.hs
47+ data/examples/declaration/warning/*.hs
48+ data/examples/import/*.hs
49+ data/examples/module-header/*.hs
50+ data/examples/other/*.hs
51+
52+extra-doc-files:
53+ CONTRIBUTING.md
54+ CHANGELOG.md
55+ DESIGN.md
56+ README.md
5557
5658source-repository head
57− type: git
58− location: https://github.com/tweag/ormolu.git
59+ type: git
60+ location: https://github.com/tweag/ormolu.git
5961
6062flag dev
61− description: Turn on development settings.
62− manual: True
63− default: False
63+ description: Turn on development settings.
64+ default: False
65+ manual: True
6466
6567library
66− hs-source-dirs: src
67− build-depends: base >= 4.12 && < 5.0
68− , bytestring >= 0.2 && < 0.11
69− , containers >= 0.5 && < 0.7
70− , dlist >= 0.8 && < 0.9
71− , exceptions >= 0.6 && < 0.11
72− , ghc == 8.6.5
73− , ghc-boot-th == 8.6.5
74− , ghc-paths >= 0.1 && < 0.2
75− , mtl >= 2.0 && < 3.0
76− , syb >= 0.7 && < 0.8
77− , text >= 0.2 && < 1.3
78− exposed-modules: Ormolu
79− , Ormolu.Config
80− , Ormolu.Diff
81− , Ormolu.Exception
82− , Ormolu.Imports
83− , Ormolu.Parser
84− , Ormolu.Parser.Anns
85− , Ormolu.Parser.CommentStream
86− , Ormolu.Parser.Pragma
87− , Ormolu.Parser.Result
88− , Ormolu.Printer
89− , Ormolu.Printer.Combinators
90− , Ormolu.Printer.Comments
91− , Ormolu.Printer.Internal
92− , Ormolu.Printer.Meat.Common
93− , Ormolu.Printer.Meat.Declaration
94− , Ormolu.Printer.Meat.Declaration.Annotation
95− , Ormolu.Printer.Meat.Declaration.Class
96− , Ormolu.Printer.Meat.Declaration.Data
97− , Ormolu.Printer.Meat.Declaration.Default
98− , Ormolu.Printer.Meat.Declaration.Foreign
99− , Ormolu.Printer.Meat.Declaration.Instance
100− , Ormolu.Printer.Meat.Declaration.RoleAnnotation
101− , Ormolu.Printer.Meat.Declaration.Rule
102− , Ormolu.Printer.Meat.Declaration.Signature
103− , Ormolu.Printer.Meat.Declaration.Splice
104− , Ormolu.Printer.Meat.Declaration.Type
105− , Ormolu.Printer.Meat.Declaration.TypeFamily
106− , Ormolu.Printer.Meat.Declaration.Value
107− , Ormolu.Printer.Meat.Declaration.Warning
108− , Ormolu.Printer.Meat.ImportExport
109− , Ormolu.Printer.Meat.Pragma
110− , Ormolu.Printer.Meat.Module
111− , Ormolu.Printer.Meat.Type
112− , Ormolu.Printer.SpanStream
113− , Ormolu.Utils
114− if flag(dev)
115− ghc-options: -Wall -Werror -Wcompat
116− -Wincomplete-record-updates
117− -Wincomplete-uni-patterns
118− -Wnoncanonical-monad-instances
119− -Wnoncanonical-monadfail-instances
120− else
121− ghc-options: -O2 -Wall
122− default-language: Haskell2010
68+ exposed-modules:
69+ Ormolu
70+ Ormolu.Config
71+ Ormolu.Diff
72+ Ormolu.Exception
73+ Ormolu.Imports
74+ Ormolu.Parser
75+ Ormolu.Parser.Anns
76+ Ormolu.Parser.CommentStream
77+ Ormolu.Parser.Pragma
78+ Ormolu.Parser.Result
79+ Ormolu.Parser.Shebang
80+ Ormolu.Printer
81+ Ormolu.Printer.Combinators
82+ Ormolu.Printer.Comments
83+ Ormolu.Printer.Internal
84+ Ormolu.Printer.Meat.Common
85+ Ormolu.Printer.Meat.Declaration
86+ Ormolu.Printer.Meat.Declaration.Annotation
87+ Ormolu.Printer.Meat.Declaration.Class
88+ Ormolu.Printer.Meat.Declaration.Data
89+ Ormolu.Printer.Meat.Declaration.Default
90+ Ormolu.Printer.Meat.Declaration.Foreign
91+ Ormolu.Printer.Meat.Declaration.Instance
92+ Ormolu.Printer.Meat.Declaration.RoleAnnotation
93+ Ormolu.Printer.Meat.Declaration.Rule
94+ Ormolu.Printer.Meat.Declaration.Signature
95+ Ormolu.Printer.Meat.Declaration.Splice
96+ Ormolu.Printer.Meat.Declaration.Type
97+ Ormolu.Printer.Meat.Declaration.TypeFamily
98+ Ormolu.Printer.Meat.Declaration.Value
99+ Ormolu.Printer.Meat.Declaration.Warning
100+ Ormolu.Printer.Meat.ImportExport
101+ Ormolu.Printer.Meat.Module
102+ Ormolu.Printer.Meat.Pragma
103+ Ormolu.Printer.Meat.Type
104+ Ormolu.Printer.Operators
105+ Ormolu.Printer.SpanStream
106+ Ormolu.Processing.Common
107+ Ormolu.Processing.Cpp
108+ Ormolu.Processing.Postprocess
109+ Ormolu.Processing.Preprocess
110+ Ormolu.Utils
123111
124−test-suite tests
125− main-is: Spec.hs
126− hs-source-dirs: tests
127− type: exitcode-stdio-1.0
128− build-depends: base >= 4.12 && < 5.0
129− , containers >= 0.5 && < 0.7
130− , filepath >= 1.2 && < 1.5
131− , hspec >= 2.0 && < 3.0
132− , ormolu
133− , path >= 0.6 && < 0.7
134− , path-io >= 1.4.2 && < 2.0
135− , text >= 0.2 && < 1.3
136− build-tools: hspec-discover >= 2.0 && < 3.0
137− other-modules:
138− Ormolu.Printer.CombinatorsSpec
139− , Ormolu.Parser.PragmaSpec
140− , Ormolu.PrinterSpec
112+ hs-source-dirs: src
113+ other-modules:
114+ GHC
115+ GHC.DynFlags
116+
117+ default-language: Haskell2010
118+ build-depends:
119+ base >=4.12 && <5.0,
120+ bytestring >=0.2 && <0.11,
121+ containers >=0.5 && <0.7,
122+ dlist >=0.8 && <2.0,
123+ exceptions >=0.6 && <0.11,
124+ ghc-lib-parser >=8.10 && <8.11,
125+ mtl >=2.0 && <3.0,
126+ syb >=0.7 && <0.8,
127+ text >=0.2 && <1.3
141128
142− if flag(dev)
143− ghc-options: -Wall -Werror
144− else
145− ghc-options: -O2 -Wall
146− default-language: Haskell2010
129+ if flag(dev)
130+ ghc-options:
131+ -Wall -Werror -Wcompat -Wincomplete-record-updates
132+ -Wincomplete-uni-patterns -Wnoncanonical-monad-instances
133+ -Wno-missing-home-modules
134+
135+ else
136+ ghc-options: -O2 -Wall
147137
148138executable ormolu
149− main-is: Main.hs
150− hs-source-dirs: app
151− build-depends: base >= 4.12 && < 5.0
152− , ghc == 8.6.5
153− , gitrev >= 1.3 && < 1.4
154− , optparse-applicative >= 0.14 && < 0.15
155− , ormolu
156− , text >= 0.2 && < 1.3
157− other-modules: Paths_ormolu
158− if flag(dev)
159− ghc-options: -Wall -Werror -Wcompat
160− -Wincomplete-record-updates
161− -Wincomplete-uni-patterns
162− -Wnoncanonical-monad-instances
163− -Wnoncanonical-monadfail-instances
164− else
165− ghc-options: -O2 -Wall
166− default-language: Haskell2010
139+ main-is: Main.hs
140+ hs-source-dirs: app
141+ other-modules: Paths_ormolu
142+ default-language: Haskell2010
143+ build-depends:
144+ base >=4.12 && <5.0,
145+ ghc-lib-parser >=8.10 && <8.11,
146+ gitrev >=1.3 && <1.4,
147+ optparse-applicative >=0.14 && <0.17,
148+ ormolu -any,
149+ text >=0.2 && <1.3
150+
151+ if flag(dev)
152+ ghc-options:
153+ -Wall -Werror -Wcompat -Wincomplete-record-updates
154+ -Wincomplete-uni-patterns -Wnoncanonical-monad-instances
155+ -optP-Wno-nonportable-include-path
156+
157+ else
158+ ghc-options: -O2 -Wall -rtsopts
159+
160+test-suite tests
161+ type: exitcode-stdio-1.0
162+ main-is: Spec.hs
163+ build-tools: hspec-discover >=2.0 && <3.0
164+ hs-source-dirs: tests
165+ other-modules:
166+ Ormolu.Parser.PragmaSpec
167+ Ormolu.PrinterSpec
168+
169+ default-language: Haskell2010
170+ build-depends:
171+ base >=4.12 && <5.0,
172+ containers >=0.5 && <0.7,
173+ filepath >=1.2 && <1.5,
174+ hspec >=2.0 && <3.0,
175+ ormolu -any,
176+ path >=0.6 && <0.8,
177+ path-io >=1.4.2 && <2.0,
178+ text >=0.2 && <1.3
179+
180+ if flag(dev)
181+ ghc-options: -Wall -Werror
182+
183+ else
184+ ghc-options: -O2 -Wall
region-tests/expected-result-17-18.hsnew file+17
@@ -0,0 +1,17 @@
1+{-# LANGUAGE LambdaCase #-}
2+
3+module Foo (
4+ foo, bar, baz) where
5+
6+foo :: Int
7+foo = 5
8+
9+bar :: Int -> Int
10+bar = \case
11+ 0 -> foo
12+ x -> x - foo
13+
14+baz :: Int -> Int
15+baz = gege
16+ where
17+ gege = 1 + 2
region-tests/expected-result-6-7.hsnew file+17
@@ -0,0 +1,17 @@
1+{-# LANGUAGE LambdaCase #-}
2+
3+module Foo (
4+ foo, bar, baz) where
5+
6+foo :: Int
7+foo = 5
8+
9+bar :: Int -> Int
10+bar = \case
11+ 0 -> foo
12+ x -> x - foo
13+
14+baz :: Int -> Int
15+baz = gege
16+ where
17+ gege = 1 + 2
region-tests/expected-result-6-8.hsnew file+16
@@ -0,0 +1,16 @@
1+{-# LANGUAGE LambdaCase #-}
2+
3+module Foo (
4+ foo, bar, baz) where
5+
6+foo :: Int
7+foo = 5
8+bar :: Int -> Int
9+bar = \case
10+ 0 -> foo
11+ x -> x - foo
12+
13+baz :: Int -> Int
14+baz = gege
15+ where
16+ gege = 1 + 2
region-tests/expected-result-9-12.hsnew file+17
@@ -0,0 +1,17 @@
1+{-# LANGUAGE LambdaCase #-}
2+
3+module Foo (
4+ foo, bar, baz) where
5+
6+foo :: Int
7+foo = 5
8+
9+bar :: Int -> Int
10+bar = \case
11+ 0 -> foo
12+ x -> x - foo
13+
14+baz :: Int -> Int
15+baz = gege
16+ where
17+ gege = 1 + 2
region-tests/expected-result-all.hsnew file+21
@@ -0,0 +1,21 @@
1+{-# LANGUAGE LambdaCase #-}
2+
3+module Foo
4+ ( foo,
5+ bar,
6+ baz,
7+ )
8+where
9+
10+foo :: Int
11+foo = 5
12+
13+bar :: Int -> Int
14+bar = \case
15+ 0 -> foo
16+ x -> x - foo
17+
18+baz :: Int -> Int
19+baz = gege
20+ where
21+ gege = 1 + 2
region-tests/src.hsnew file+17
@@ -0,0 +1,17 @@
1+{-# LANGUAGE LambdaCase #-}
2+
3+module Foo (
4+ foo, bar, baz) where
5+
6+foo :: Int
7+foo = 5
8+
9+bar :: Int -> Int
10+bar = \case
11+ 0 -> foo
12+ x -> x - foo
13+
14+baz :: Int -> Int
15+baz = gege
16+ where
17+ gege = 1 + 2
shell.nix+4−2
@@ -1,3 +1,5 @@
1−{ pkgs ? (import ./nix/nixpkgs) }:
1+{ pkgs ? (import ./nix/nixpkgs { inherit system; })
2+, system ? builtins.currentSystem
3+}:
24
3−(import ./default.nix { inherit pkgs; }).ormoluShell
5+(import ./default.nix { inherit pkgs; }).dev.ormoluShell
src/GHC.hsnew file+12
@@ -0,0 +1,12 @@
1+module GHC
2+ ( module X,
3+ )
4+where
5+
6+import ApiAnnotation as X
7+import BasicTypes as X
8+import GHC.Hs as X
9+import GHC.Hs.Instances as X ()
10+import Module as X
11+import RdrName as X
12+import SrcLoc as X
src/GHC/DynFlags.hsnew file+49
@@ -0,0 +1,49 @@
1+{-# OPTIONS_GHC -Wno-missing-fields #-}
2+
3+-- Modified from ghc-lib-api-ext.
4+
5+module GHC.DynFlags
6+ ( baseDynFlags,
7+ )
8+where
9+
10+import Config
11+import DynFlags
12+import Fingerprint
13+import GHC.Platform
14+import ToolSettings
15+
16+fakeSettings :: Settings
17+fakeSettings =
18+ Settings
19+ { sGhcNameVersion =
20+ GhcNameVersion
21+ { ghcNameVersion_programName = "ghc",
22+ ghcNameVersion_projectVersion = cProjectVersion
23+ },
24+ sFileSettings = FileSettings {},
25+ sTargetPlatform =
26+ Platform
27+ { platformWordSize = PW8,
28+ platformMini =
29+ PlatformMini
30+ { platformMini_arch = ArchUnknown,
31+ platformMini_os = OSUnknown
32+ },
33+ platformUnregisterised = True
34+ },
35+ sPlatformMisc = PlatformMisc {},
36+ sPlatformConstants =
37+ PlatformConstants {pc_DYNAMIC_BY_DEFAULT = False, pc_WORD_SIZE = 8},
38+ sToolSettings =
39+ ToolSettings
40+ { toolSettings_opt_P_fingerprint = fingerprint0,
41+ toolSettings_pgm_F = ""
42+ }
43+ }
44+
45+fakeLlvmConfig :: LlvmConfig
46+fakeLlvmConfig = LlvmConfig [] []
47+
48+baseDynFlags :: DynFlags
49+baseDynFlags = defaultDynFlags fakeSettings fakeLlvmConfig
src/Ormolu.hs+71−64
@@ -1,24 +1,25 @@
1−-- | A formatter for Haskell source code.
2−
3−{-# LANGUAGE BangPatterns #-}
4−{-# LANGUAGE RecordWildCards #-}
1+{-# LANGUAGE BangPatterns #-}
52
3+-- | A formatter for Haskell source code.
64module Ormolu
7− ( ormolu
8− , ormoluFile
9− , ormoluStdin
10− , Config (..)
11− , defaultConfig
12− , DynOption (..)
13− , OrmoluException (..)
14− , withPrettyOrmoluExceptions
5+ ( ormolu,
6+ ormoluFile,
7+ ormoluStdin,
8+ Config (..),
9+ RegionIndices (..),
10+ defaultConfig,
11+ DynOption (..),
12+ OrmoluException (..),
13+ withPrettyOrmoluExceptions,
1514 )
1615where
1716
17+import qualified CmdLineParser as GHC
1818import Control.Exception
1919import Control.Monad
2020import Control.Monad.IO.Class (MonadIO (..))
2121import Data.Text (Text)
22+import qualified Data.Text as T
2223import Debug.Trace
2324import Ormolu.Config
2425import Ormolu.Diff
@@ -27,9 +28,6 @@ import Ormolu.Parser
2728import Ormolu.Parser.Result
2829import Ormolu.Printer
2930import Ormolu.Utils (showOutputable)
30−import System.IO (hGetContents, stdin)
31−import qualified CmdLineParser as GHC
32−import qualified Data.Text as T
3331import qualified SrcLoc as GHC
3432
3533-- | Format a 'String', return formatted version as 'Text'.
@@ -42,27 +40,30 @@ import qualified SrcLoc as GHC
4240-- side-effects though.
4341-- * Takes file name just to use it in parse error messages.
4442-- * Throws 'OrmoluException'.
45−
46−ormolu
47− :: MonadIO m
48− => Config -- ^ Ormolu configuration
49− -> FilePath -- ^ Location of source file
50− -> String -- ^ Input to format
51− -> m Text
52−ormolu cfg path str = do
53− (ws, result0) <-
43+ormolu ::
44+ MonadIO m =>
45+ -- | Ormolu configuration
46+ Config RegionIndices ->
47+ -- | Location of source file
48+ FilePath ->
49+ -- | Input to format
50+ String ->
51+ m Text
52+ormolu cfgWithIndices path str = do
53+ let totalLines = length (lines str)
54+ cfg = regionIndicesToDeltas totalLines <$> cfgWithIndices
55+ (warnings, result0) <-
5456 parseModule' cfg OrmoluParsingFailed path str
5557 when (cfgDebug cfg) $ do
5658 traceM "warnings:\n"
57− traceM (concatMap showWarn ws)
59+ traceM (concatMap showWarn warnings)
5860 traceM (prettyPrintParseResult result0)
59− -- NOTE We're forcing 'txt' here because otherwise errors (such as
60− -- messages about not-yet-supported functionality) will be thrown later
61− -- when we try to parse the rendered code back, inside of GHC monad
62− -- wrapper which will lead to error messages presenting the exceptions as
63− -- GHC bugs.
64− let !txt = printModule (cfgDebug cfg) result0
65− when (not (cfgUnsafe cfg) || cfgCheckIdempotency cfg) $ do
61+ -- We're forcing 'txt' here because otherwise errors (such as messages
62+ -- about not-yet-supported functionality) will be thrown later when we try
63+ -- to parse the rendered code back, inside of GHC monad wrapper which will
64+ -- lead to error messages presenting the exceptions as GHC bugs.
65+ let !txt = printModule result0
66+ when (not (cfgUnsafe cfg) || cfgCheckIdempotence cfg) $ do
6667 let pathRendered = path ++ "<rendered>"
6768 -- Parse the result of pretty-printing again and make sure that AST
6869 -- is the same as AST of original snippet module span positions.
@@ -78,12 +79,13 @@ ormolu cfg path str = do
7879 Different ss -> liftIO $ throwIO (OrmoluASTDiffers path ss)
7980 -- Try re-formatting the formatted result to check if we get exactly
8081 -- the same output.
81− when (cfgCheckIdempotency cfg) $
82− let txt2 = printModule False result1
82+ when (cfgCheckIdempotence cfg) $
83+ let txt2 = printModule result1
8384 in case diffText txt txt2 pathRendered of
8485 Nothing -> return ()
85− Just (loc, l, r) -> liftIO $
86− throwIO (OrmoluNonIdempotentOutput loc l r)
86+ Just (loc, l, r) ->
87+ liftIO $
88+ throwIO (OrmoluNonIdempotentOutput loc l r)
8789 return txt
8890
8991-- | Load a file and format it. The file stays intact and the rendered
@@ -91,12 +93,14 @@ ormolu cfg path str = do
9193--
9294-- > ormoluFile cfg path =
9395-- > liftIO (readFile path) >>= ormolu cfg path
94−
95−ormoluFile
96− :: MonadIO m
97− => Config -- ^ Ormolu configuration
98− -> FilePath -- ^ Location of source file
99− -> m Text -- ^ Resulting rendition
96+ormoluFile ::
97+ MonadIO m =>
98+ -- | Ormolu configuration
99+ Config RegionIndices ->
100+ -- | Location of source file
101+ FilePath ->
102+ -- | Resulting rendition
103+ m Text
100104ormoluFile cfg path =
101105 liftIO (readFile path) >>= ormolu cfg path
102106
@@ -104,37 +108,40 @@ ormoluFile cfg path =
104108--
105109-- > ormoluStdin cfg =
106110-- > liftIO (hGetContents stdin) >>= ormolu cfg "<stdin>"
107−
108−ormoluStdin
109− :: MonadIO m
110− => Config -- ^ Ormolu configuration
111− -> m Text -- ^ Resulting rendition
111+ormoluStdin ::
112+ MonadIO m =>
113+ -- | Ormolu configuration
114+ Config RegionIndices ->
115+ -- | Resulting rendition
116+ m Text
112117ormoluStdin cfg =
113− liftIO (hGetContents stdin) >>= ormolu cfg "<stdin>"
118+ liftIO getContents >>= ormolu cfg "<stdin>"
114119
115120----------------------------------------------------------------------------
116121-- Helpers
117122
118123-- | A wrapper around 'parseModule'.
119−
120−parseModule'
121− :: MonadIO m
122− => Config -- ^ Ormolu configuration
123− -> (GHC.SrcSpan -> String -> OrmoluException)
124− -- ^ How to obtain 'OrmoluException' to throw when parsing fails
125− -> FilePath -- ^ File name to use in errors
126− -> String -- ^ Actual input for the parser
127− -> m ([GHC.Warn], ParseResult)
124+parseModule' ::
125+ MonadIO m =>
126+ -- | Ormolu configuration
127+ Config RegionDeltas ->
128+ -- | How to obtain 'OrmoluException' to throw when parsing fails
129+ (GHC.SrcSpan -> String -> OrmoluException) ->
130+ -- | File name to use in errors
131+ FilePath ->
132+ -- | Actual input for the parser
133+ String ->
134+ m ([GHC.Warn], ParseResult)
128135parseModule' cfg mkException path str = do
129− (ws, r) <- parseModule cfg path str
136+ (warnings, r) <- parseModule cfg path str
130137 case r of
131138 Left (spn, err) -> liftIO $ throwIO (mkException spn err)
132− Right x -> return (ws, x)
139+ Right x -> return (warnings, x)
133140
134141-- | Pretty-print a 'GHC.Warn'.
135−
136142showWarn :: GHC.Warn -> String
137−showWarn (GHC.Warn reason l) = unlines
138− [ showOutputable reason
139− , showOutputable l
140− ]
143+showWarn (GHC.Warn reason l) =
144+ unlines
145+ [ showOutputable reason,
146+ showOutputable l
147+ ]
src/Ormolu/Config.hs+70−35
@@ -1,54 +1,89 @@
1−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
2−{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
1+{-# LANGUAGE DeriveFunctor #-}
2+{-# LANGUAGE RecordWildCards #-}
43
54-- | Configuration options used by the tool.
6−
75module Ormolu.Config
8− ( Config (..)
9− , defaultConfig
10− , DynOption (..)
11− , dynOptionToLocatedStr
6+ ( Config (..),
7+ RegionIndices (..),
8+ RegionDeltas (..),
9+ defaultConfig,
10+ regionIndicesToDeltas,
11+ DynOption (..),
12+ dynOptionToLocatedStr,
1213 )
1314where
1415
1516import qualified SrcLoc as GHC
1617
1718-- | Ormolu configuration.
19+data Config region = Config
20+ { -- | Dynamic options to pass to GHC parser
21+ cfgDynOptions :: ![DynOption],
22+ -- | Do formatting faster but without automatic detection of defects
23+ cfgUnsafe :: !Bool,
24+ -- | Output information useful for debugging
25+ cfgDebug :: !Bool,
26+ -- | Checks if re-formatting the result is idempotent
27+ cfgCheckIdempotence :: !Bool,
28+ -- | Region selection
29+ cfgRegion :: !region
30+ }
31+ deriving (Eq, Show, Functor)
1832
19−data Config = Config
20− { cfgDynOptions :: ![DynOption]
21− -- ^ Dynamic options to pass to GHC parser
22− , cfgUnsafe :: !Bool
23− -- ^ Do formatting faster but without automatic detection of defects
24− , cfgDebug :: !Bool
25− -- ^ Output information useful for debugging
26− , cfgTolerateCpp :: !Bool
27− -- ^ Do not fail if CPP pragma is present (still doesn't handle CPP but
28− -- useful for formatting of files that enable the extension without
29− -- actually containing CPP macros)
30− , cfgCheckIdempotency :: !Bool
31− -- ^ Checks if re-formatting the result is idempotent.
32− } deriving (Eq, Show)
33−
34−-- | Default 'Config'.
35−
36−defaultConfig :: Config
37−defaultConfig = Config
38− { cfgDynOptions = []
39− , cfgUnsafe = False
40− , cfgDebug = False
41− , cfgTolerateCpp = False
42− , cfgCheckIdempotency = False
33+-- | Region selection as the combination of start and end line numbers.
34+data RegionIndices = RegionIndices
35+ { -- | Start line of the region to format
36+ regionStartLine :: !(Maybe Int),
37+ -- | End line of the region to format
38+ regionEndLine :: !(Maybe Int)
4339 }
40+ deriving (Eq, Show)
4441
45−-- | A wrapper for dynamic options.
42+-- | Region selection as the length of the literal prefix and the literal
43+-- suffix.
44+data RegionDeltas = RegionDeltas
45+ { -- | Prefix length in number of lines
46+ regionPrefixLength :: !Int,
47+ -- | Suffix length in number of lines
48+ regionSuffixLength :: !Int
49+ }
50+ deriving (Eq, Show)
51+
52+-- | Default @'Config' 'RegionIndices'@.
53+defaultConfig :: Config RegionIndices
54+defaultConfig =
55+ Config
56+ { cfgDynOptions = [],
57+ cfgUnsafe = False,
58+ cfgDebug = False,
59+ cfgCheckIdempotence = False,
60+ cfgRegion =
61+ RegionIndices
62+ { regionStartLine = Nothing,
63+ regionEndLine = Nothing
64+ }
65+ }
4666
67+-- | Convert 'RegionIndices' into 'RegionDeltas'.
68+regionIndicesToDeltas ::
69+ -- | Total number of lines in the input
70+ Int ->
71+ -- | Region indices
72+ RegionIndices ->
73+ -- | Region deltas
74+ RegionDeltas
75+regionIndicesToDeltas total RegionIndices {..} =
76+ RegionDeltas
77+ { regionPrefixLength = maybe 0 (subtract 1) regionStartLine,
78+ regionSuffixLength = maybe 0 (total -) regionEndLine
79+ }
80+
81+-- | A wrapper for dynamic options.
4782newtype DynOption = DynOption
4883 { unDynOption :: String
49− } deriving (Eq, Ord, Show)
84+ }
85+ deriving (Eq, Ord, Show)
5086
5187-- | Convert 'DynOption' to @'GHC.Located' 'String'@.
52−
5388dynOptionToLocatedStr :: DynOption -> GHC.Located String
5489dynOptionToLocatedStr (DynOption o) = GHC.L GHC.noSrcSpan o
src/Ormolu/Diff.hs+92−70
@@ -1,32 +1,30 @@
1−{-# LANGUAGE DeriveDataTypeable #-}
2−{-# LANGUAGE RankNTypes #-}
3−{-# LANGUAGE RecordWildCards #-}
1+{-# LANGUAGE RankNTypes #-}
42
53-- | Diffing GHC ASTs modulo span positions.
6−
74module Ormolu.Diff
8− ( Diff(..)
9− , diffParseResult
10− , diffText
5+ ( Diff (..),
6+ diffParseResult,
7+ diffText,
118 )
129where
1310
14−import BasicTypes (SourceText)
1511import Data.ByteString (ByteString)
1612import Data.Generics
1713import Data.Text (Text)
18−import GHC
19−import Ormolu.Imports (sortImports)
20−import Ormolu.Parser.Result
2114import qualified Data.Text as T
2215import qualified FastString as GHC
23−import qualified SrcLoc as GHC
16+import GHC
17+import Ormolu.Imports (normalizeImports)
18+import Ormolu.Parser.CommentStream
19+import Ormolu.Parser.Result
20+import Ormolu.Utils
2421
2522-- | Result of comparing two 'ParseResult's.
26−
2723data Diff
28− = Same -- ^ Two parse results are the same
29− | Different [SrcSpan] -- ^ Two parse results differ
24+ = -- | Two parse results are the same
25+ Same
26+ | -- | Two parse results differ
27+ Different [SrcSpan]
3028
3129instance Semigroup Diff where
3230 Same <> a = a
@@ -37,99 +35,123 @@ instance Monoid Diff where
3735 mempty = Same
3836
3937-- | Return 'Diff' of two 'ParseResult's.
40−
4138diffParseResult :: ParseResult -> ParseResult -> Diff
4239diffParseResult
43− ParseResult { prCommentStream = cstream0
44− , prParsedSource = ps0
45− }
46− ParseResult { prCommentStream = cstream1
47− , prParsedSource = ps1
48− } =
49− matchIgnoringSrcSpans cstream0 cstream1 <>
50− matchIgnoringSrcSpans ps0 ps1
40+ ParseResult
41+ { prCommentStream = cstream0,
42+ prParsedSource = hs0
43+ }
44+ ParseResult
45+ { prCommentStream = cstream1,
46+ prParsedSource = hs1
47+ } =
48+ matchIgnoringSrcSpans cstream0 cstream1
49+ <> matchIgnoringSrcSpans
50+ hs0 {hsmodImports = normalizeImports (hsmodImports hs0)}
51+ hs1 {hsmodImports = normalizeImports (hsmodImports hs1)}
5152
5253-- | Compare two values for equality disregarding differences in 'SrcSpan's
5354-- and the ordering of import lists.
54−
5555matchIgnoringSrcSpans :: Data a => a -> a -> Diff
5656matchIgnoringSrcSpans = genericQuery
5757 where
5858 genericQuery :: GenericQ (GenericQ Diff)
5959 genericQuery x y
60− -- NOTE 'ByteString' implement 'Data' instance manually and does not
60+ -- 'ByteString' implements 'Data' instance manually and does not
6161 -- implement 'toConstr', so we have to deal with it in a special way.
62− | Just x' <- cast x, Just y' <- cast y =
62+ | Just x' <- cast x,
63+ Just y' <- cast y =
6364 if x' == (y' :: ByteString)
6465 then Same
6566 else Different []
66− | typeOf x == typeOf y, toConstr x == toConstr y =
67− mconcat $ gzipWithQ
68− (genericQuery
69− `extQ` srcSpanEq
70− `extQ` hsModuleEq
71− `extQ` sourceTextEq
72− `ext2Q` forLocated)
73− x y
67+ | typeOf x == typeOf y,
68+ toConstr x == toConstr y =
69+ mconcat $
70+ gzipWithQ
71+ ( genericQuery
72+ `extQ` srcSpanEq
73+ `extQ` commentEq
74+ `extQ` sourceTextEq
75+ `extQ` hsDocStringEq
76+ `extQ` importDeclQualifiedStyleEq
77+ `ext2Q` forLocated
78+ )
79+ x
80+ y
7481 | otherwise = Different []
75−
7682 srcSpanEq :: SrcSpan -> GenericQ Diff
7783 srcSpanEq _ _ = Same
78−
79− hsModuleEq :: HsModule GhcPs -> GenericQ Diff
80− hsModuleEq hs0 hs1' =
81− case cast hs1' :: Maybe (HsModule GhcPs) of
84+ commentEq :: Comment -> GenericQ Diff
85+ commentEq (Comment _ x) d =
86+ case cast d :: Maybe Comment of
8287 Nothing -> Different []
83− Just hs1 ->
84− matchIgnoringSrcSpans
85− hs0 { hsmodImports = sortImports (hsmodImports hs0) }
86− hs1 { hsmodImports = sortImports (hsmodImports hs1) }
87−
88+ Just (Comment _ y) ->
89+ if x == y
90+ then Same
91+ else Different []
8892 sourceTextEq :: SourceText -> GenericQ Diff
8993 sourceTextEq _ _ = Same
90−
91− forLocated
92− :: (Data e0, Data e1)
93− => GenLocated e0 e1
94− -> GenericQ Diff
94+ importDeclQualifiedStyleEq :: ImportDeclQualifiedStyle -> GenericQ Diff
95+ importDeclQualifiedStyleEq d0 d1' =
96+ case (d0, cast d1' :: Maybe ImportDeclQualifiedStyle) of
97+ (x, Just x') | x == x' -> Same
98+ (QualifiedPre, Just QualifiedPost) -> Same
99+ (QualifiedPost, Just QualifiedPre) -> Same
100+ _ -> Different []
101+ hsDocStringEq :: HsDocString -> GenericQ Diff
102+ hsDocStringEq str0 str1' =
103+ case cast str1' :: Maybe HsDocString of
104+ Nothing -> Different []
105+ Just str1 ->
106+ if splitDocString str0 == splitDocString str1
107+ then Same
108+ else Different []
109+ forLocated ::
110+ (Data e0, Data e1) =>
111+ GenLocated e0 e1 ->
112+ GenericQ Diff
95113 forLocated x@(L mspn _) y =
96114 maybe id appendSpan (cast mspn) (genericQuery x y)
97−
98115 appendSpan :: SrcSpan -> Diff -> Diff
99− appendSpan s (Different ss) | fresh && helpful = Different (s:ss)
116+ appendSpan s (Different ss) | fresh && helpful = Different (s : ss)
100117 where
101− fresh = not $ any (flip isSubspanOf s) ss
118+ fresh = not $ any (`isSubspanOf` s) ss
102119 helpful = isGoodSrcSpan s
103120 appendSpan _ d = d
104121
105122-- | Diff two texts and return the location they start to differ, alongside
106123-- with excerpts around that location.
107−
108−diffText
109− :: Text -- ^ Text before
110− -> Text -- ^ Text after
111− -> FilePath -- ^ Path to use to construct 'GHC.RealSrcLoc'
112− -> Maybe (GHC.RealSrcLoc, Text, Text)
124+diffText ::
125+ -- | Text before
126+ Text ->
127+ -- | Text after
128+ Text ->
129+ -- | Path to use to construct 'GHC.RealSrcLoc'
130+ FilePath ->
131+ Maybe (GHC.RealSrcLoc, Text, Text)
113132diffText left right fp =
114133 case go (0, 0, 0) left right of
115134 Nothing -> Nothing
116− Just (row, col, loc) -> Just (
117− GHC.mkRealSrcLoc (GHC.mkFastString fp) row col,
118− getSpan loc left,
119− getSpan loc right
120− )
135+ Just (row, col, loc) ->
136+ Just
137+ ( GHC.mkRealSrcLoc (GHC.mkFastString fp) row col,
138+ getSpan loc left,
139+ getSpan loc right
140+ )
121141 where
122− go (row, col, loc) t1 t2 =
142+ go (row, col, loc) t1 t2 =
123143 case (T.uncons t1, T.uncons t2) of
124144 -- both text empty, all good
125145 (Nothing, Nothing) ->
126146 Nothing
127147 -- first chars are the same, adjust position and recurse
128− (Just (c1, r1), Just (c2, r2)) | c1 == c2 ->
129− let (row', col', loc') = if c1 == '\n'
130− then (row + 1, 0, loc + 1)
131− else (row, col + 1, loc + 1)
132− in go (row', col', loc') r1 r2
148+ (Just (c1, r1), Just (c2, r2))
149+ | c1 == c2 ->
150+ let (row', col', loc') =
151+ if c1 == '\n'
152+ then (row + 1, 0, loc + 1)
153+ else (row, col + 1, loc + 1)
154+ in go (row', col', loc') r1 r2
133155 -- something is different, return the position
134156 _ ->
135157 Just (row, col, loc)
src/Ormolu/Exception.hs+57−50
@@ -1,66 +1,72 @@
11{-# LANGUAGE LambdaCase #-}
22
33-- | 'OrmoluException' type and surrounding definitions.
4−
54module Ormolu.Exception
6− ( OrmoluException (..)
7− , withPrettyOrmoluExceptions
5+ ( OrmoluException (..),
6+ withPrettyOrmoluExceptions,
87 )
98where
109
1110import Control.Exception
12−import Ormolu.Utils (showOutputable)
13−import System.Exit (ExitCode (..), exitWith)
14−import System.IO
11+import Data.List.NonEmpty (NonEmpty (..))
12+import qualified Data.List.NonEmpty as NE
1513import Data.Text (Text)
1614import qualified GHC
15+import Ormolu.Utils (showOutputable)
1716import qualified Outputable as GHC
17+import System.Exit (ExitCode (..), exitWith)
18+import System.IO
1819
1920-- | Ormolu exception representing all cases when Ormolu can fail.
20−
2121data OrmoluException
22− = OrmoluCppEnabled FilePath
23− -- ^ Ormolu does not work with source files that use CPP
24− | OrmoluParsingFailed GHC.SrcSpan String
25− -- ^ Parsing of original source code failed
26− | OrmoluOutputParsingFailed GHC.SrcSpan String
27− -- ^ Parsing of formatted source code failed
28− | OrmoluASTDiffers FilePath [GHC.SrcSpan]
29− -- ^ Original and resulting ASTs differ
30− | OrmoluNonIdempotentOutput GHC.RealSrcLoc Text Text
31− -- ^ Formatted source code is not idempotent
22+ = -- | Parsing of original source code failed
23+ OrmoluParsingFailed GHC.SrcSpan String
24+ | -- | Parsing of formatted source code failed
25+ OrmoluOutputParsingFailed GHC.SrcSpan String
26+ | -- | Original and resulting ASTs differ
27+ OrmoluASTDiffers FilePath [GHC.SrcSpan]
28+ | -- | Formatted source code is not idempotent
29+ OrmoluNonIdempotentOutput GHC.RealSrcLoc Text Text
30+ | -- | Some GHC options were not recognized
31+ OrmoluUnrecognizedOpts (NonEmpty String)
3232 deriving (Eq, Show)
3333
3434instance Exception OrmoluException where
3535 displayException = \case
36− OrmoluCppEnabled path -> unlines
37− [ "CPP is not supported:"
38− , withIndent path
39− ]
4036 OrmoluParsingFailed s e ->
41− showParsingErr "Parsing of source code failed:" s [e]
37+ showParsingErr "The GHC parser (in Haddock mode) failed:" s [e]
4238 OrmoluOutputParsingFailed s e ->
43− showParsingErr "Parsing of formatted code failed:" s [e] ++
44− "Please, consider reporting the bug.\n"
45− OrmoluASTDiffers path ss -> unlines $
46− [ "AST of input and AST of formatted code differ."
47− ]
48− ++ (fmap withIndent $ case fmap (\s -> "at " ++ showOutputable s) ss of
49− [] -> ["in " ++ path]
50− xs -> xs) ++
51− [ "Please, consider reporting the bug." ]
39+ showParsingErr "Parsing of formatted code failed:" s [e]
40+ ++ "Please, consider reporting the bug.\n"
41+ OrmoluASTDiffers path ss ->
42+ unlines $
43+ [ "AST of input and AST of formatted code differ."
44+ ]
45+ ++ fmap
46+ withIndent
47+ ( case fmap (\s -> "at " ++ showOutputable s) ss of
48+ [] -> ["in " ++ path]
49+ xs -> xs
50+ )
51+ ++ ["Please, consider reporting the bug."]
5252 OrmoluNonIdempotentOutput loc left right ->
53− showParsingErr "Formatting is not idempotent:" loc
54− [ "before: " ++ show left , "after: " ++ show right ]
53+ showParsingErr
54+ "Formatting is not idempotent:"
55+ loc
56+ ["before: " ++ show left, "after: " ++ show right]
5557 ++ "Please, consider reporting the bug.\n"
56−
58+ OrmoluUnrecognizedOpts opts ->
59+ unlines
60+ [ "The following GHC options were not recognized:",
61+ (withIndent . unwords . NE.toList) opts
62+ ]
5763
5864-- | Inside this wrapper 'OrmoluException' will be caught and displayed
5965-- nicely using 'displayException'.
60−
61−withPrettyOrmoluExceptions
62− :: IO a -- ^ Action that may throw the exception
63− -> IO a
66+withPrettyOrmoluExceptions ::
67+ -- | Action that may throw the exception
68+ IO a ->
69+ IO a
6470withPrettyOrmoluExceptions m = m `catch` h
6571 where
6672 h :: OrmoluException -> IO a
@@ -68,25 +74,26 @@ withPrettyOrmoluExceptions m = m `catch` h
6874 hPutStrLn stderr (displayException e)
6975 exitWith . ExitFailure $
7076 case e of
71− -- Error code 1 is for `error` or `notImplemented`
72− OrmoluCppEnabled _ -> 2
73− OrmoluParsingFailed _ _ -> 3
74− OrmoluOutputParsingFailed _ _ -> 4
75− OrmoluASTDiffers _ _ -> 5
76− OrmoluNonIdempotentOutput _ _ _ -> 6
77+ -- Error code 1 is for 'error' or 'notImplemented'
78+ -- 2 used to be for erroring out on CPP
79+ OrmoluParsingFailed {} -> 3
80+ OrmoluOutputParsingFailed {} -> 4
81+ OrmoluASTDiffers {} -> 5
82+ OrmoluNonIdempotentOutput {} -> 6
83+ OrmoluUnrecognizedOpts {} -> 7
7784
7885----------------------------------------------------------------------------
7986-- Helpers
8087
8188-- | Show a parse error.
82−
8389showParsingErr :: GHC.Outputable a => String -> a -> [String] -> String
84−showParsingErr msg spn err = unlines $
85− [ msg
86− , withIndent (showOutputable spn)
87− ] ++ map withIndent err
90+showParsingErr msg spn err =
91+ unlines $
92+ [ msg,
93+ withIndent (showOutputable spn)
94+ ]
95+ ++ map withIndent err
8896
8997-- | Indent with 2 spaces for readability.
90−
9198withIndent :: String -> String
9299withIndent txt = " " ++ txt
src/Ormolu/Imports.hs+176−62
@@ -1,88 +1,202 @@
11{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE RankNTypes #-}
3+{-# LANGUAGE RecordWildCards #-}
34
45-- | Manipulations on import lists.
5−
66module Ormolu.Imports
7− ( sortImports
7+ ( normalizeImports,
88 )
99where
1010
1111import Data.Bifunctor
12+import Data.Char (isAlphaNum)
1213import Data.Function (on)
13−import Data.Generics (gcompare)
14−import Data.List (sortBy)
14+import Data.List (foldl', nubBy, sortBy, sortOn)
15+import Data.Map.Strict (Map)
16+import qualified Data.Map.Strict as M
17+import FastString (FastString)
1518import GHC hiding (GhcPs, IE)
16−import HsExtension
17−import HsImpExp (IE (..))
18−import Ormolu.Utils (notImplemented)
19−
20−-- | Sort imports by module name. This also sorts explicit import lists for
21−-- each declaration.
22−
23−sortImports :: [LImportDecl GhcPs] -> [LImportDecl GhcPs]
24−sortImports = sortBy compareIdecl . fmap (fmap sortImportLists)
19+import GHC.Hs.Extension
20+import GHC.Hs.ImpExp (IE (..))
21+import Ormolu.Utils (notImplemented, showOutputable)
22+
23+-- | Sort and normalize imports.
24+normalizeImports :: [LImportDecl GhcPs] -> [LImportDecl GhcPs]
25+normalizeImports =
26+ fmap snd
27+ . M.toAscList
28+ . M.fromListWith combineImports
29+ . fmap (\x -> (importId x, g x))
2530 where
26− sortImportLists :: ImportDecl GhcPs -> ImportDecl GhcPs
27− sortImportLists decl =
28− decl { ideclHiding = second (fmap sortLies) <$> ideclHiding decl
29− }
30−
31−-- | Compare two @'LImportDecl' 'GhcPs'@ things.
32−
33−compareIdecl :: LImportDecl GhcPs -> LImportDecl GhcPs -> Ordering
34−compareIdecl (L _ m0) (L _ m1) =
35− case (isPrelude n0, isPrelude n1) of
36− (False, False) -> n0 `compare` n1
37− (True, False) -> GT
38− (False, True) -> LT
39− (True, True) -> m0 `gcompare` m1
31+ g (L l ImportDecl {..}) =
32+ L
33+ l
34+ ImportDecl
35+ { ideclHiding = second (fmap normalizeLies) <$> ideclHiding,
36+ ..
37+ }
38+ g _ = notImplemented "XImportDecl"
39+
40+-- | Combine two import declarations. It should be assumed that 'ImportId's
41+-- are equal.
42+combineImports ::
43+ LImportDecl GhcPs ->
44+ LImportDecl GhcPs ->
45+ LImportDecl GhcPs
46+combineImports (L lx ImportDecl {..}) (L _ y) =
47+ L
48+ lx
49+ ImportDecl
50+ { ideclHiding = case (ideclHiding, GHC.ideclHiding y) of
51+ (Just (hiding, L l' xs), Just (_, L _ ys)) ->
52+ Just (hiding, (L l' (normalizeLies (xs ++ ys))))
53+ _ -> Nothing,
54+ ..
55+ }
56+combineImports _ _ = notImplemented "XImportDecl"
57+
58+-- | Import id, a collection of all things that justify having a separate
59+-- import entry. This is used for merging of imports. If two imports have
60+-- the same 'ImportId' they can be merged.
61+data ImportId = ImportId
62+ { importIsPrelude :: Bool,
63+ importIdName :: ModuleName,
64+ importPkgQual :: Maybe FastString,
65+ importSource :: Bool,
66+ importSafe :: Bool,
67+ importQualified :: Bool,
68+ importImplicit :: Bool,
69+ importAs :: Maybe ModuleName,
70+ importHiding :: Maybe Bool
71+ }
72+ deriving (Eq, Ord)
73+
74+-- | Obtain an 'ImportId' for a given import.
75+importId :: LImportDecl GhcPs -> ImportId
76+importId (L _ ImportDecl {..}) =
77+ ImportId
78+ { importIsPrelude = isPrelude,
79+ importIdName = moduleName,
80+ importPkgQual = sl_fs <$> ideclPkgQual,
81+ importSource = ideclSource,
82+ importSafe = ideclSafe,
83+ importQualified = case ideclQualified of
84+ QualifiedPre -> True
85+ QualifiedPost -> True
86+ NotQualified -> False,
87+ importImplicit = ideclImplicit,
88+ importAs = unLoc <$> ideclAs,
89+ importHiding = fst <$> ideclHiding
90+ }
4091 where
41− n0 = unLoc (ideclName m0)
42− n1 = unLoc (ideclName m1)
43− isPrelude = (== "Prelude") . moduleNameString
44−
45−-- | Sort located import or export.
46−
47−sortLies :: [LIE GhcPs] -> [LIE GhcPs]
48−sortLies = sortBy (compareIE `on` unLoc) . fmap (fmap sortThings)
92+ isPrelude = moduleNameString moduleName == "Prelude"
93+ moduleName = unLoc ideclName
94+importId _ = notImplemented "XImportDecl"
4995
50−-- | Sort imports\/exports inside of 'IEThingWith'.
51−
52−sortThings :: IE GhcPs -> IE GhcPs
53−sortThings = \case
54− IEThingWith NoExt x w xs fl ->
55− IEThingWith NoExt x w (sortBy (compareIewn `on` unLoc) xs) fl
56− other -> other
57−
58−-- | Compare two located imports or exports.
59−
60−compareIE :: IE GhcPs -> IE GhcPs -> Ordering
61−compareIE = compareIewn `on` getIewn
96+-- | Normalize a collection of import\/export items.
97+normalizeLies :: [LIE GhcPs] -> [LIE GhcPs]
98+normalizeLies = sortOn (getIewn . unLoc) . M.elems . foldl' combine M.empty
99+ where
100+ combine ::
101+ Map IEWrappedNameOrd (LIE GhcPs) ->
102+ LIE GhcPs ->
103+ Map IEWrappedNameOrd (LIE GhcPs)
104+ combine m (L new_l new) =
105+ let wname = getIewn new
106+ normalizeWNames =
107+ nubBy (\x y -> compareLIewn x y == EQ) . sortBy compareLIewn
108+ alter = \case
109+ Nothing -> Just . L new_l $
110+ case new of
111+ IEThingWith NoExtField n wildcard g flbl ->
112+ IEThingWith NoExtField n wildcard (normalizeWNames g) flbl
113+ other -> other
114+ Just old ->
115+ let f = \case
116+ IEVar NoExtField n -> IEVar NoExtField n
117+ IEThingAbs NoExtField _ -> new
118+ IEThingAll NoExtField n -> IEThingAll NoExtField n
119+ IEThingWith NoExtField n wildcard g flbl ->
120+ case new of
121+ IEVar NoExtField _ ->
122+ error "Ormolu.Imports broken presupposition"
123+ IEThingAbs NoExtField _ ->
124+ IEThingWith NoExtField n wildcard g flbl
125+ IEThingAll NoExtField n' ->
126+ IEThingAll NoExtField n'
127+ IEThingWith NoExtField n' wildcard' g' flbl' ->
128+ let combinedWildcard =
129+ case (wildcard, wildcard') of
130+ (IEWildcard _, _) -> IEWildcard 0
131+ (_, IEWildcard _) -> IEWildcard 0
132+ _ -> NoIEWildcard
133+ in IEThingWith
134+ NoExtField
135+ n'
136+ combinedWildcard
137+ (normalizeWNames (g <> g'))
138+ flbl'
139+ IEModuleContents NoExtField _ -> notImplemented "IEModuleContents"
140+ IEGroup NoExtField _ _ -> notImplemented "IEGroup"
141+ IEDoc NoExtField _ -> notImplemented "IEDoc"
142+ IEDocNamed NoExtField _ -> notImplemented "IEDocNamed"
143+ XIE x -> noExtCon x
144+ IEModuleContents NoExtField _ -> notImplemented "IEModuleContents"
145+ IEGroup NoExtField _ _ -> notImplemented "IEGroup"
146+ IEDoc NoExtField _ -> notImplemented "IEDoc"
147+ IEDocNamed NoExtField _ -> notImplemented "IEDocNamed"
148+ XIE x -> noExtCon x
149+ in Just (f <$> old)
150+ in M.alter alter wname m
151+
152+-- | A wrapper for @'IEWrappedName' 'RdrName'@ that allows us to define an
153+-- 'Ord' instance for it.
154+newtype IEWrappedNameOrd = IEWrappedNameOrd (IEWrappedName RdrName)
155+ deriving (Eq)
156+
157+instance Ord IEWrappedNameOrd where
158+ compare (IEWrappedNameOrd x) (IEWrappedNameOrd y) = compareIewn x y
62159
63160-- | Project @'IEWrappedName' 'RdrName'@ from @'IE' 'GhcPs'@.
64−
65−getIewn :: IE GhcPs -> IEWrappedName RdrName
161+getIewn :: IE GhcPs -> IEWrappedNameOrd
66162getIewn = \case
67− IEVar NoExt x -> unLoc x
68− IEThingAbs NoExt x -> unLoc x
69− IEThingAll NoExt x -> unLoc x
70− IEThingWith NoExt x _ _ _ -> unLoc x
71− IEModuleContents NoExt _ -> notImplemented "IEModuleContents"
72− IEGroup NoExt _ _ -> notImplemented "IEGroup"
73− IEDoc NoExt _ -> notImplemented "IEDoc"
74− IEDocNamed NoExt _ -> notImplemented "IEDocNamed"
75− XIE NoExt -> notImplemented "XIE"
163+ IEVar NoExtField x -> IEWrappedNameOrd (unLoc x)
164+ IEThingAbs NoExtField x -> IEWrappedNameOrd (unLoc x)
165+ IEThingAll NoExtField x -> IEWrappedNameOrd (unLoc x)
166+ IEThingWith NoExtField x _ _ _ -> IEWrappedNameOrd (unLoc x)
167+ IEModuleContents NoExtField _ -> notImplemented "IEModuleContents"
168+ IEGroup NoExtField _ _ -> notImplemented "IEGroup"
169+ IEDoc NoExtField _ -> notImplemented "IEDoc"
170+ IEDocNamed NoExtField _ -> notImplemented "IEDocNamed"
171+ XIE x -> noExtCon x
172+
173+-- | Like 'compareIewn' for located wrapped names.
174+compareLIewn :: LIEWrappedName RdrName -> LIEWrappedName RdrName -> Ordering
175+compareLIewn = compareIewn `on` unLoc
76176
77177-- | Compare two @'IEWrapppedName' 'RdrName'@ things.
78−
79178compareIewn :: IEWrappedName RdrName -> IEWrappedName RdrName -> Ordering
80−compareIewn (IEName x) (IEName y) = unLoc x `compare` unLoc y
179+compareIewn (IEName x) (IEName y) = unLoc x `compareRdrName` unLoc y
81180compareIewn (IEName _) (IEPattern _) = LT
82181compareIewn (IEName _) (IEType _) = LT
83182compareIewn (IEPattern _) (IEName _) = GT
84−compareIewn (IEPattern x) (IEPattern y) = unLoc x `compare` unLoc y
183+compareIewn (IEPattern x) (IEPattern y) = unLoc x `compareRdrName` unLoc y
85184compareIewn (IEPattern _) (IEType _) = LT
86185compareIewn (IEType _) (IEName _) = GT
87186compareIewn (IEType _) (IEPattern _) = GT
88−compareIewn (IEType x) (IEType y) = unLoc x `compare` unLoc y
187+compareIewn (IEType x) (IEType y) = unLoc x `compareRdrName` unLoc y
188+
189+compareRdrName :: RdrName -> RdrName -> Ordering
190+compareRdrName x y =
191+ case (getNameStr x, getNameStr y) of
192+ ([], []) -> EQ
193+ ((_ : _), []) -> GT
194+ ([], (_ : _)) -> LT
195+ ((x' : _), (y' : _)) ->
196+ case (isAlphaNum x', isAlphaNum y') of
197+ (False, False) -> x `compare` y
198+ (True, False) -> LT
199+ (False, True) -> GT
200+ (True, True) -> x `compare` y
201+ where
202+ getNameStr = showOutputable . rdrNameOcc
src/Ormolu/Parser.hs+183−157
@@ -1,193 +1,219 @@
1−{-# LANGUAGE RecordWildCards #-}
2−{-# LANGUAGE StandaloneDeriving #-}
1+{-# LANGUAGE LambdaCase #-}
2+{-# LANGUAGE RecordWildCards #-}
33{-# OPTIONS_GHC -fno-warn-orphans #-}
44
55-- | Parser for Haskell source code.
6−
76module Ormolu.Parser
8− ( parseModule
9− , manualExts
7+ ( parseModule,
8+ manualExts,
109 )
1110where
1211
12+import Bag (bagToList)
13+import qualified CmdLineParser as GHC
1314import Control.Exception
14−import Control.Monad
1515import Control.Monad.IO.Class
16−import Data.List (isPrefixOf, foldl', (\\))
17−import Data.Maybe (catMaybes)
18−import GHC hiding (IE, parseModule, parser)
16+import qualified Data.List as L
17+import qualified Data.List.NonEmpty as NE
18+import Data.Ord (Down (Down))
19+import qualified Data.Text as T
20+import DynFlags as GHC
21+import ErrUtils (Severity (..), errMsgSeverity, errMsgSpan)
22+import qualified FastString as GHC
23+import GHC hiding (IE, UnicodeSyntax)
24+import GHC.DynFlags (baseDynFlags)
1925import GHC.LanguageExtensions.Type (Extension (..))
20−import GHC.Paths (libdir)
26+import qualified HeaderInfo as GHC
27+import qualified HscTypes as GHC
28+import qualified Lexer as GHC
2129import Ormolu.Config
2230import Ormolu.Exception
2331import Ormolu.Parser.Anns
2432import Ormolu.Parser.CommentStream
2533import Ormolu.Parser.Result
26−import qualified CmdLineParser as GHC
27−import qualified DynFlags as GHC
28−import qualified FastString as GHC
29−import qualified HeaderInfo as GHC
30−import qualified Lexer as GHC
31−import qualified Outputable as GHC
34+import Ormolu.Processing.Preprocess (preprocess)
35+import Ormolu.Utils (incSpanLine, removeIndentation)
36+import qualified Panic as GHC
3237import qualified Parser as GHC
33−import qualified SrcLoc as GHC
3438import qualified StringBuffer as GHC
3539
3640-- | Parse a complete module from string.
41+parseModule ::
42+ MonadIO m =>
43+ -- | Ormolu configuration
44+ Config RegionDeltas ->
45+ -- | File name (only for source location annotations)
46+ FilePath ->
47+ -- | Input for parser
48+ String ->
49+ m
50+ ( [GHC.Warn],
51+ Either (SrcSpan, String) ParseResult
52+ )
53+parseModule Config {..} path rawInput = liftIO $ do
54+ let (literalPrefix, indentedInput, literalSuffix, extraComments) =
55+ preprocess path rawInput cfgRegion
56+ (input, indent) = removeIndentation indentedInput
57+ -- It's important that 'setDefaultExts' is done before
58+ -- 'parsePragmasIntoDynFlags', because otherwise we might enable an
59+ -- extension that was explicitly disabled in the file.
60+ let baseFlags =
61+ GHC.setGeneralFlag'
62+ GHC.Opt_Haddock
63+ (setDefaultExts baseDynFlags)
64+ extraOpts = dynOptionToLocatedStr <$> cfgDynOptions
65+ (warnings, dynFlags) <-
66+ parsePragmasIntoDynFlags baseFlags extraOpts path rawInput >>= \case
67+ Right res -> pure res
68+ Left err ->
69+ let loc =
70+ mkSrcSpan
71+ (mkSrcLoc (GHC.mkFastString path) 1 1)
72+ (mkSrcLoc (GHC.mkFastString path) 1 1)
73+ in throwIO (OrmoluParsingFailed loc err)
74+ let useRecordDot =
75+ "record-dot-preprocessor" == pgm_F dynFlags
76+ || any
77+ (("RecordDotPreprocessor" ==) . moduleNameString)
78+ (pluginModNames dynFlags)
79+ pStateErrors = \pstate ->
80+ let errs = bagToList $ GHC.getErrorMessages pstate dynFlags
81+ fixupErrSpan = incSpanLine (regionPrefixLength cfgRegion)
82+ in case L.sortOn (Down . SeverityOrd . errMsgSeverity) errs of
83+ [] -> Nothing
84+ err : _ ->
85+ -- Show instance returns a short error message
86+ Just (fixupErrSpan (errMsgSpan err), show err)
87+ r = case runParser GHC.parseModule dynFlags path input of
88+ GHC.PFailed pstate ->
89+ case pStateErrors pstate of
90+ Just err -> Left err
91+ Nothing -> error "PFailed does not have an error"
92+ GHC.POk pstate (L _ hsModule) ->
93+ case pStateErrors pstate of
94+ -- Some parse errors (pattern/arrow syntax in expr context)
95+ -- do not cause a parse error, but they are replaced with "_"
96+ -- by the parser and the modified AST is propagated to the
97+ -- later stages; but we fail in those cases.
98+ Just err -> Left err
99+ Nothing ->
100+ let (stackHeader, shebangs, pragmas, comments) =
101+ mkCommentStream input extraComments pstate
102+ in Right
103+ ParseResult
104+ { prParsedSource = hsModule,
105+ prAnns = mkAnns pstate,
106+ prStackHeader = stackHeader,
107+ prShebangs = shebangs,
108+ prPragmas = pragmas,
109+ prCommentStream = comments,
110+ prUseRecordDot = useRecordDot,
111+ prImportQualifiedPost =
112+ GHC.xopt ImportQualifiedPost dynFlags,
113+ prLiteralPrefix = T.pack literalPrefix,
114+ prLiteralSuffix = T.pack literalSuffix,
115+ prIndent = indent
116+ }
117+ return (warnings, r)
37118
38−parseModule
39− :: MonadIO m
40− => Config -- ^ Ormolu configuration
41− -> FilePath -- ^ File name (only for source location annotations)
42− -> String -- ^ Input for parser
43− -> m ( [GHC.Warn]
44− , Either (SrcSpan, String) ParseResult
45− )
46−parseModule Config {..} path input' = liftIO $ do
47− let (input, extraComments) = stripLinePragmas input'
48− (ws, dynFlags) <- ghcWrapper $ do
49− dynFlags0 <- initDynFlagsPure path input
50− (dynFlags1, _, ws) <- GHC.parseDynamicFilePragma
51− dynFlags0
52− (dynOptionToLocatedStr <$> cfgDynOptions)
53− return (ws, dynFlags1)
54− -- NOTE It's better to throw this outside of 'ghcWrapper' because
55− -- otherwise the exception will be wrapped as a GHC panic, which we don't
56− -- want.
57− when (GHC.xopt Cpp dynFlags && not cfgTolerateCpp) $
58− throwIO (OrmoluCppEnabled path)
59− let r = case runParser GHC.parseModule dynFlags path input of
60− GHC.PFailed _ ss m ->
61− Left (ss, GHC.showSDoc dynFlags m)
62− GHC.POk pstate pmod ->
63− let (comments, exts) = mkCommentStream extraComments pstate
64− in Right ParseResult
65− { prParsedSource = pmod
66− , prAnns = mkAnns pstate
67− , prCommentStream = comments
68− , prExtensions = exts
69− }
70− return (ws, r)
119+-- | Enable all language extensions that we think should be enabled by
120+-- default for ease of use.
121+setDefaultExts :: DynFlags -> DynFlags
122+setDefaultExts flags = L.foldl' xopt_set flags autoExts
123+ where
124+ autoExts = allExts L.\\ manualExts
125+ allExts = [minBound .. maxBound]
71126
72127-- | Extensions that are not enabled automatically and should be activated
73128-- by user.
74−
75129manualExts :: [Extension]
76130manualExts =
77− [ Arrows -- steals proc
78− , Cpp -- forbidden
79− , PatternSynonyms -- steals the pattern keyword
80− , RecursiveDo -- steals the rec keyword
81− , StaticPointers -- steals static keyword
82− , TransformListComp -- steals the group keyword
83− , UnboxedTuples -- breaks (#) lens operator
84− , MagicHash -- screws {-# these things #-}
85− , TypeApplications -- steals (@) operator on some cases
86− , AlternativeLayoutRule
87− , AlternativeLayoutRuleTransitional
88− , MonadComprehensions
89− , UnboxedSums
90− , UnicodeSyntax -- gives special meanings to operators like (→)
91− , TemplateHaskellQuotes -- enables TH subset of quasi-quotes, this
92− -- apparently interferes with QuasiQuotes in
93− -- weird ways
131+ [ Arrows, -- steals proc
132+ Cpp, -- forbidden
133+ BangPatterns, -- makes certain patterns with ! fail
134+ PatternSynonyms, -- steals the pattern keyword
135+ RecursiveDo, -- steals the rec keyword
136+ StaticPointers, -- steals static keyword
137+ TransformListComp, -- steals the group keyword
138+ UnboxedTuples, -- breaks (#) lens operator
139+ MagicHash, -- screws {-# these things #-}
140+ TypeApplications, -- steals (@) operator on some cases
141+ AlternativeLayoutRule,
142+ AlternativeLayoutRuleTransitional,
143+ MonadComprehensions,
144+ UnboxedSums,
145+ UnicodeSyntax, -- gives special meanings to operators like (→)
146+ TemplateHaskellQuotes, -- enables TH subset of quasi-quotes, this
147+ -- apparently interferes with QuasiQuotes in
148+ -- weird ways
149+ ImportQualifiedPost -- affects how Ormolu renders imports, so the
150+ -- decision of enabling this style is left to the user
94151 ]
95152
96−----------------------------------------------------------------------------
97−-- Helpers (taken from ghc-exactprint)
98−
99−-- | Requires GhcMonad constraint because there is no pure variant of
100−-- 'parseDynamicFilePragma'. Yet, in constrast to 'initDynFlags', it does
101−-- not (try to) read the file at filepath, but solely depends on the module
102−-- source in the input string.
103−--
104−-- Passes "-hide-all-packages" to the GHC API to prevent parsing of package
105−-- environment files. However this only works if there is no invocation of
106−-- 'setSessionDynFlags' before calling 'initDynFlagsPure'. See GHC tickets
107−-- #15513, #15541.
108−
109−initDynFlagsPure
110− :: GHC.GhcMonad m
111− => FilePath -- ^ Module path
112− -> String -- ^ Module contents
113− -> m GHC.DynFlags -- ^ Dynamic flags for that module
114−initDynFlagsPure fp input = do
115− -- I was told we could get away with using the 'unsafeGlobalDynFlags'. as
116− -- long as 'parseDynamicFilePragma' is impure there seems to be no reason
117− -- to use it.
118− dflags0 <- setDefaultExts <$> GHC.getSessionDynFlags
119− let tokens = GHC.getOptions dflags0 (GHC.stringToStringBuffer input) fp
120− (dflags1, _, _) <- GHC.parseDynamicFilePragma dflags0 tokens
121− -- Turn this on last to avoid T10942
122− let dflags2 = dflags1 `GHC.gopt_set` GHC.Opt_KeepRawTokenStream
123− -- Prevent parsing of .ghc.environment.* "package environment files"
124− (dflags3, _, _) <- GHC.parseDynamicFlagsCmdLine
125− dflags2
126− [GHC.noLoc "-hide-all-packages"]
127− _ <- GHC.setSessionDynFlags dflags3
128− return dflags3
129−
130−-- | Default runner of 'GHC.Ghc' action in 'IO'.
131−
132−ghcWrapper :: GHC.Ghc a -> IO a
133−ghcWrapper
134− = GHC.defaultErrorHandler GHC.defaultFatalMessager GHC.defaultFlushOut
135− . GHC.runGhc (Just libdir)
136−
137153-- | Run a 'GHC.P' computation.
138−
139−runParser
140− :: GHC.P a -- ^ Computation to run
141− -> GHC.DynFlags -- ^ Dynamic flags
142− -> FilePath -- ^ Module path
143− -> String -- ^ Module contents
144− -> GHC.ParseResult a -- ^ Parse result
154+runParser ::
155+ -- | Computation to run
156+ GHC.P a ->
157+ -- | Dynamic flags
158+ GHC.DynFlags ->
159+ -- | Module path
160+ FilePath ->
161+ -- | Module contents
162+ String ->
163+ -- | Parse result
164+ GHC.ParseResult a
145165runParser parser flags filename input = GHC.unP parser parseState
146166 where
147167 location = GHC.mkRealSrcLoc (GHC.mkFastString filename) 1 1
148168 buffer = GHC.stringToStringBuffer input
149169 parseState = GHC.mkPState flags buffer location
150170
151−-- | Remove GHC style line pragams (@{-# LINE .. #-}@) and convert them into
152−-- comments.
153−
154−stripLinePragmas :: String -> (String, [Located String])
155−stripLinePragmas = unlines' . unzip . findLines . lines
156− where
157− unlines' (a, b) = (unlines a, catMaybes b)
158−
159−findLines :: [String] -> [(String, Maybe (Located String))]
160−findLines = zipWith checkLine [1..]
171+-- | Wrap GHC's 'Severity' to add 'Ord' instance.
172+newtype SeverityOrd = SeverityOrd Severity
173+
174+instance Eq SeverityOrd where
175+ s1 == s2 = compare s1 s2 == EQ
176+
177+instance Ord SeverityOrd where
178+ compare (SeverityOrd s1) (SeverityOrd s2) =
179+ compare (f s1) (f s2)
180+ where
181+ f :: Severity -> Int
182+ f SevOutput = 1
183+ f SevFatal = 2
184+ f SevInteractive = 3
185+ f SevDump = 4
186+ f SevInfo = 5
187+ f SevWarning = 6
188+ f SevError = 7
161189
162−checkLine :: Int -> String -> (String, Maybe (Located String))
163−checkLine line s
164− | "{-# LINE" `isPrefixOf` s =
165− let (pragma, res) = getPragma s
166− size = length pragma
167− mSrcLoc = mkSrcLoc (GHC.mkFastString "LINE")
168− ss = mkSrcSpan (mSrcLoc line 1) (mSrcLoc line (size+1))
169− in (res, Just $ L ss pragma)
170− | "#!" `isPrefixOf` s =
171− let mSrcLoc = mkSrcLoc (GHC.mkFastString "SHEBANG")
172− ss = mkSrcSpan (mSrcLoc line 1) (mSrcLoc line (length s))
173− in ("",Just $ L ss s)
174− | otherwise = (s, Nothing)
175−
176−getPragma :: String -> (String, String)
177−getPragma [] = error "Ormolu.Parser.getPragma: input must not be empty"
178−getPragma s@(x:xs)
179− | "#-}" `isPrefixOf` s = ("#-}", " " ++ drop 3 s)
180− | otherwise =
181− let (prag, remline) = getPragma xs
182− in (x:prag, ' ':remline)
183−
184−-- | Enable all language extensions that we think should be enabled by
185−-- default for ease of use.
186−
187−setDefaultExts :: DynFlags -> DynFlags
188−setDefaultExts flags = foldl' GHC.xopt_set flags autoExts
190+----------------------------------------------------------------------------
191+-- Helpers taken from HLint
192+
193+parsePragmasIntoDynFlags ::
194+ -- | Pre-set 'DynFlags'
195+ DynFlags ->
196+ -- | Extra options (provided by user)
197+ [Located String] ->
198+ -- | File name (only for source location annotations)
199+ FilePath ->
200+ -- | Input for parser
201+ String ->
202+ IO (Either String ([GHC.Warn], DynFlags))
203+parsePragmasIntoDynFlags flags extraOpts filepath str =
204+ catchErrors $ do
205+ let opts = GHC.getOptions flags (GHC.stringToStringBuffer str) filepath
206+ (flags', leftovers, warnings) <-
207+ parseDynamicFilePragma flags (opts <> extraOpts)
208+ case NE.nonEmpty leftovers of
209+ Nothing -> return ()
210+ Just unrecognizedOpts ->
211+ throwIO (OrmoluUnrecognizedOpts (unLoc <$> unrecognizedOpts))
212+ let flags'' = flags' `gopt_set` Opt_KeepRawTokenStream
213+ return $ Right (warnings, flags'')
189214 where
190− autoExts = allExts \\ manualExts
191− allExts = [minBound..maxBound]
192−
193−deriving instance Bounded Extension
215+ catchErrors act =
216+ GHC.handleGhcException
217+ reportErr
218+ (GHC.handleSourceError reportErr act)
219+ reportErr e = return $ Left (show e)
src/Ormolu/Parser/Anns.hs+18−20
@@ -1,37 +1,34 @@
11-- | Ormolu-specific representation of GHC annotations.
2−
32module Ormolu.Parser.Anns
4− ( Anns (..)
5− , emptyAnns
6− , mkAnns
7− , lookupAnns
3+ ( Anns (..),
4+ emptyAnns,
5+ mkAnns,
6+ lookupAnns,
87 )
98where
109
1110import Data.Map.Strict (Map)
12−import Data.Maybe (mapMaybe)
13−import SrcLoc
1411import qualified Data.Map.Strict as M
12+import Data.Maybe (mapMaybe)
1513import qualified GHC
1614import qualified Lexer as GHC
15+import SrcLoc
1716
1817-- | Ormolu-specific representation of GHC annotations.
19−
2018newtype Anns = Anns (Map RealSrcSpan [GHC.AnnKeywordId])
2119 deriving (Eq)
2220
2321-- | Empty 'Anns'.
24−
2522emptyAnns :: Anns
2623emptyAnns = Anns M.empty
2724
2825-- | Create 'Anns' from 'GHC.PState'.
29−
30−mkAnns
31− :: GHC.PState
32− -> Anns
33−mkAnns pstate = Anns $
34− M.fromListWith (++) (mapMaybe f (GHC.annotations pstate))
26+mkAnns ::
27+ GHC.PState ->
28+ Anns
29+mkAnns pstate =
30+ Anns $
31+ M.fromListWith (++) (mapMaybe f (GHC.annotations pstate))
3532 where
3633 f ((spn, kid), _) =
3734 case spn of
@@ -39,10 +36,11 @@ mkAnns pstate = Anns $
3936 UnhelpfulSpan _ -> Nothing
4037
4138-- | Lookup 'GHC.AnnKeywordId's corresponding to a given 'SrcSpan'.
42−
43−lookupAnns
44− :: SrcSpan -- ^ Span to lookup with
45− -> Anns -- ^ Collection of annotations
46− -> [GHC.AnnKeywordId]
39+lookupAnns ::
40+ -- | Span to lookup with
41+ SrcSpan ->
42+ -- | Collection of annotations
43+ Anns ->
44+ [GHC.AnnKeywordId]
4745lookupAnns (RealSrcSpan rspn) (Anns m) = M.findWithDefault [] rspn m
4846lookupAnns (UnhelpfulSpan _) _ = []
src/Ormolu/Parser/CommentStream.hs+184−89
@@ -1,131 +1,226 @@
1−{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE DeriveDataTypeable #-}
1+{-# LANGUAGE DeriveDataTypeable #-}
32{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4−{-# LANGUAGE LambdaCase #-}
5−{-# LANGUAGE TupleSections #-}
3+{-# LANGUAGE LambdaCase #-}
64
75-- | Functions for working with comment stream.
8−
96module Ormolu.Parser.CommentStream
10− ( CommentStream (..)
11− , Comment (..)
12− , mkCommentStream
13− , isPrevHaddock
14− , showCommentStream
7+ ( -- * Comment stream
8+ CommentStream (..),
9+ mkCommentStream,
10+ showCommentStream,
11+
12+ -- * Comment
13+ Comment (..),
14+ unComment,
15+ hasAtomsBefore,
16+ isMultilineComment,
1517 )
1618where
1719
1820import Data.Char (isSpace)
1921import Data.Data (Data)
20−import Data.Either (partitionEithers)
21−import Data.List (isPrefixOf, sortOn, dropWhileEnd)
22+import qualified Data.List as L
2223import Data.List.NonEmpty (NonEmpty (..))
23−import Data.Maybe (mapMaybe)
24−import Ormolu.Parser.Pragma
25−import Ormolu.Utils (showOutputable)
26−import SrcLoc
2724import qualified Data.List.NonEmpty as NE
25+import Data.Maybe (mapMaybe)
2826import qualified GHC
2927import qualified Lexer as GHC
28+import Ormolu.Parser.Pragma
29+import Ormolu.Parser.Shebang
30+import Ormolu.Processing.Common
31+import Ormolu.Utils (onTheSameLine, showOutputable)
32+import SrcLoc
33+
34+----------------------------------------------------------------------------
35+-- Comment stream
3036
3137-- | A stream of 'RealLocated' 'Comment's in ascending order with respect to
3238-- beginning of corresponding spans.
33−
3439newtype CommentStream = CommentStream [RealLocated Comment]
3540 deriving (Eq, Data, Semigroup, Monoid)
3641
37−-- | A wrapper for a single comment. The 'NonEmpty' list inside contains
38−-- lines of multiline comment @{- … -}@ or just single item\/line otherwise.
39−
40−newtype Comment = Comment (NonEmpty String)
41− deriving (Eq, Show, Data)
42−
43−-- | Create 'CommentStream' from 'GHC.PState'. We also create a 'Set' of
44−-- extensions here, which is not sorted in any way. The pragma comment are
45−-- removed from the 'CommentStream'.
46−
47−mkCommentStream
48− :: [Located String] -- ^ Extra comments to include
49− -> GHC.PState -- ^ Parser state to use for comment extraction
50− -> (CommentStream, [Pragma])
51− -- ^ Comment stream and a set of extracted pragmas
52−mkCommentStream extraComments pstate =
53− ( CommentStream $
54− -- NOTE It's easier to normalize pragmas right when we construct comment
55− -- streams. Because this way we need to do it only once and when we
56− -- perform checking later they'll automatically match.
57− mkComment <$> sortOn (realSrcSpanStart . getLoc) comments
58− , pragmas
42+-- | Create 'CommentStream' from 'GHC.PState'. The pragmas and shebangs are
43+-- removed from the 'CommentStream'. Shebangs are only extracted from the
44+-- comments that come from the first argument.
45+mkCommentStream ::
46+ -- | Original input
47+ String ->
48+ -- | Extra comments to include
49+ [Located String] ->
50+ -- | Parser state to use for comment extraction
51+ GHC.PState ->
52+ -- | Stack header, shebangs, pragmas, and comment stream
53+ ( Maybe (RealLocated Comment),
54+ [Shebang],
55+ [([RealLocated Comment], Pragma)],
56+ CommentStream
57+ )
58+mkCommentStream input extraComments pstate =
59+ ( mstackHeader,
60+ shebangs,
61+ pragmas,
62+ CommentStream comments
5963 )
6064 where
61− (comments, pragmas) = partitionEithers (partitionComments <$> rawComments)
62− rawComments = mapMaybe toRealSpan $
63− extraComments ++
64− (fmap unAnnotationComment <$> GHC.comment_q pstate) ++
65− concatMap (fmap (fmap unAnnotationComment) . snd)
66− (GHC.annotations_comments pstate)
67−
68−-- | Test whether a 'Comment' looks like a Haddock following a definition,
69−-- i.e. something starting with @-- ^@.
70−
71−isPrevHaddock :: Comment -> Bool
72−isPrevHaddock (Comment (x :| _)) = "-- ^" `isPrefixOf` x
65+ (comments, pragmas) = extractPragmas input rawComments1
66+ (rawComments1, mstackHeader) = extractStackHeader rawComments0
67+ rawComments0 =
68+ L.sortOn (realSrcSpanStart . getRealSrcSpan) . mapMaybe toRealSpan $
69+ otherExtraComments
70+ ++ mapMaybe (liftMaybe . fmap unAnnotationComment) (GHC.comment_q pstate)
71+ ++ concatMap
72+ (mapMaybe (liftMaybe . fmap unAnnotationComment) . snd)
73+ (GHC.annotations_comments pstate)
74+ (shebangs, otherExtraComments) = extractShebangs extraComments
7375
7476-- | Pretty-print a 'CommentStream'.
75−
7677showCommentStream :: CommentStream -> String
77−showCommentStream (CommentStream xs) = unlines $
78− showComment <$> xs
78+showCommentStream (CommentStream xs) =
79+ unlines $
80+ showComment <$> xs
7981 where
8082 showComment (GHC.L l str) = showOutputable l ++ " " ++ show str
8183
8284----------------------------------------------------------------------------
83−-- Helpers
85+-- Comment
86+
87+-- | A wrapper for a single comment. The 'Bool' indicates whether there were
88+-- atoms before beginning of the comment in the original input. The
89+-- 'NonEmpty' list inside contains lines of multiline comment @{- … -}@ or
90+-- just single item\/line otherwise.
91+data Comment = Comment Bool (NonEmpty String)
92+ deriving (Eq, Show, Data)
8493
8594-- | Normalize comment string. Sometimes one multi-line comment is turned
8695-- into several lines for subsequent outputting with correct indentation for
8796-- each line.
88−
89−mkComment :: RealLocated String -> RealLocated Comment
90−mkComment (L l s) = L l . Comment . fmap dropTrailing $
91− if "{-" `isPrefixOf` s
92− then case NE.nonEmpty (lines s) of
93− Nothing -> s :| []
94− Just (x:|xs) ->
95− let getIndent y =
96− if all isSpace y
97− then startIndent
98− else length (takeWhile isSpace y)
99− n = minimum (startIndent : fmap getIndent xs)
100− in x :| (drop n <$> xs)
101− else s :| []
97+mkComment ::
98+ -- | Lines of original input with their indices
99+ [(Int, String)] ->
100+ -- | Raw comment string
101+ RealLocated String ->
102+ -- | Remaining lines of original input and the constructed 'Comment'
103+ ([(Int, String)], RealLocated Comment)
104+mkComment ls (L l s) = (ls', comment)
102105 where
103− dropTrailing = dropWhileEnd isSpace
106+ comment =
107+ L l . Comment atomsBefore . removeConseqBlanks . fmap dropTrailing $
108+ if "{-" `L.isPrefixOf` s
109+ then case NE.nonEmpty (lines s) of
110+ Nothing -> s :| []
111+ Just (x :| xs) ->
112+ let getIndent y =
113+ if all isSpace y || y == endDisabling
114+ then startIndent
115+ else length (takeWhile isSpace y)
116+ n = minimum (startIndent : fmap getIndent xs)
117+ removeIndent y =
118+ if y == endDisabling
119+ then y
120+ else drop n y
121+ in x :| (removeIndent <$> xs)
122+ else s :| []
123+ (atomsBefore, ls') =
124+ case dropWhile ((< commentLine) . fst) ls of
125+ [] -> (False, [])
126+ ((_, i) : ls'') ->
127+ case take 2 (dropWhile isSpace i) of
128+ "--" -> (False, ls'')
129+ "{-" -> (False, ls'')
130+ _ -> (True, ls'')
131+ dropTrailing = L.dropWhileEnd isSpace
104132 startIndent = srcSpanStartCol l - 1
133+ commentLine = srcSpanStartLine l
105134
106−-- | Get a 'String' from 'GHC.AnnotationComment'.
135+-- | Get a collection of lines from a 'Comment'.
136+unComment :: Comment -> NonEmpty String
137+unComment (Comment _ xs) = xs
138+
139+-- | Check whether the 'Comment' had some non-whitespace atoms in front of
140+-- it in the original input.
141+hasAtomsBefore :: Comment -> Bool
142+hasAtomsBefore (Comment atomsBefore _) = atomsBefore
143+
144+-- | Is this comment multiline-style?
145+isMultilineComment :: Comment -> Bool
146+isMultilineComment (Comment _ (x :| _)) = "{-" `L.isPrefixOf` x
147+
148+----------------------------------------------------------------------------
149+-- Helpers
150+
151+-- | Detect and extract stack header if it is present.
152+extractStackHeader ::
153+ -- | Comment stream to analyze
154+ [RealLocated String] ->
155+ ([RealLocated String], Maybe (RealLocated Comment))
156+extractStackHeader = \case
157+ [] -> ([], Nothing)
158+ (x : xs) ->
159+ let comment = snd (mkComment [] x)
160+ in if isStackHeader (unRealSrcSpan comment)
161+ then (xs, Just comment)
162+ else (x : xs, Nothing)
163+ where
164+ isStackHeader (Comment _ (x :| _)) =
165+ "stack" `L.isPrefixOf` dropWhile isSpace (drop 2 x)
166+
167+-- | Extract pragmas and their associated comments.
168+extractPragmas ::
169+ -- | Input
170+ String ->
171+ -- | Comment stream to analyze
172+ [RealLocated String] ->
173+ ([RealLocated Comment], [([RealLocated Comment], Pragma)])
174+extractPragmas input = go initialLs id id
175+ where
176+ initialLs = zip [1 ..] (lines input)
177+ go ls csSoFar pragmasSoFar = \case
178+ [] -> (csSoFar [], pragmasSoFar [])
179+ (x : xs) ->
180+ case parsePragma (unRealSrcSpan x) of
181+ Nothing ->
182+ let (ls', x') = mkComment ls x
183+ in go ls' (csSoFar . (x' :)) pragmasSoFar xs
184+ Just pragma ->
185+ let combined ys = (csSoFar ys, pragma)
186+ go' ls' ys rest = go ls' id (pragmasSoFar . (combined ys :)) rest
187+ in case xs of
188+ [] -> go' ls [] xs
189+ (y : ys) ->
190+ let (ls', y') = mkComment ls y
191+ in if onTheSameLine
192+ (RealSrcSpan (getRealSrcSpan x))
193+ (RealSrcSpan (getRealSrcSpan y))
194+ then go' ls' [y'] ys
195+ else go' ls [] xs
107196
108−unAnnotationComment :: GHC.AnnotationComment -> String
197+-- | Get a 'String' from 'GHC.AnnotationComment'.
198+unAnnotationComment :: GHC.AnnotationComment -> Maybe String
109199unAnnotationComment = \case
110− GHC.AnnDocCommentNext s -> s
111− GHC.AnnDocCommentPrev s -> s
112− GHC.AnnDocCommentNamed s -> s
113− GHC.AnnDocSection _ s -> s
114− GHC.AnnDocOptions s -> s
115− GHC.AnnLineComment s -> s
116− GHC.AnnBlockComment s -> s
200+ GHC.AnnDocCommentNext _ -> Nothing -- @-- |@
201+ GHC.AnnDocCommentPrev _ -> Nothing -- @-- ^@
202+ GHC.AnnDocCommentNamed _ -> Nothing -- @-- $@
203+ GHC.AnnDocSection _ _ -> Nothing -- @-- *@
204+ GHC.AnnDocOptions s -> Just s
205+ GHC.AnnLineComment s -> Just s
206+ GHC.AnnBlockComment s -> Just s
207+
208+liftMaybe :: Located (Maybe a) -> Maybe (Located a)
209+liftMaybe = \case
210+ L _ Nothing -> Nothing
211+ L l (Just a) -> Just (L l a)
117212
118213toRealSpan :: Located a -> Maybe (RealLocated a)
119214toRealSpan (L (RealSrcSpan l) a) = Just (L l a)
120215toRealSpan _ = Nothing
121216
122−-- | If a given comment is a pragma, return it in parsed form in 'Right'.
123−-- Otherwise return the original comment unchanged.
124−
125−partitionComments
126− :: RealLocated String
127− -> Either (RealLocated String) Pragma
128−partitionComments input =
129− case parsePragma (unLoc input) of
130− Nothing -> Left input
131− Just pragma -> Right pragma
217+-- | Remove consecutive blank lines.
218+removeConseqBlanks :: NonEmpty String -> NonEmpty String
219+removeConseqBlanks (x :| xs) = x :| go (null x) id xs
220+ where
221+ go seenBlank acc = \case
222+ [] -> acc []
223+ (y : ys) ->
224+ if seenBlank && null y
225+ then go True acc ys
226+ else go (null y) (acc . (y :)) ys
src/Ormolu/Parser/Pragma.hs+34−33
@@ -1,41 +1,42 @@
1−-- | A module for parsing of pragmas from comments.
2−
3−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
42{-# LANGUAGE OverloadedStrings #-}
53
4+-- | A module for parsing of pragmas from comments.
65module Ormolu.Parser.Pragma
7− ( Pragma (..)
8− , parsePragma
6+ ( Pragma (..),
7+ parsePragma,
98 )
109where
1110
1211import Control.Monad
13−import Data.Char (toLower, isSpace)
14−import Data.List
12+import Data.Char (isSpace, toLower)
13+import qualified Data.List as L
14+import qualified EnumSet as ES
1515import FastString (mkFastString, unpackFS)
16−import Module (newSimpleUnitId, ComponentId (..))
16+import qualified Lexer as L
17+import Module (ComponentId (..), newSimpleUnitId)
1718import SrcLoc
1819import StringBuffer
19−import qualified EnumSet as ES
20−import qualified Lexer as L
2120
2221-- | Ormolu's representation of pragmas.
23−
2422data Pragma
25− = PragmaLanguage [String] -- ^ Language pragma
26− | PragmaOptionsGHC String -- ^ GHC options pragma
27− | PragmaOptionsHaddock String -- ^ Haddock options pragma
23+ = -- | Language pragma
24+ PragmaLanguage [String]
25+ | -- | GHC options pragma
26+ PragmaOptionsGHC String
27+ | -- | Haddock options pragma
28+ PragmaOptionsHaddock String
2829 deriving (Show, Eq)
2930
3031-- | Extract a pragma from a comment if possible, or return 'Nothing'
3132-- otherwise.
32−
33−parsePragma
34− :: String -- ^ Comment to try to parse
35− -> Maybe Pragma
33+parsePragma ::
34+ -- | Comment to try to parse
35+ String ->
36+ Maybe Pragma
3637parsePragma input = do
37− inputNoPrefix <- stripPrefix "{-#" input
38− guard ("#-}" `isSuffixOf` input)
38+ inputNoPrefix <- L.stripPrefix "{-#" input
39+ guard ("#-}" `L.isSuffixOf` input)
3940 let contents = take (length inputNoPrefix - 3) inputNoPrefix
4041 (pragmaName, cs) = (break isSpace . dropWhile isSpace) contents
4142 case toLower <$> pragmaName of
@@ -45,21 +46,19 @@ parsePragma input = do
4546 _ -> Nothing
4647 where
4748 trimSpaces :: String -> String
48− trimSpaces = dropWhileEnd isSpace . dropWhile isSpace
49+ trimSpaces = L.dropWhileEnd isSpace . dropWhile isSpace
4950
5051-- | Assuming the input consists of a series of tokens from a language
5152-- pragma, return the set of enabled extensions.
52−
53−parseExtensions :: String -> Maybe [String]
53+parseExtensions :: String -> Maybe [String]
5454parseExtensions str = tokenize str >>= go
5555 where
5656 go = \case
57− (L.ITconid ext : []) -> return [unpackFS ext]
57+ [L.ITconid ext] -> return [unpackFS ext]
5858 (L.ITconid ext : L.ITcomma : xs) -> (unpackFS ext :) <$> go xs
5959 _ -> Nothing
6060
6161-- | Tokenize a given input using GHC's lexer.
62−
6362tokenize :: String -> Maybe [L.Token]
6463tokenize input =
6564 case L.unP pLexer parseState of
@@ -69,15 +68,17 @@ tokenize input =
6968 location = mkRealSrcLoc (mkFastString "") 1 1
7069 buffer = stringToStringBuffer input
7170 parseState = L.mkPStatePure parserFlags buffer location
72− parserFlags = L.ParserFlags
73− { L.pWarningFlags = ES.empty
74− , L.pExtensionFlags = ES.empty
75− , L.pThisPackage = newSimpleUnitId (ComponentId (mkFastString ""))
76− , L.pExtsBitmap = 0xffffffffffffffff
77− }
71+ parserFlags =
72+ L.mkParserFlags'
73+ ES.empty
74+ ES.empty
75+ (newSimpleUnitId (ComponentId (mkFastString "")))
76+ True
77+ True
78+ True
79+ True
7880
7981-- | Haskell lexer.
80−
8182pLexer :: L.P [L.Token]
8283pLexer = go
8384 where
@@ -85,4 +86,4 @@ pLexer = go
8586 r <- L.lexer False return
8687 case unLoc r of
8788 L.ITeof -> return []
88− x -> (x:) <$> go
89+ x -> (x :) <$> go
src/Ormolu/Parser/Result.hs+34−20
@@ -1,37 +1,51 @@
1−-- | A type for result of parsing.
2−
31{-# LANGUAGE RecordWildCards #-}
42
3+-- | A type for result of parsing.
54module Ormolu.Parser.Result
6− ( ParseResult (..)
7− , prettyPrintParseResult
5+ ( ParseResult (..),
6+ prettyPrintParseResult,
87 )
98where
109
10+import Data.Text (Text)
1111import GHC
1212import Ormolu.Parser.Anns
1313import Ormolu.Parser.CommentStream
1414import Ormolu.Parser.Pragma (Pragma)
15+import Ormolu.Parser.Shebang (Shebang)
1516
1617-- | A collection of data that represents a parsed module in Ormolu.
17−
1818data ParseResult = ParseResult
19− { prParsedSource :: ParsedSource
20− -- ^ 'ParsedSource' from GHC
21− , prAnns :: Anns
22− -- ^ Ormolu-specfic representation of annotations
23− , prCommentStream :: CommentStream
24− -- ^ Comment stream
25− , prExtensions :: [Pragma]
26− -- ^ Extensions enabled in that module
19+ { -- | 'ParsedSource' from GHC
20+ prParsedSource :: HsModule GhcPs,
21+ -- | Ormolu-specfic representation of annotations
22+ prAnns :: Anns,
23+ -- | Stack header
24+ prStackHeader :: Maybe (RealLocated Comment),
25+ -- | Shebangs found in the input
26+ prShebangs :: [Shebang],
27+ -- | Pragmas and the associated comments
28+ prPragmas :: [([RealLocated Comment], Pragma)],
29+ -- | Comment stream
30+ prCommentStream :: CommentStream,
31+ -- | Whether or not record dot syntax is enabled
32+ prUseRecordDot :: Bool,
33+ -- | Whether or not ImportQualifiedPost is enabled
34+ prImportQualifiedPost :: Bool,
35+ -- | Literal prefix
36+ prLiteralPrefix :: Text,
37+ -- | Literal suffix
38+ prLiteralSuffix :: Text,
39+ -- | Indentation level, can be non-zero in case of region formatting
40+ prIndent :: Int
2741 }
2842
2943-- | Pretty-print a 'ParseResult'.
30−
3144prettyPrintParseResult :: ParseResult -> String
32−prettyPrintParseResult ParseResult {..} = unlines
33− [ "parse result:"
34− , " comment stream:"
35− , showCommentStream prCommentStream
36− -- XXX extend as needed
37− ]
45+prettyPrintParseResult ParseResult {..} =
46+ unlines
47+ [ "parse result:",
48+ " comment stream:",
49+ showCommentStream prCommentStream
50+ -- XXX extend as needed
51+ ]
src/Ormolu/Parser/Shebang.hsnew file+27
@@ -0,0 +1,27 @@
1+{-# LANGUAGE DeriveDataTypeable #-}
2+
3+-- | A module for dealing with shebangs.
4+module Ormolu.Parser.Shebang
5+ ( Shebang (..),
6+ extractShebangs,
7+ isShebang,
8+ )
9+where
10+
11+import Data.Data (Data)
12+import qualified Data.List as L
13+import SrcLoc
14+
15+-- | A wrapper for a shebang.
16+newtype Shebang = Shebang (Located String)
17+ deriving (Eq, Data)
18+
19+-- | Extract shebangs from the beginning of a comment stream.
20+extractShebangs :: [Located String] -> ([Shebang], [Located String])
21+extractShebangs comments = (Shebang <$> shebangs, rest)
22+ where
23+ (shebangs, rest) = span (isShebang . unLoc) comments
24+
25+-- | Return 'True' if given 'String' is a shebang.
26+isShebang :: String -> Bool
27+isShebang str = "#!" `L.isPrefixOf` str
src/Ormolu/Printer.hs+25−16
@@ -1,11 +1,8 @@
1−{-# LANGUAGE LambdaCase #-}
2−{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
1+{-# LANGUAGE RecordWildCards #-}
42
53-- | Pretty-printer for Haskell AST.
6−
74module Ormolu.Printer
8− ( printModule
5+ ( printModule,
96 )
107where
118
@@ -14,16 +11,28 @@ import Ormolu.Parser.Result
1411import Ormolu.Printer.Combinators
1512import Ormolu.Printer.Meat.Module
1613import Ormolu.Printer.SpanStream
14+import Ormolu.Processing.Postprocess (postprocess)
1715
1816-- | Render a module.
19−
20−printModule
21− :: Bool -- ^ Whether to trace debugging information
22− -> ParseResult -- ^ Result of parsing
23− -> Text -- ^ Resulting rendition
24−printModule debugOn ParseResult {..} =
25− runR debugOn
26− (p_hsModule prExtensions prParsedSource)
27− (mkSpanStream prParsedSource)
28− prCommentStream
29− prAnns
17+printModule ::
18+ -- | Result of parsing
19+ ParseResult ->
20+ -- | Resulting rendition
21+ Text
22+printModule ParseResult {..} =
23+ prLiteralPrefix <> region <> prLiteralSuffix
24+ where
25+ region =
26+ postprocess prIndent $
27+ runR
28+ ( p_hsModule
29+ prStackHeader
30+ prShebangs
31+ prPragmas
32+ prImportQualifiedPost
33+ prParsedSource
34+ )
35+ (mkSpanStream prParsedSource)
36+ prCommentStream
37+ prAnns
38+ prUseRecordDot
src/Ormolu/Printer/Combinators.hs+168−159
@@ -1,99 +1,113 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE FlexibleContexts #-}
2+{-# LANGUAGE GADTs #-}
3+{-# LANGUAGE LambdaCase #-}
24{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
45
56-- | Printing combinators. The definitions here are presented in such an
67-- order so you can just go through the Haddocks and by the end of the file
78-- you should have a pretty good idea how to program rendering logic.
8−
99module Ormolu.Printer.Combinators
1010 ( -- * The 'R' monad
11− R
12− , runR
13− , getAnns
14− , getEnclosingSpan
11+ R,
12+ runR,
13+ getAnns,
14+ getEnclosingSpan,
15+
1516 -- * Combinators
17+
1618 -- ** Basic
17− , txt
18− , atom
19− , space
20− , newline
21− , inci
22− , located
23− , located'
24− , switchLayout
25− , vlayout
26− , breakpoint
27− , breakpoint'
19+ txt,
20+ atom,
21+ space,
22+ newline,
23+ inci,
24+ inciIf,
25+ located,
26+ located',
27+ switchLayout,
28+ Layout (..),
29+ vlayout,
30+ getLayout,
31+ breakpoint,
32+ breakpoint',
33+
2834 -- ** Formatting lists
29− , sep
30− , sepSemi
31− , canUseBraces
32− , useBraces
33− , dontUseBraces
35+ sep,
36+ sepSemi,
37+ canUseBraces,
38+ useBraces,
39+ dontUseBraces,
40+
3441 -- ** Wrapping
35− , sitcc
36− , line
37− , backticks
38− , banana
39− , braces
40− , brackets
41− , bracketsPar
42− , parens
43− , parensHash
44− , pragmaBraces
45− , pragma
42+ BracketStyle (..),
43+ sitcc,
44+ backticks,
45+ banana,
46+ braces,
47+ brackets,
48+ parens,
49+ parensHash,
50+ pragmaBraces,
51+ pragma,
52+
4653 -- ** Literals
47− , comma
54+ comma,
55+ commaDel,
56+ equals,
57+
58+ -- ** Stateful markers
59+ SpanMark (..),
60+ spanMarkSpan,
61+ HaddockStyle (..),
62+ setSpanMark,
63+ getSpanMark,
4864 )
4965where
5066
5167import Control.Monad
52−import Data.Data (Data)
5368import Data.List (intersperse)
5469import Data.Text (Text)
5570import Ormolu.Printer.Comments
5671import Ormolu.Printer.Internal
57−import Ormolu.Utils (isModule)
5872import SrcLoc
5973
6074----------------------------------------------------------------------------
6175-- Basic
6276
77+-- | Indent the inner expression if the first argument is 'True'.
78+inciIf ::
79+ -- | Whether to indent
80+ Bool ->
81+ -- | The expression to indent
82+ R () ->
83+ R ()
84+inciIf b m = if b then inci m else m
85+
6386-- | Enter a 'Located' entity. This combinator handles outputting comments
6487-- and sets layout (single-line vs multi-line) for the inner computation.
6588-- Roughly, the rule for using 'located' is that every time there is a
6689-- 'Located' wrapper, it should be “discharged” with a corresponding
6790-- 'located' invocation.
68−
69−located
70− :: Data a
71− => Located a -- ^ Thing to enter
72− -> (a -> R ()) -- ^ How to render inner value
73− -> R ()
74−located loc f = do
75− let withRealLocated (L l a) g =
76− case l of
77− UnhelpfulSpan _ -> return ()
78− RealSrcSpan l' -> g (L l' a)
79− withRealLocated loc spitPrecedingComments
80− let setEnclosingSpan =
81− case getLoc loc of
82− UnhelpfulSpan _ -> id
83− RealSrcSpan orf ->
84− if isModule (unLoc loc)
85− then id
86− else withEnclosingSpan orf
87− setEnclosingSpan $ switchLayout [getLoc loc] (f (unLoc loc))
88− withRealLocated loc spitFollowingComments
91+located ::
92+ -- | Thing to enter
93+ Located a ->
94+ -- | How to render inner value
95+ (a -> R ()) ->
96+ R ()
97+located (L (UnhelpfulSpan _) a) f = f a
98+located (L (RealSrcSpan l) a) f = do
99+ spitPrecedingComments l
100+ withEnclosingSpan l $
101+ switchLayout [RealSrcSpan l] (f a)
102+ spitFollowingComments l
89103
90104-- | A version of 'located' with arguments flipped.
91−
92−located'
93− :: Data a
94− => (a -> R ()) -- ^ How to render inner value
95− -> Located a -- ^ Thing to enter
96− -> R ()
105+located' ::
106+ -- | How to render inner value
107+ (a -> R ()) ->
108+ -- | Thing to enter
109+ Located a ->
110+ R ()
97111located' = flip located
98112
99113-- | Set layout according to combination of given 'SrcSpan's for a given.
@@ -102,19 +116,19 @@ located' = flip located
102116-- provided by GHC AST. It is relatively rare that this one is needed.
103117--
104118-- Given empty list this function will set layout to single line.
105−
106−switchLayout
107− :: [SrcSpan] -- ^ Span that controls layout
108− -> R () -- ^ Computation to run with changed layout
109− -> R ()
119+switchLayout ::
120+ -- | Span that controls layout
121+ [SrcSpan] ->
122+ -- | Computation to run with changed layout
123+ R () ->
124+ R ()
110125switchLayout spans' = enterLayout (spansLayout spans')
111126
112127-- | Which layout combined spans result in?
113−
114128spansLayout :: [SrcSpan] -> Layout
115129spansLayout = \case
116130 [] -> SingleLine
117− (x:xs) ->
131+ (x : xs) ->
118132 if isOneLineSpan (foldr combineSrcSpans x xs)
119133 then SingleLine
120134 else MultiLine
@@ -123,7 +137,6 @@ spansLayout = \case
123137-- multiline.
124138--
125139-- > breakpoint = vlayout space newline
126−
127140breakpoint :: R ()
128141breakpoint = vlayout space newline
129142
@@ -131,7 +144,6 @@ breakpoint = vlayout space newline
131144-- layout.
132145--
133146-- > breakpoint' = vlayout (return ()) newline
134−
135147breakpoint' :: R ()
136148breakpoint' = vlayout (return ()) newline
137149
@@ -139,12 +151,14 @@ breakpoint' = vlayout (return ()) newline
139151-- Formatting lists
140152
141153-- | Render a collection of elements inserting a separator between them.
142−
143−sep
144− :: R () -- ^ Separator
145− -> (a -> R ()) -- ^ How to render an element
146− -> [a] -- ^ Elements to render
147− -> R ()
154+sep ::
155+ -- | Separator
156+ R () ->
157+ -- | How to render an element
158+ (a -> R ()) ->
159+ -- | Elements to render
160+ [a] ->
161+ R ()
148162sep s f xs = sequence_ (intersperse s (f <$> xs))
149163
150164-- | Render a collection of elements layout-sensitively using given printer,
@@ -156,11 +170,12 @@ sep s f xs = sequence_ (intersperse s (f <$> xs))
156170--
157171-- > dontUseBraces $ sepSemi txt ["foo", "bar"]
158172-- > == vlayout (txt "foo; bar") (txt "foo\nbar")
159−
160−sepSemi
161− :: (a -> R ()) -- ^ How to render an element
162− -> [a] -- ^ Elements to render
163− -> R ()
173+sepSemi ::
174+ -- | How to render an element
175+ (a -> R ()) ->
176+ -- | Elements to render
177+ [a] ->
178+ R ()
164179sepSemi f xs = vlayout singleLine multiLine
165180 where
166181 singleLine = do
@@ -169,31 +184,28 @@ sepSemi f xs = vlayout singleLine multiLine
169184 [] -> when ub $ txt "{}"
170185 xs' ->
171186 if ub
172− then do
173− txt "{ "
174− sep (txt "; ") (dontUseBraces . f) xs'
175− txt " }"
176− else
177− sep (txt "; ") f xs'
187+ then do
188+ txt "{"
189+ space
190+ sep (txt ";" >> space) (dontUseBraces . f) xs'
191+ space
192+ txt "}"
193+ else sep (txt ";" >> space) f xs'
178194 multiLine =
179195 sep newline (dontUseBraces . f) xs
180196
181197----------------------------------------------------------------------------
182198-- Wrapping
183199
184−-- | Finish given entity by a 'newline'.
185−--
186−-- > line m = do
187−-- > m
188−-- > newline
189−
190−line :: R () -> R ()
191−line m = do
192− m
193− newline
200+-- | 'BracketStyle' controlling how closing bracket is rendered.
201+data BracketStyle
202+ = -- | Normal
203+ N
204+ | -- | Shifted one level
205+ S
206+ deriving (Eq, Show)
194207
195208-- | Surround given entity by backticks.
196−
197209backticks :: R () -> R ()
198210backticks m = do
199211 txt "`"
@@ -201,89 +213,86 @@ backticks m = do
201213 txt "`"
202214
203215-- | Surround given entity by banana brackets (i.e., from arrow notation.)
204−
205216banana :: R () -> R ()
206−banana m = sitcc $ do
207− txt "(|"
208− ospaces m
209− txt "|)"
217+banana = brackets_ True "(|" "|)" N
210218
211219-- | Surround given entity by curly braces @{@ and @}@.
212−
213−braces :: R () -> R ()
214−braces m = sitcc $ do
215− txt "{"
216− ospaces m
217− txt "}"
220+braces :: BracketStyle -> R () -> R ()
221+braces = brackets_ False "{" "}"
218222
219223-- | Surround given entity by square brackets @[@ and @]@.
220−
221−brackets :: R () -> R ()
222−brackets m = sitcc $ do
223− txt "["
224− ospaces m
225− txt "]"
226−
227−-- | Surround given entity by parallel array brackets @[:@ and @:]@.
228−
229−bracketsPar :: R () -> R ()
230−bracketsPar m = sitcc $ do
231− txt "[: "
232− m
233− vlayout (return ()) space
234− txt " :]"
224+brackets :: BracketStyle -> R () -> R ()
225+brackets = brackets_ False "[" "]"
235226
236227-- | Surround given entity by parentheses @(@ and @)@.
237−
238−parens :: R () -> R ()
239−parens m = sitcc $ do
240− txt "("
241− ospaces m
242− txt ")"
228+parens :: BracketStyle -> R () -> R ()
229+parens = brackets_ False "(" ")"
243230
244231-- | Surround given entity by @(# @ and @ #)@.
245−
246−parensHash :: R () -> R ()
247−parensHash m = sitcc $ do
248− txt "(# "
249− m
250− vlayout space (newline >> txt " ")
251− txt "#)"
232+parensHash :: BracketStyle -> R () -> R ()
233+parensHash = brackets_ True "(#" "#)"
252234
253235-- | Braces as used for pragmas: @{-#@ and @#-}@.
254−
255236pragmaBraces :: R () -> R ()
256237pragmaBraces m = sitcc $ do
257− txt "{-# "
238+ txt "{-#"
239+ space
258240 m
259− vlayout space (newline >> txt " ")
260− txt "#-}"
241+ breakpoint
242+ inci (txt "#-}")
261243
262244-- | Surround the body with a pragma name and 'pragmaBraces'.
263−
264−pragma
265− :: Text -- ^ Pragma text
266− -> R () -- ^ Pragma body
267− -> R ()
245+pragma ::
246+ -- | Pragma text
247+ Text ->
248+ -- | Pragma body
249+ R () ->
250+ R ()
268251pragma pragmaText body = pragmaBraces $ do
269252 txt pragmaText
270253 breakpoint
271254 body
272255
273−-- | Surround given entity by optional space before and a newline after, iff
274−-- current layout is multiline.
275−
276−ospaces :: R () -> R ()
277−ospaces m = vlayout m $ do
278− space
279− sitcc m
280− newline
281− txt " "
256+-- | A helper for defining wrappers like 'parens' and 'braces'.
257+brackets_ ::
258+ -- | Insert breakpoints around brackets
259+ Bool ->
260+ -- | Opening bracket
261+ Text ->
262+ -- | Closing bracket
263+ Text ->
264+ -- | Bracket style
265+ BracketStyle ->
266+ -- | Inner expression
267+ R () ->
268+ R ()
269+brackets_ needBreaks open close style m = sitcc (vlayout singleLine multiLine)
270+ where
271+ singleLine = do
272+ txt open
273+ when needBreaks space
274+ m
275+ when needBreaks space
276+ txt close
277+ multiLine = do
278+ txt open
279+ if needBreaks
280+ then newline >> inci m
281+ else space >> sitcc m
282+ newline
283+ inciIf (style == S) (txt close)
282284
283285----------------------------------------------------------------------------
284286-- Literals
285287
286288-- | Print @,@.
287−
288289comma :: R ()
289290comma = txt ","
291+
292+-- | Delimiting combination with 'comma'. To be used with 'sep'.
293+commaDel :: R ()
294+commaDel = comma >> breakpoint
295+
296+-- | Print @=@. Do not use @'txt' "="@.
297+equals :: R ()
298+equals = interferingTxt "="
src/Ormolu/Printer/Comments.hs+171−147
@@ -1,201 +1,200 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
33
44-- | Helpers for formatting of comments. This is low-level code, use
55-- "Ormolu.Printer.Combinators" unless you know what you are doing.
6−
76module Ormolu.Printer.Comments
8− ( spitPrecedingComments
9− , spitFollowingComments
10− , spitRemainingComments
11− , isNewlineModified
12− , hasMoreComments
7+ ( spitPrecedingComments,
8+ spitFollowingComments,
9+ spitRemainingComments,
10+ spitCommentNow,
11+ spitCommentPending,
1312 )
1413where
1514
1615import Control.Monad
17−import Data.Coerce (coerce)
18−import Data.Data (Data)
16+import qualified Data.List.NonEmpty as NE
17+import Data.Maybe (listToMaybe)
18+import qualified Data.Text as T
1919import Ormolu.Parser.CommentStream
2020import Ormolu.Printer.Internal
21−import Ormolu.Utils (isModule)
2221import SrcLoc
23−import qualified Data.List.NonEmpty as NE
24−import qualified Data.Text as T
2522
2623----------------------------------------------------------------------------
2724-- Top-level
2825
2926-- | Output all preceding comments for an element at given location.
30−
31−spitPrecedingComments
32− :: Data a
33− => RealLocated a -- ^ AST element to attach comments to
34− -> R ()
35−spitPrecedingComments = handleCommentSeries . spitPrecedingComment
27+spitPrecedingComments ::
28+ -- | Span of the element to attach comments to
29+ RealSrcSpan ->
30+ R ()
31+spitPrecedingComments ref = do
32+ gotSome <- handleCommentSeries (spitPrecedingComment ref)
33+ when gotSome $ do
34+ lastMark <- getSpanMark
35+ -- Insert a blank line between the preceding comments and the thing
36+ -- after them if there was a blank line in the input.
37+ when (needsNewlineBefore ref lastMark) newline
3638
3739-- | Output all comments following an element at given location.
38−
39−spitFollowingComments
40− :: Data a
41− => RealLocated a -- ^ AST element of attach comments to
42− -> R ()
40+spitFollowingComments ::
41+ -- | Span of the element to attach comments to
42+ RealSrcSpan ->
43+ R ()
4344spitFollowingComments ref = do
44− trimSpanStream (getLoc ref)
45− handleCommentSeries (spitFollowingComment ref)
45+ trimSpanStream ref
46+ void $ handleCommentSeries (spitFollowingComment ref)
4647
4748-- | Output all remaining comments in the comment stream.
48−
4949spitRemainingComments :: R ()
50−spitRemainingComments = handleCommentSeries spitRemainingComment
50+spitRemainingComments = do
51+ -- Make sure we have a blank a line between the last definition and the
52+ -- trailing comments.
53+ newline
54+ void $ handleCommentSeries spitRemainingComment
5155
5256----------------------------------------------------------------------------
5357-- Single-comment functions
5458
5559-- | Output a single preceding comment for an element at given location.
56−
57−spitPrecedingComment
58− :: Data a
59− => RealLocated a -- ^ AST element to attach comments to
60− -> Maybe RealSrcSpan -- ^ Location of last comment in the series
61− -> R (Maybe RealSrcSpan) -- ^ Location of this comment
62−spitPrecedingComment (L ref a) mlastSpn = do
60+spitPrecedingComment ::
61+ -- | Span of the element to attach comments to
62+ RealSrcSpan ->
63+ -- | Are we done?
64+ R Bool
65+spitPrecedingComment ref = do
66+ mlastMark <- getSpanMark
6367 let p (L l _) = realSrcSpanEnd l <= realSrcSpanStart ref
6468 withPoppedComment p $ \l comment -> do
65− dirtyLine <-
66− case mlastSpn of
67− -- NOTE When the current line is dirty it means that something that
68− -- can have comments attached to it is already on the line. To avoid
69− -- problems with idempotence we cannot output the first comment
70− -- immediately because it'll be attached to the previous element (on
71− -- the same line) on the next run, so we play safe here and output
72− -- an extra 'newline' in this case.
73− Nothing -> isLineDirty -- only for very first preceding comment
74− Just _ -> return False
75− when (dirtyLine || needsNewlineBefore l mlastSpn) newline
76− spitComment comment
77− if theSameLinePre l ref && not (isModule a)
69+ lineSpans <- thisLineSpans
70+ let thisCommentLine = srcLocLine (realSrcSpanStart l)
71+ needsNewline =
72+ case listToMaybe lineSpans of
73+ Nothing -> False
74+ Just spn -> srcLocLine (realSrcSpanEnd spn) /= thisCommentLine
75+ when (needsNewline || needsNewlineBefore l mlastMark) newline
76+ spitCommentNow l comment
77+ if theSameLinePre l ref
7878 then space
7979 else newline
8080
8181-- | Output a comment that follows element at given location immediately on
8282-- the same line, if there is any.
83−
84−spitFollowingComment
85− :: Data a
86− => RealLocated a -- ^ AST element to attach comments to
87− -> Maybe RealSrcSpan -- ^ Location of last comment in the series
88− -> R (Maybe RealSrcSpan) -- ^ Location of this comment
89−spitFollowingComment (L ref a) mlastSpn = do
83+spitFollowingComment ::
84+ -- | AST element to attach comments to
85+ RealSrcSpan ->
86+ -- | Are we done?
87+ R Bool
88+spitFollowingComment ref = do
89+ mlastMark <- getSpanMark
9090 mnSpn <- nextEltSpan
9191 -- Get first enclosing span that is not equal to reference span, i.e. it's
9292 -- truly something enclosing the AST element.
9393 meSpn <- getEnclosingSpan (/= ref)
94− newlineModified <- isNewlineModified
95− i <- getIndent
96− withPoppedComment (commentFollowsElt ref mnSpn meSpn mlastSpn) $ \l comment ->
97− if theSameLinePost l ref && not (isModule a)
98− then modNewline $ \m -> setIndent i $ do
99− if newlineModified
100− then do
101− -- This happens when we have several lines each with its own
102− -- comment and they get merged by the formatter.
103− m
104− spitComment comment
105− newline
106− else do
107− space
108− spitComment comment
109− m
110− else modNewline $ \m -> setIndent i $ do
111− m
112− when (needsNewlineBefore l mlastSpn) newline
113− spitComment comment
114− newline
94+ withPoppedComment (commentFollowsElt ref mnSpn meSpn mlastMark) $ \l comment ->
95+ if theSameLinePost l ref
96+ then
97+ if isMultilineComment comment
98+ then space >> spitCommentNow l comment
99+ else spitCommentPending OnTheSameLine l comment
100+ else do
101+ when (needsNewlineBefore l mlastMark) $
102+ registerPendingCommentLine OnNextLine ""
103+ spitCommentPending OnNextLine l comment
115104
116105-- | Output a single remaining comment from the comment stream.
117−
118−spitRemainingComment
119− :: Maybe RealSrcSpan -- ^ Location of last comment in the series
120− -> R (Maybe RealSrcSpan) -- ^ Location of this comment
121−spitRemainingComment mlastSpn =
106+spitRemainingComment ::
107+ -- | Are we done?
108+ R Bool
109+spitRemainingComment = do
110+ mlastMark <- getSpanMark
122111 withPoppedComment (const True) $ \l comment -> do
123− when (needsNewlineBefore l mlastSpn) newline
124− spitComment comment
112+ when (needsNewlineBefore l mlastMark) newline
113+ spitCommentNow l comment
125114 newline
126115
127116----------------------------------------------------------------------------
128117-- Helpers
129118
130119-- | Output series of comments.
131−
132−handleCommentSeries
133− :: (Maybe RealSrcSpan -> R (Maybe RealSrcSpan))
134− -- ^ Given location of previous comment, output the next comment
135− -- returning its location, or 'Nothing' if we are done
136− -> R ()
137−handleCommentSeries f = go Nothing
120+handleCommentSeries ::
121+ -- | Given location of previous comment, output the next comment
122+ -- returning 'True' if we're done
123+ R Bool ->
124+ -- | Whether we printed any comments
125+ R Bool
126+handleCommentSeries f = go False
138127 where
139− go mlastSpn = do
140− r <- f mlastSpn
141− case r of
142− Nothing -> return ()
143− Just spn -> go (Just spn)
128+ go gotSome = do
129+ done <- f
130+ if done
131+ then return gotSome
132+ else go True
144133
145134-- | Try to pop a comment using given predicate and if there is a comment
146135-- matching the predicate, print it out.
147−
148−withPoppedComment
149− :: (RealLocated Comment -> Bool) -- ^ Comment predicate
150− -> (RealSrcSpan -> Comment -> R ()) -- ^ Priting function
151− -> R (Maybe RealSrcSpan)
136+withPoppedComment ::
137+ -- | Comment predicate
138+ (RealLocated Comment -> Bool) ->
139+ -- | Printing function
140+ (RealSrcSpan -> Comment -> R ()) ->
141+ -- | Are we done?
142+ R Bool
152143withPoppedComment p f = do
153144 r <- popComment p
154145 case r of
155− Nothing -> return Nothing
156− Just (L l comment) -> Just l <$ f l comment
146+ Nothing -> return True
147+ Just (L l comment) -> False <$ f l comment
157148
158149-- | Determine if we need to insert a newline between current comment and
159150-- last printed comment.
160−
161−needsNewlineBefore
162− :: RealSrcSpan -- ^ Current comment span
163− -> Maybe RealSrcSpan -- ^ Last printed comment span
164− -> Bool
165−needsNewlineBefore l mlastSpn =
166− case mlastSpn of
151+needsNewlineBefore ::
152+ -- | Current comment span
153+ RealSrcSpan ->
154+ -- | Last printed comment span
155+ Maybe SpanMark ->
156+ Bool
157+needsNewlineBefore _ (Just (HaddockSpan _ _)) = True
158+needsNewlineBefore l mlastMark =
159+ case spanMarkSpan <$> mlastMark of
167160 Nothing -> False
168− Just lastSpn ->
169− srcSpanStartLine l > srcSpanEndLine lastSpn + 1
161+ Just lastMark ->
162+ srcSpanStartLine l > srcSpanEndLine lastMark + 1
170163
171164-- | Is the preceding comment and AST element are on the same line?
172−
173−theSameLinePre
174− :: RealSrcSpan -- ^ Current comment span
175− -> RealSrcSpan -- ^ AST element location
176− -> Bool
165+theSameLinePre ::
166+ -- | Current comment span
167+ RealSrcSpan ->
168+ -- | AST element location
169+ RealSrcSpan ->
170+ Bool
177171theSameLinePre l ref =
178172 srcSpanEndLine l == srcSpanStartLine ref
179173
180174-- | Is the following comment and AST element are on the same line?
181−
182−theSameLinePost
183− :: RealSrcSpan -- ^ Current comment span
184− -> RealSrcSpan -- ^ AST element location
185− -> Bool
175+theSameLinePost ::
176+ -- | Current comment span
177+ RealSrcSpan ->
178+ -- | AST element location
179+ RealSrcSpan ->
180+ Bool
186181theSameLinePost l ref =
187182 srcSpanStartLine l == srcSpanEndLine ref
188183
189184-- | Determine if given comment follows AST element.
190−
191−commentFollowsElt
192− :: RealSrcSpan -- ^ Location of AST element
193− -> Maybe RealSrcSpan -- ^ Location of next AST element
194− -> Maybe RealSrcSpan -- ^ Location of enclosing AST element
195− -> Maybe RealSrcSpan -- ^ Location of last comment in the series
196− -> RealLocated Comment -- ^ Comment to test
197− -> Bool
198−commentFollowsElt ref mnSpn meSpn mlastSpn (L l comment) =
185+commentFollowsElt ::
186+ -- | Location of AST element
187+ RealSrcSpan ->
188+ -- | Location of next AST element
189+ Maybe RealSrcSpan ->
190+ -- | Location of enclosing AST element
191+ Maybe RealSrcSpan ->
192+ -- | Location of last comment in the series
193+ Maybe SpanMark ->
194+ -- | Comment to test
195+ RealLocated Comment ->
196+ Bool
197+commentFollowsElt ref mnSpn meSpn mlastMark (L l comment) =
199198 -- A comment follows a AST element if all 4 conditions are satisfied:
200199 goesAfter
201200 && logicallyFollows
@@ -206,11 +205,10 @@ commentFollowsElt ref mnSpn meSpn mlastSpn (L l comment) =
206205 goesAfter =
207206 realSrcSpanStart l >= realSrcSpanEnd ref
208207 -- 2) The comment logically belongs to the element, four cases:
209− logicallyFollows
210− = theSameLinePost l ref -- a) it's on the same line
211− || isPrevHaddock comment -- b) it's a Haddock string starting with -- ^
212− || continuation -- c) it's a continuation of a comment block
213− || lastInEnclosing -- d) it's the last element in the enclosing construct
208+ logicallyFollows =
209+ theSameLinePost l ref -- a) it's on the same line
210+ || continuation -- b) it's a continuation of a comment block
211+ || lastInEnclosing -- c) it's the last element in the enclosing construct
214212
215213 -- 3) There is no other AST element between this element and the comment:
216214 noEltBetween =
@@ -232,15 +230,20 @@ commentFollowsElt ref mnSpn meSpn mlastSpn (L l comment) =
232230 Nothing -> True
233231 Just espn ->
234232 let startColumn = srcLocCol . realSrcSpanStart
235− in if startColumn espn > startColumn ref
236− then True
237− else abs (startColumn espn - startColumn l)
238− >= abs (startColumn ref - startColumn l)
233+ in startColumn espn > startColumn ref
234+ || ( abs (startColumn espn - startColumn l)
235+ >= abs (startColumn ref - startColumn l)
236+ )
239237 continuation =
240− case mlastSpn of
241− Nothing -> False
242− Just spn -> srcSpanEndLine spn + 1 == srcSpanStartLine l
243−
238+ -- A comment is a continuation when it doesn't have non-whitespace
239+ -- lexemes in front of it and goes right after the previous comment.
240+ not (hasAtomsBefore comment)
241+ && ( case mlastMark of
242+ Just (HaddockSpan _ _) -> False
243+ Just (CommentSpan spn) ->
244+ srcSpanEndLine spn + 1 == srcSpanStartLine l
245+ _ -> False
246+ )
244247 lastInEnclosing =
245248 case meSpn of
246249 -- When there is no enclosing element, return false
@@ -255,8 +258,29 @@ commentFollowsElt ref mnSpn meSpn mlastSpn (L l comment) =
255258 Just nspn -> realSrcSpanEnd espn < realSrcSpanStart nspn
256259 in insideParent && nextOutsideParent
257260
258−-- | Output a 'Comment'. This is a low-level printing function.
259−
260−spitComment :: Comment -> R ()
261−spitComment =
262− sitcc . sequence_ . NE.intersperse newline . fmap (txt . T.pack) . coerce
261+-- | Output a 'Comment' immediately. This is a low-level printing function.
262+spitCommentNow :: RealSrcSpan -> Comment -> R ()
263+spitCommentNow spn comment = do
264+ sitcc
265+ . sequence_
266+ . NE.intersperse newline
267+ . fmap (txt . T.pack)
268+ . unComment
269+ $ comment
270+ setSpanMark (CommentSpan spn)
271+
272+-- | Output a 'Comment' at the end of correct line or after it depending on
273+-- 'CommentPosition'. Used for comments that may potentially follow on the
274+-- same line as something we just rendered, but not immediately after it.
275+spitCommentPending :: CommentPosition -> RealSrcSpan -> Comment -> R ()
276+spitCommentPending position spn comment = do
277+ let wrapper = case position of
278+ OnTheSameLine -> sitcc
279+ OnNextLine -> id
280+ wrapper
281+ . sequence_
282+ . NE.toList
283+ . fmap (registerPendingCommentLine position . T.pack)
284+ . unComment
285+ $ comment
286+ setSpanMark (CommentSpan spn)
src/Ormolu/Printer/Internal.hs+410−293
@@ -1,45 +1,55 @@
11{-# LANGUAGE GeneralizedNewtypeDeriving #-}
2−{-# LANGUAGE LambdaCase #-}
3−{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE RankNTypes #-}
2+{-# LANGUAGE LambdaCase #-}
3+{-# LANGUAGE OverloadedStrings #-}
4+{-# LANGUAGE RankNTypes #-}
55
66-- | In most cases import "Ormolu.Printer.Combinators" instead, these
77-- functions are the low-level building blocks and should not be used on
88-- their own. The 'R' monad is re-exported from "Ormolu.Printer.Combinators"
99-- as well.
10−
1110module Ormolu.Printer.Internal
1211 ( -- * The 'R' monad
13− R
14− , runR
12+ R,
13+ runR,
14+
1515 -- * Internal functions
16− , txt
17− , atom
18− , space
19− , newline
20− , modNewline
21− , isNewlineModified
22− , isLineDirty
23− , inci
24− , sitcc
25− , Layout (..)
26− , enterLayout
27− , vlayout
16+ txt,
17+ interferingTxt,
18+ atom,
19+ space,
20+ newline,
21+ useRecordDot,
22+ inci,
23+ sitcc,
24+ Layout (..),
25+ enterLayout,
26+ vlayout,
27+ getLayout,
28+
2829 -- * Helpers for braces
29− , useBraces
30− , dontUseBraces
31− , canUseBraces
30+ useBraces,
31+ dontUseBraces,
32+ canUseBraces,
33+
3234 -- * Special helpers for comment placement
33− , trimSpanStream
34− , nextEltSpan
35− , popComment
36− , hasMoreComments
37− , getIndent
38− , setIndent
39− , getEnclosingSpan
40− , withEnclosingSpan
35+ CommentPosition (..),
36+ registerPendingCommentLine,
37+ trimSpanStream,
38+ nextEltSpan,
39+ popComment,
40+ getEnclosingSpan,
41+ withEnclosingSpan,
42+ thisLineSpans,
43+
44+ -- * Stateful markers
45+ SpanMark (..),
46+ spanMarkSpan,
47+ HaddockStyle (..),
48+ setSpanMark,
49+ getSpanMark,
50+
4151 -- * Annotations
42− , getAnns
52+ getAnns,
4353 )
4454where
4555
@@ -47,106 +57,156 @@ import Control.Monad.Reader
4757import Control.Monad.State.Strict
4858import Data.Bool (bool)
4959import Data.Coerce
50−import Data.Maybe (fromMaybe, isJust, listToMaybe)
60+import Data.Maybe (listToMaybe)
5161import Data.Text (Text)
62+import qualified Data.Text as T
63+import qualified Data.Text.Lazy as TL
5264import Data.Text.Lazy.Builder
53−import Debug.Trace
5465import GHC
5566import Ormolu.Parser.Anns
5667import Ormolu.Parser.CommentStream
5768import Ormolu.Printer.SpanStream
5869import Ormolu.Utils (showOutputable)
5970import Outputable (Outputable)
60−import SrcLoc
61−import qualified Data.Text as T
62−import qualified Data.Text.Lazy as TL
6371
6472----------------------------------------------------------------------------
6573-- The 'R' monad
6674
6775-- | The 'R' monad hosts combinators that allow us to describe how to render
6876-- AST.
69−
7077newtype R a = R (ReaderT RC (State SC) a)
7178 deriving (Functor, Applicative, Monad)
7279
73−-- | Reader context of 'R'.
74−
80+-- | Reader context of 'R'. This should be used when we control rendering by
81+-- enclosing certain expressions with wrappers.
7582data RC = RC
76− { rcIndent :: !Int
77− -- ^ Indentation level, as the column index we need to start from after a
78− -- newline if we break lines
79− , rcLayout :: Layout
80− -- ^ Current layout
81− , rcDebug :: Bool
82− -- ^ Whether to print debugging info as we go
83− , rcEnclosingSpans :: [RealSrcSpan]
84− -- ^ Spans of enclosing elements of AST
85− , rcAnns :: Anns
86− -- ^ Collection of annotations
87− , rcCanUseBraces :: Bool
88− -- ^ If the last expression in the layout can use braces
83+ { -- | Indentation level, as the column index we need to start from after
84+ -- a newline if we break lines
85+ rcIndent :: !Int,
86+ -- | Current layout
87+ rcLayout :: Layout,
88+ -- | Spans of enclosing elements of AST
89+ rcEnclosingSpans :: [RealSrcSpan],
90+ -- | Collection of annotations
91+ rcAnns :: Anns,
92+ -- | Whether the last expression in the layout can use braces
93+ rcCanUseBraces :: Bool,
94+ -- | Whether the source could have used the record dot preprocessor
95+ rcUseRecDot :: Bool
8996 }
9097
9198-- | State context of 'R'.
92−
9399data SC = SC
94− { scColumn :: !Int
95− -- ^ Index of the next column to render
96− , scBuilder :: Builder
97− -- ^ Rendered source code so far
98− , scSpanStream :: SpanStream
99− -- ^ Span stream
100− , scCommentStream :: CommentStream
101− -- ^ Comment stream
102− , scNewline :: Maybe (R ())
103− -- ^ What to render as newline, or 'Nothing' ('newlineRaw' will be used)
104− , scDirtyLine :: !Bool
105− -- ^ Whether the current line is “dirty”
106− , scSpace :: !Bool
107− -- ^ Whether to output a space before the next output
100+ { -- | Index of the next column to render
101+ scColumn :: !Int,
102+ -- | Indentation level that was used for the current line
103+ scIndent :: !Int,
104+ -- | Rendered source code so far
105+ scBuilder :: Builder,
106+ -- | Span stream
107+ scSpanStream :: SpanStream,
108+ -- | Spans of atoms that have been printed on the current line so far
109+ scThisLineSpans :: [RealSrcSpan],
110+ -- | Comment stream
111+ scCommentStream :: CommentStream,
112+ -- | Pending comment lines (in reverse order) to be inserted before next
113+ -- newline, 'Int' is the indentation level
114+ scPendingComments :: ![(CommentPosition, Text)],
115+ -- | Whether to output a space before the next output
116+ scRequestedDelimiter :: !RequestedDelimiter,
117+ -- | An auxiliary marker for keeping track of last output element
118+ scSpanMark :: !(Maybe SpanMark)
108119 }
109120
110−-- | 'Layout' options.
121+-- | Make sure next output is delimited by one of the following.
122+data RequestedDelimiter
123+ = -- | A space
124+ RequestedSpace
125+ | -- | A newline
126+ RequestedNewline
127+ | -- | Nothing
128+ RequestedNothing
129+ | -- | We just output a newline
130+ AfterNewline
131+ | -- | We haven't printed anything yet
132+ VeryBeginning
133+ deriving (Eq, Show)
111134
135+-- | 'Layout' options.
112136data Layout
113− = SingleLine -- ^ Put everything on single line
114− | MultiLine -- ^ Use multiple lines
137+ = -- | Put everything on single line
138+ SingleLine
139+ | -- | Use multiple lines
140+ MultiLine
115141 deriving (Eq, Show)
116142
117−-- | Run an 'R' monad.
143+-- | Modes for rendering of pending comments.
144+data CommentPosition
145+ = -- | Put the comment on the same line
146+ OnTheSameLine
147+ | -- | Put the comment on next line
148+ OnNextLine
149+ deriving (Eq, Show)
118150
119−runR
120− :: Bool -- ^ Whether to print debugging info
121− -> R () -- ^ Monad to run
122− -> SpanStream -- ^ Span stream
123− -> CommentStream -- ^ Comment stream
124− -> Anns -- ^ Annotations
125− -> Text -- ^ Resulting rendition
126−runR debug (R m) sstream cstream anns =
151+-- | Run an 'R' monad.
152+runR ::
153+ -- | Monad to run
154+ R () ->
155+ -- | Span stream
156+ SpanStream ->
157+ -- | Comment stream
158+ CommentStream ->
159+ -- | Annotations
160+ Anns ->
161+ -- | Use Record Dot Syntax
162+ Bool ->
163+ -- | Resulting rendition
164+ Text
165+runR (R m) sstream cstream anns recDot =
127166 TL.toStrict . toLazyText . scBuilder $ execState (runReaderT m rc) sc
128167 where
129− rc = RC
130− { rcIndent = 0
131− , rcLayout = MultiLine
132− , rcDebug = debug
133− , rcEnclosingSpans = []
134− , rcAnns = anns
135− , rcCanUseBraces = False
136− }
137− sc = SC
138− { scColumn = 0
139− , scBuilder = mempty
140− , scSpanStream = sstream
141− , scCommentStream = cstream
142− , scNewline = Nothing
143− , scDirtyLine = False
144− , scSpace = False
145− }
168+ rc =
169+ RC
170+ { rcIndent = 0,
171+ rcLayout = MultiLine,
172+ rcEnclosingSpans = [],
173+ rcAnns = anns,
174+ rcCanUseBraces = False,
175+ rcUseRecDot = recDot
176+ }
177+ sc =
178+ SC
179+ { scColumn = 0,
180+ scIndent = 0,
181+ scBuilder = mempty,
182+ scSpanStream = sstream,
183+ scThisLineSpans = [],
184+ scCommentStream = cstream,
185+ scPendingComments = [],
186+ scRequestedDelimiter = VeryBeginning,
187+ scSpanMark = Nothing
188+ }
146189
147190----------------------------------------------------------------------------
148191-- Internal functions
149192
193+-- | Type of the thing to output. Influences the primary low-level rendering
194+-- function 'spit'.
195+data SpitType
196+ = -- | Simple opaque text that breaks comment series.
197+ SimpleText
198+ | -- | Like 'SimpleText', but assume that when this text is inserted it
199+ -- will separate an 'Atom' and its pending comments, so insert an extra
200+ -- 'newline' in that case to force the pending comments and continue on
201+ -- a fresh line.
202+ InterferingText
203+ | -- | An atom that typically have span information in the AST and can
204+ -- have comments attached to it.
205+ Atom
206+ | -- | Used for rendering comment lines.
207+ CommentPart
208+ deriving (Show, Eq)
209+
150210-- | Output a fixed 'Text' fragment. The argument may not contain any line
151211-- breaks. 'txt' is used to output all sorts of “fixed” bits of syntax like
152212-- keywords and pipes @|@ in functional dependencies.
@@ -154,42 +214,84 @@ runR debug (R m) sstream cstream anns =
154214-- To separate various bits of syntax with white space use 'space' instead
155215-- of @'txt' " "@. To output 'Outputable' Haskell entities like numbers use
156216-- 'atom'.
157−
158−txt
159− :: Text -- ^ 'Text' to output
160− -> R ()
161−txt = spit False
217+txt ::
218+ -- | 'Text' to output
219+ Text ->
220+ R ()
221+txt = spit SimpleText
222+
223+-- | Similar to 'txt' but the text inserted this way is assumed to break the
224+-- “link” between the preceding atom and its pending comments.
225+interferingTxt ::
226+ -- | 'Text' to output
227+ Text ->
228+ R ()
229+interferingTxt = spit InterferingText
162230
163231-- | Output 'Outputable' fragment of AST. This can be used to output numeric
164232-- literals and similar. Everything that doesn't have inner structure but
165233-- does have an 'Outputable' instance.
166−
167−atom
168− :: Outputable a
169− => a
170− -> R ()
171−atom = spit True . T.pack . showOutputable
234+atom ::
235+ Outputable a =>
236+ a ->
237+ R ()
238+atom = spit Atom . T.pack . showOutputable
172239
173240-- | Low-level non-public helper to define 'txt' and 'atom'.
174−
175−spit :: Bool -> Text -> R ()
176−spit dirty x' = do
177− i <- R (asks rcIndent)
178− c <- R (gets scColumn)
179− needsSpace <- R (gets scSpace)
180− let spaces =
181− if (c < i)
182− then T.replicate (i - c) " "
183− else bool mempty " " needsSpace
184− x = spaces <> x'
185− traceR "spit_before" (Just x)
186− R . modify $ \sc -> sc
187− { scBuilder = scBuilder sc <> fromText x
188− , scColumn = scColumn sc + T.length x
189− , scDirtyLine = scDirtyLine sc || dirty
190− , scSpace = False
191− }
192− traceR "spit_after" Nothing
241+spit ::
242+ -- | Type of the thing to spit
243+ SpitType ->
244+ -- | 'Text' to output
245+ Text ->
246+ R ()
247+spit _ "" = return ()
248+spit stype text = do
249+ requestedDel <- R (gets scRequestedDelimiter)
250+ pendingComments <- R (gets scPendingComments)
251+ when (stype == InterferingText && not (null pendingComments)) newline
252+ case requestedDel of
253+ RequestedNewline -> do
254+ R . modify $ \sc ->
255+ sc
256+ { scRequestedDelimiter = RequestedNothing
257+ }
258+ case stype of
259+ CommentPart -> newlineRaw
260+ _ -> newline
261+ _ -> return ()
262+ R $ do
263+ i <- asks rcIndent
264+ c <- gets scColumn
265+ closestEnclosing <- listToMaybe <$> asks rcEnclosingSpans
266+ let indentedTxt = spaces <> text
267+ spaces = T.replicate spacesN " "
268+ spacesN =
269+ if c == 0
270+ then i
271+ else bool 0 1 (requestedDel == RequestedSpace)
272+ modify $ \sc ->
273+ sc
274+ { scBuilder = scBuilder sc <> fromText indentedTxt,
275+ scColumn = scColumn sc + T.length indentedTxt,
276+ scIndent =
277+ if c == 0
278+ then i
279+ else scIndent sc,
280+ scThisLineSpans =
281+ let xs = scThisLineSpans sc
282+ in case stype of
283+ Atom -> case closestEnclosing of
284+ Nothing -> xs
285+ Just x -> x : xs
286+ _ -> xs,
287+ scRequestedDelimiter = RequestedNothing,
288+ scSpanMark =
289+ -- If there are pending comments, do not reset last comment
290+ -- location.
291+ if (stype == CommentPart) || (not . null . scPendingComments) sc
292+ then scSpanMark sc
293+ else Nothing
294+ }
193295
194296-- | This primitive /does not/ necessarily output a space. It just ensures
195297-- that the next thing that will be printed on the same line will be
@@ -199,262 +301,277 @@ spit dirty x' = do
199301-- In practice this design prevents trailing white space and makes it hard
200302-- to output more than one delimiting space in a row, which is what we
201303-- usually want.
202−
203304space :: R ()
204−space = R . modify $ \sc -> sc
205− { scSpace = True
206− }
207−
208−-- | Output a newline.
305+space = R . modify $ \sc ->
306+ sc
307+ { scRequestedDelimiter = case scRequestedDelimiter sc of
308+ RequestedNothing -> RequestedSpace
309+ other -> other
310+ }
209311
312+-- | Output a newline. First time 'newline' is used after some non-'newline'
313+-- output it gets inserted immediately. Second use of 'newline' does not
314+-- output anything but makes sure that the next non-white space output will
315+-- be prefixed by a newline. Using 'newline' more than twice in a row has no
316+-- effect. Also, using 'newline' at the very beginning has no effect, this
317+-- is to avoid leading whitespace.
318+--
319+-- Similarly to 'space', this design prevents trailing newlines and makes it
320+-- hard to output more than one blank newline in a row.
210321newline :: R ()
211322newline = do
212− n <- R (gets scNewline)
213− R . modify $ \sc -> sc
214− { scNewline = Nothing
215− }
216− fromMaybe newlineRaw n
323+ indent <- R (gets scIndent)
324+ cs <- reverse <$> R (gets scPendingComments)
325+ case cs of
326+ [] -> newlineRaw
327+ ((position, _) : _) -> do
328+ case position of
329+ OnTheSameLine -> space
330+ OnNextLine -> newlineRaw
331+ R . forM_ cs $ \(_, text) ->
332+ let modRC rc =
333+ rc
334+ { rcIndent = indent
335+ }
336+ R m = do
337+ unless (T.null text) $
338+ spit CommentPart text
339+ newlineRaw
340+ in local modRC m
341+ R . modify $ \sc ->
342+ sc
343+ { scPendingComments = []
344+ }
217345
218346-- | Low-level newline primitive. This one always just inserts a newline, no
219347-- hooks can be attached.
220−
221348newlineRaw :: R ()
222−newlineRaw = do
223− traceR "newline_before" (Just "\n")
224− R . modify $ \sc -> sc
225− { scBuilder = scBuilder sc <> "\n"
226− , scColumn = 0
227− , scDirtyLine = False
228− , scSpace = False
229− }
230− traceR "newline_after" Nothing
231−
232−-- | The 'modNewline' function can be used to alter what will be inserted as
233−-- a newline. This is used to output comments following an element of AST
234−-- because we cannot output comments immediately, e.g. because we need to
235−-- close parentheses first, etc.
236−--
237−-- 'newline' auto-resets its modifications so the changes introduced with
238−-- 'modNewline' only have effect once.
239−--
240−-- The argument of the call-back is the version of 'newline' built so far.
241−
242−modNewline :: (R () -> R ()) -> R ()
243−modNewline f = R $ do
244− old <- gets scNewline
245− modify $ \sc -> sc
246− { scNewline = Just $ f (fromMaybe newlineRaw old)
247− }
248−
249−-- | Check if newline is in modified state.
250−
251−isNewlineModified :: R Bool
252−isNewlineModified = isJust <$> R (gets scNewline)
253−
254−-- | Check if the current line is “dirty”, that is, there is something on it
255−-- that can have comments attached to it.
349+newlineRaw = R . modify $ \sc ->
350+ let requestedDel = scRequestedDelimiter sc
351+ builderSoFar = scBuilder sc
352+ in sc
353+ { scBuilder = case requestedDel of
354+ AfterNewline -> builderSoFar
355+ RequestedNewline -> builderSoFar
356+ VeryBeginning -> builderSoFar
357+ _ -> builderSoFar <> "\n",
358+ scColumn = 0,
359+ scIndent = 0,
360+ scThisLineSpans = [],
361+ scRequestedDelimiter = case scRequestedDelimiter sc of
362+ AfterNewline -> RequestedNewline
363+ RequestedNewline -> RequestedNewline
364+ VeryBeginning -> VeryBeginning
365+ _ -> AfterNewline
366+ }
256367
257−isLineDirty :: R Bool
258−isLineDirty = R (gets scDirtyLine)
368+-- | Return 'True' if we should print record dot syntax.
369+useRecordDot :: R Bool
370+useRecordDot = R (asks rcUseRecDot)
259371
260372-- | Increase indentation level by one indentation step for the inner
261373-- computation. 'inci' should be used when a part of code must be more
262374-- indented relative to the parts outside of 'inci' in order for the output
263375-- to be valid Haskell. When layout is single-line there is no obvious
264376-- effect, but with multi-line layout correct indentation levels matter.
265−
266377inci :: R () -> R ()
267−inci m' = do
268− traceR "inci_before" Nothing
269− let R m = traceR "inci_inside" Nothing >> m'
270− modRC rc = rc
378+inci (R m) = R (local modRC m)
379+ where
380+ modRC rc =
381+ rc
271382 { rcIndent = rcIndent rc + indentStep
272383 }
273− R (local modRC m)
274− traceR "inci_ended" Nothing
275384
276385-- | Set indentation level for the inner computation equal to current
277386-- column. This makes sure that the entire inner block is uniformly
278−-- \"shifted\" to the right. Only works (and makes sense) when enclosing
279−-- layout is multi-line.
280−
387+-- \"shifted\" to the right.
281388sitcc :: R () -> R ()
282−sitcc m' = do
283− traceR "sitcc_before" Nothing
389+sitcc (R m) = do
390+ requestedDel <- R (gets scRequestedDelimiter)
284391 i <- R (asks rcIndent)
285392 c <- R (gets scColumn)
286− needsSpace <- R (gets scSpace)
287− let R m = traceR "sitcc_inside" Nothing >> m'
288− modRC rc = rc
289− { rcIndent = max i c + bool 0 1 needsSpace
290− }
291− vlayout m' . R $ do
292− modify $ \sc -> sc { scSpace = False }
293− local modRC m
294− traceR "sitcc_ended" Nothing
393+ let modRC rc =
394+ rc
395+ { rcIndent = max i (c + bool 0 1 (requestedDel == RequestedSpace))
396+ }
397+ R (local modRC m)
295398
296399-- | Set 'Layout' for internal computation.
297−
298400enterLayout :: Layout -> R () -> R ()
299−enterLayout l (R m) = do
300− let label =
301− case l of
302− SingleLine -> "single_line"
303− MultiLine -> "multi_line"
304− traceR ("lstart_" ++ label) Nothing
305− let modRC rc = rc
401+enterLayout l (R m) = R (local modRC m)
402+ where
403+ modRC rc =
404+ rc
306405 { rcLayout = l
307406 }
308− x <- R (local modRC m)
309− traceR ("lend_" ++ label) Nothing
310− return x
311407
312408-- | Do one or another thing depending on current 'Layout'.
313−
314−vlayout
315− :: R a -- ^ Single line
316− -> R a -- ^ Multi line
317− -> R a
409+vlayout ::
410+ -- | Single line
411+ R a ->
412+ -- | Multi line
413+ R a ->
414+ R a
318415vlayout sline mline = do
319− l <- R (asks rcLayout)
416+ l <- getLayout
320417 case l of
321418 SingleLine -> sline
322419 MultiLine -> mline
323420
421+-- | Get current 'Layout'.
422+getLayout :: R Layout
423+getLayout = R (asks rcLayout)
424+
324425----------------------------------------------------------------------------
325426-- Special helpers for comment placement
326427
428+-- | Register a comment line for outputting. It will be inserted right
429+-- before next newline. When the comment goes after something else on the
430+-- same line, a space will be inserted between preceding text and the
431+-- comment when necessary.
432+registerPendingCommentLine ::
433+ -- | Comment position
434+ CommentPosition ->
435+ -- | 'Text' to output
436+ Text ->
437+ R ()
438+registerPendingCommentLine position text = R $ do
439+ modify $ \sc ->
440+ sc
441+ { scPendingComments = (position, text) : scPendingComments sc
442+ }
443+
327444-- | Drop elements that begin before or at the same place as given
328445-- 'SrcSpan'.
329−
330−trimSpanStream
331− :: RealSrcSpan -- ^ Reference span
332− -> R ()
446+trimSpanStream ::
447+ -- | Reference span
448+ RealSrcSpan ->
449+ R ()
333450trimSpanStream ref = do
334451 let leRef :: RealSrcSpan -> Bool
335452 leRef x = realSrcSpanStart x <= realSrcSpanStart ref
336− R . modify $ \sc -> sc
337− { scSpanStream = coerce (dropWhile leRef) (scSpanStream sc)
338− }
453+ R . modify $ \sc ->
454+ sc
455+ { scSpanStream = coerce (dropWhile leRef) (scSpanStream sc)
456+ }
339457
340458-- | Get location of next element in AST.
341−
342459nextEltSpan :: R (Maybe RealSrcSpan)
343460nextEltSpan = listToMaybe . coerce <$> R (gets scSpanStream)
344461
345462-- | Pop a 'Comment' from the 'CommentStream' if given predicate is
346463-- satisfied and there are comments in the stream.
347−
348−popComment
349− :: (RealLocated Comment -> Bool)
350− -> R (Maybe (RealLocated Comment))
464+popComment ::
465+ (RealLocated Comment -> Bool) ->
466+ R (Maybe (RealLocated Comment))
351467popComment f = R $ do
352468 CommentStream cstream <- gets scCommentStream
353469 case cstream of
354470 [] -> return Nothing
355− (x:xs) ->
471+ (x : xs) ->
356472 if f x
357− then Just x <$ modify (\sc -> sc
358− { scCommentStream = CommentStream xs
359− })
473+ then
474+ Just x
475+ <$ modify
476+ ( \sc ->
477+ sc
478+ { scCommentStream = CommentStream xs
479+ }
480+ )
360481 else return Nothing
361482
362−-- | Return 'True' if there are more comments in the 'CommentStream'.
363−
364−hasMoreComments :: R Bool
365−hasMoreComments = R $ do
366− CommentStream cstream <- gets scCommentStream
367− (return . not . null) cstream
368−
369−-- | Current indentation level.
370−
371−getIndent :: R Int
372−getIndent = R (asks rcIndent)
373−
374−-- | Set indentation level for the given computation.
375−
376−setIndent :: Int -> R () -> R ()
377−setIndent i m' = do
378− traceR "set_indent_before" Nothing
379− let R m = traceR "set_indent_inside" Nothing >> m'
380− modRC rc = rc
381− { rcIndent = i
382− }
383− R (local modRC m)
384− traceR "set_indent_after" Nothing
385−
386483-- | Get the first enclosing 'RealSrcSpan' that satisfies given predicate.
387−
388−getEnclosingSpan
389− :: (RealSrcSpan -> Bool) -- ^ Predicate to use
390− -> R (Maybe RealSrcSpan)
484+getEnclosingSpan ::
485+ -- | Predicate to use
486+ (RealSrcSpan -> Bool) ->
487+ R (Maybe RealSrcSpan)
391488getEnclosingSpan f =
392489 listToMaybe . filter f <$> R (asks rcEnclosingSpans)
393490
394491-- | Set 'RealSrcSpan' of enclosing span for the given computation.
395−
396492withEnclosingSpan :: RealSrcSpan -> R () -> R ()
397−withEnclosingSpan spn (R m) = do
398− let modRC rc = rc
493+withEnclosingSpan spn (R m) = R (local modRC m)
494+ where
495+ modRC rc =
496+ rc
399497 { rcEnclosingSpans = spn : rcEnclosingSpans rc
400498 }
401− R (local modRC m)
499+
500+-- | Get spans on this line so far.
501+thisLineSpans :: R [RealSrcSpan]
502+thisLineSpans = R (gets scThisLineSpans)
503+
504+----------------------------------------------------------------------------
505+-- Stateful markers
506+
507+-- | An auxiliary marker for keeping track of last output element.
508+data SpanMark
509+ = -- | Haddock comment
510+ HaddockSpan HaddockStyle RealSrcSpan
511+ | -- | Non-haddock comment
512+ CommentSpan RealSrcSpan
513+ | -- | A statement in a do-block and such span
514+ StatementSpan RealSrcSpan
515+
516+-- | Project 'RealSrcSpan' from 'SpanMark'.
517+spanMarkSpan :: SpanMark -> RealSrcSpan
518+spanMarkSpan = \case
519+ HaddockSpan _ s -> s
520+ CommentSpan s -> s
521+ StatementSpan s -> s
522+
523+-- | Haddock string style.
524+data HaddockStyle
525+ = -- | @-- |@
526+ Pipe
527+ | -- | @-- ^@
528+ Caret
529+ | -- | @-- *@
530+ Asterisk Int
531+ | -- | @-- $@
532+ Named String
533+
534+-- | Set span of last output comment.
535+setSpanMark ::
536+ -- | Span mark to set
537+ SpanMark ->
538+ R ()
539+setSpanMark spnMark = R . modify $ \sc ->
540+ sc
541+ { scSpanMark = Just spnMark
542+ }
543+
544+-- | Get span of last output comment.
545+getSpanMark :: R (Maybe SpanMark)
546+getSpanMark = R (gets scSpanMark)
402547
403548----------------------------------------------------------------------------
404549-- Annotations
405550
406551-- | For a given span return 'AnnKeywordId's associated with it.
407−
408−getAnns
409− :: SrcSpan
410− -> R [AnnKeywordId]
552+getAnns ::
553+ SrcSpan ->
554+ R [AnnKeywordId]
411555getAnns spn = lookupAnns spn <$> R (asks rcAnns)
412556
413557----------------------------------------------------------------------------
414558-- Helpers for braces
415559
416560-- | Make the inner computation use braces around single-line layouts.
417−
418561useBraces :: R () -> R ()
419−useBraces (R r) = R (local (\i -> i {rcCanUseBraces = True}) r)
562+useBraces (R r) = R (local (\i -> i {rcCanUseBraces = True}) r)
420563
421564-- | Make the inner computation omit braces around single-line layouts.
422−
423565dontUseBraces :: R () -> R ()
424−dontUseBraces (R r) = R (local (\i -> i {rcCanUseBraces = False}) r)
566+dontUseBraces (R r) = R (local (\i -> i {rcCanUseBraces = False}) r)
425567
426568-- | Return 'True' if we can use braces in this context.
427−
428569canUseBraces :: R Bool
429−canUseBraces = R $ asks rcCanUseBraces
430−
431−----------------------------------------------------------------------------
432−-- Debug helpers
433−
434−-- | Tracing helper.
435−
436−traceR
437− :: String -- ^ Label
438− -> Maybe Text -- ^ Output, if any
439− -> R ()
440−traceR label moutput = R $ do
441− debug <- asks rcDebug
442− i <- asks rcIndent
443− c <- gets scColumn
444− when debug . traceM . concat $
445− [ replicate i ' '
446− , unwords [ label ++ ":"
447− , "i=" ++ show i
448− , "c=" ++ show c
449− ]
450− ] ++ case moutput of
451− Nothing -> []
452− Just output -> [" out=" ++ show output]
570+canUseBraces = R (asks rcCanUseBraces)
453571
454572----------------------------------------------------------------------------
455573-- Constants
456574
457575-- | Indentation step.
458−
459576indentStep :: Int
460577indentStep = 2
src/Ormolu/Printer/Meat/Common.hs+85−41
@@ -1,32 +1,35 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
33
44-- | Rendering of commonly useful bits.
5−
65module Ormolu.Printer.Meat.Common
7− ( FamilyStyle (..)
8− , p_hsmodName
9− , p_ieWrappedName
10− , p_rdrName
11− , doesNotNeedExtraParens
12− , p_qualName
13− , p_infixDefHelper
6+ ( FamilyStyle (..),
7+ p_hsmodName,
8+ p_ieWrappedName,
9+ p_rdrName,
10+ doesNotNeedExtraParens,
11+ p_qualName,
12+ p_infixDefHelper,
13+ p_hsDocString,
14+ p_hsDocName,
1415 )
1516where
1617
1718import Control.Monad
1819import Data.List (isPrefixOf)
20+import qualified Data.Text as T
1921import GHC hiding (GhcPs, IE)
2022import Name (nameStableString)
2123import OccName (OccName (..))
2224import Ormolu.Printer.Combinators
23−import RdrName (RdrName (..))
25+import Ormolu.Utils
2426
2527-- | Data and type family style.
26−
2728data FamilyStyle
28− = Associated -- ^ Declarations in type classes
29− | Free -- ^ Top-level declarations
29+ = -- | Declarations in type classes
30+ Associated
31+ | -- | Top-level declarations
32+ Free
3033
3134p_hsmodName :: ModuleName -> R ()
3235p_hsmodName mname = do
@@ -47,7 +50,6 @@ p_ieWrappedName = \case
4750 p_rdrName x
4851
4952-- | Render a @'Located' 'RdrName'@.
50−
5153p_rdrName :: Located RdrName -> R ()
5254p_rdrName l@(L spn _) = located l $ \x -> do
5355 ids <- getAnns spn
@@ -57,14 +59,14 @@ p_rdrName l@(L spn _) = located l $ \x -> do
5759 else id
5860 parensWrapper =
5961 if AnnOpenP `elem` ids
60− then parens
62+ then parens N
6163 else id
6264 singleQuoteWrapper =
6365 if AnnSimpleQuote `elem` ids
6466 then \y -> do
65− txt "'"
66− y
67− else id
67+ txt "'"
68+ y
69+ else id
6870 m =
6971 case x of
7072 Unqual occName ->
@@ -72,10 +74,10 @@ p_rdrName l@(L spn _) = located l $ \x -> do
7274 Qual mname occName ->
7375 p_qualName mname occName
7476 Orig _ occName ->
75− -- NOTE This is used when GHC generates code that will be fed
76− -- into the renamer (e.g. from deriving clauses), but where we
77− -- want to say that something comes from given module which is
78− -- not specified in the source code, e.g. @Prelude.map@.
77+ -- This is used when GHC generates code that will be fed into
78+ -- the renamer (e.g. from deriving clauses), but where we want
79+ -- to say that something comes from given module which is not
80+ -- specified in the source code, e.g. @Prelude.map@.
7981 --
8082 -- My current understanding is that the provided module name
8183 -- serves no purpose for us and can be safely ignored.
@@ -91,16 +93,15 @@ p_rdrName l@(L spn _) = located l $ \x -> do
9193-- to detect e.g. tuples for which annotations will indicate parentheses,
9294-- but the parentheses are already part of the symbol, so no extra layer of
9395-- parentheses should be added. It also detects the [] literal.
94−
9596doesNotNeedExtraParens :: RdrName -> Bool
9697doesNotNeedExtraParens = \case
9798 Exact name ->
9899 let s = nameStableString name
99− -- NOTE I'm not sure this "stable string" is stable enough, but it looks
100− -- like this is the most robust way to tell if we're looking at exactly
101− -- this piece of built-in syntax.
102− in ("$ghc-prim$GHC.Tuple$" `isPrefixOf` s) ||
103− ("$ghc-prim$GHC.Types$[]" `isPrefixOf` s)
100+ in -- I'm not sure this "stable string" is stable enough, but it looks
101+ -- like this is the most robust way to tell if we're looking at
102+ -- exactly this piece of built-in syntax.
103+ ("$ghc-prim$GHC.Tuple$" `isPrefixOf` s)
104+ || ("$ghc-prim$GHC.Types$[]" `isPrefixOf` s)
104105 _ -> False
105106
106107p_qualName :: ModuleName -> OccName -> R ()
@@ -110,32 +111,75 @@ p_qualName mname occName = do
110111 atom occName
111112
112113-- | A helper for formatting infix constructions in lhs of definitions.
113−
114−p_infixDefHelper
115− :: Bool -- ^ Whether to format in infix style
116− -> (R () -> R ()) -- ^ Indentation-bumping wrapper
117− -> R () -- ^ How to print the operator\/name
118− -> [R ()] -- ^ How to print the arguments
119− -> R ()
120−p_infixDefHelper isInfix inci' name args =
114+p_infixDefHelper ::
115+ -- | Whether to format in infix style
116+ Bool ->
117+ -- | Whether to bump indentation for arguments
118+ Bool ->
119+ -- | How to print the operator\/name
120+ R () ->
121+ -- | How to print the arguments
122+ [R ()] ->
123+ R ()
124+p_infixDefHelper isInfix indentArgs name args =
121125 case (isInfix, args) of
122− (True, p0:p1:ps) -> do
126+ (True, p0 : p1 : ps) -> do
123127 let parens' =
124128 if null ps
125129 then id
126− else parens
130+ else parens N
127131 parens' $ do
128132 p0
129133 breakpoint
130− inci $ sitcc $ do
134+ inci . sitcc $ do
131135 name
132136 space
133137 p1
134− unless (null ps) . inci' $ do
138+ unless (null ps) . inciIf indentArgs $ do
135139 breakpoint
136140 sitcc (sep breakpoint sitcc ps)
137141 (_, ps) -> do
138142 name
139143 unless (null ps) $ do
140144 breakpoint
141− inci' $ sitcc (sep breakpoint sitcc args)
145+ inciIf indentArgs $ sitcc (sep breakpoint sitcc args)
146+
147+-- | Print a Haddock.
148+p_hsDocString ::
149+ -- | Haddock style
150+ HaddockStyle ->
151+ -- | Finish the doc string with a newline
152+ Bool ->
153+ -- | The doc string to render
154+ LHsDocString ->
155+ R ()
156+p_hsDocString hstyle needsNewline (L l str) = do
157+ let isCommentSpan = \case
158+ HaddockSpan _ _ -> True
159+ CommentSpan _ -> True
160+ _ -> False
161+ goesAfterComment <- maybe False isCommentSpan <$> getSpanMark
162+ -- Make sure the Haddock is separated by a newline from other comments.
163+ when goesAfterComment newline
164+ forM_ (zip (splitDocString str) (True : repeat False)) $ \(x, isFirst) -> do
165+ if isFirst
166+ then case hstyle of
167+ Pipe -> txt "-- |"
168+ Caret -> txt "-- ^"
169+ Asterisk n -> txt ("-- " <> T.replicate n "*")
170+ Named name -> p_hsDocName name
171+ else newline >> txt "--"
172+ space
173+ unless (T.null x) (txt x)
174+ when needsNewline newline
175+ case l of
176+ UnhelpfulSpan _ ->
177+ -- It's often the case that the comment itself doesn't have a span
178+ -- attached to it and instead its location can be obtained from
179+ -- nearest enclosing span.
180+ getEnclosingSpan (const True) >>= mapM_ (setSpanMark . HaddockSpan hstyle)
181+ RealSrcSpan spn -> setSpanMark (HaddockSpan hstyle spn)
182+
183+-- | Print anchor of named doc section.
184+p_hsDocName :: String -> R ()
185+p_hsDocName name = txt ("-- $" <> T.pack name)
src/Ormolu/Printer/Meat/Declaration.hs+216−131
@@ -1,18 +1,20 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
33{-# LANGUAGE PatternSynonyms #-}
44{-# LANGUAGE RecordWildCards #-}
5−{-# LANGUAGE ViewPatterns #-}
5+{-# LANGUAGE ViewPatterns #-}
66
77-- | Rendering of declarations.
8−
98module Ormolu.Printer.Meat.Declaration
10− ( p_hsDecls
11− , hasSeparatedDecls
9+ ( p_hsDecls,
10+ p_hsDeclsRespectGrouping,
1211 )
1312where
1413
15−import GHC
14+import Data.List (sort)
15+import Data.List.NonEmpty (NonEmpty (..), (<|))
16+import qualified Data.List.NonEmpty as NE
17+import GHC hiding (InlinePragma)
1618import OccName (occNameFS)
1719import Ormolu.Printer.Combinators
1820import Ormolu.Printer.Meat.Common
@@ -28,68 +30,103 @@ import Ormolu.Printer.Meat.Declaration.Signature
2830import Ormolu.Printer.Meat.Declaration.Splice
2931import Ormolu.Printer.Meat.Declaration.Type
3032import Ormolu.Printer.Meat.Declaration.TypeFamily
31−import Data.List
3233import Ormolu.Printer.Meat.Declaration.Value
3334import Ormolu.Printer.Meat.Declaration.Warning
3435import Ormolu.Printer.Meat.Type
3536import Ormolu.Utils
36−import RdrName (rdrNameOcc)
37−import Data.List.NonEmpty (NonEmpty((:|)))
38−import qualified Data.List.NonEmpty as NE
37+
38+data UserGrouping
39+ = -- | Always put newlines where we think they should be
40+ Disregard
41+ | -- | Respect user preferences regarding grouping
42+ Respect
43+ deriving (Eq, Show)
3944
4045p_hsDecls :: FamilyStyle -> [LHsDecl GhcPs] -> R ()
41−p_hsDecls style decls = sepSemi id $
42− -- Return a list of rendered declarations, adding a newline to separate
43− -- groups.
44− case groupDecls decls of
45− [] -> []
46− (x:xs) ->
47− NE.toList (renderGroup x)
48− ++ concatMap (NE.toList . separateGroup . renderGroup) xs
49− where
50− renderGroup = fmap (located' $ dontUseBraces . p_hsDecl style)
51− separateGroup (x :| xs) = (breakpoint' >> x) :| xs
46+p_hsDecls = p_hsDecls' Disregard
5247
53−-- | Group relevant declarations together.
48+-- | Like 'p_hsDecls' but respects user choices regarding grouping. If the
49+-- user omits newlines between declarations, we also omit them in most
50+-- cases, except when said declarations have associated Haddocks.
5451--
55−-- Add a declaration to a group iff it is relevant to either the first or
56−-- the last declaration of the group.
52+-- Does some normalization (compress subsequent newlines into a single one)
53+p_hsDeclsRespectGrouping :: FamilyStyle -> [LHsDecl GhcPs] -> R ()
54+p_hsDeclsRespectGrouping = p_hsDecls' Respect
55+
56+p_hsDecls' :: UserGrouping -> FamilyStyle -> [LHsDecl GhcPs] -> R ()
57+p_hsDecls' grouping style decls =
58+ sepSemi id $
59+ -- Return a list of rendered declarations, adding a newline to separate
60+ -- groups.
61+ case groupDecls decls of
62+ [] -> []
63+ (x : xs) -> renderGroup x ++ concat (zipWith renderGroupWithPrev (x : xs) xs)
64+ where
65+ renderGroup = NE.toList . fmap (located' $ dontUseBraces . p_hsDecl style)
66+ renderGroupWithPrev prev curr =
67+ -- We can omit a blank line when the user didn't add one, but we must
68+ -- ensure we always add blank lines around documented declarations
69+ case grouping of
70+ Disregard ->
71+ breakpoint : renderGroup curr
72+ Respect ->
73+ if separatedByBlankNE getLoc prev curr
74+ || isDocumented prev
75+ || isDocumented curr
76+ then breakpoint : renderGroup curr
77+ else renderGroup curr
5778
79+-- | Is a declaration group documented?
80+isDocumented :: NonEmpty (LHsDecl GhcPs) -> Bool
81+isDocumented = any (isHaddock . unLoc)
82+ where
83+ isHaddock DocNext = True
84+ isHaddock DocPrev = True
85+ isHaddock _ = False
86+
87+-- | Group relevant declarations together.
5888groupDecls :: [LHsDecl GhcPs] -> [NonEmpty (LHsDecl GhcPs)]
5989groupDecls [] = []
60−groupDecls (lhdr:xs) =
61− let -- Pick the first decl as the group header
62− hdr = unLoc lhdr
63− -- Zip rest of the decls with their previous decl
64− zipped = zip (lhdr:xs) xs
65− -- Pick decls from the tail if they are relevant to the group header
66− -- or the previous decl.
67− (grp, rest) = flip span zipped $ \(L _ prev, L _ cur) ->
68− let relevantToHdr = groupedDecls hdr cur
69− relevantToPrev = groupedDecls prev cur
70− in relevantToHdr || relevantToPrev
71− in (lhdr :| map snd grp) : groupDecls (map snd rest)
90+groupDecls (l@(L _ DocNext) : xs) =
91+ -- If the first element is a doc string for next element, just include it
92+ -- in the next block:
93+ case groupDecls xs of
94+ [] -> [l :| []]
95+ (x : xs') -> (l <| x) : xs'
96+groupDecls (header : xs) =
97+ let (grp, rest) = flip span (zip (header : xs) xs) $ \(previous, current) ->
98+ let relevantToHdr = groupedDecls header current
99+ relevantToPrev = groupedDecls previous current
100+ isDeclSeries = declSeries previous current
101+ in isDeclSeries || relevantToHdr || relevantToPrev
102+ in (header :| map snd grp) : groupDecls (map snd rest)
72103
73104p_hsDecl :: FamilyStyle -> HsDecl GhcPs -> R ()
74105p_hsDecl style = \case
75− TyClD NoExt x -> p_tyClDecl style x
76− ValD NoExt x -> p_valDecl x
77− SigD NoExt x -> p_sigDecl x
78− InstD NoExt x -> p_instDecl style x
79− DerivD NoExt x -> p_derivDecl x
80− DefD NoExt x -> p_defaultDecl x
81− ForD NoExt x -> p_foreignDecl x
82− WarningD NoExt x -> p_warnDecls x
83− AnnD NoExt x -> p_annDecl x
84− RuleD NoExt x -> p_ruleDecls x
85− SpliceD NoExt x -> p_spliceDecl x
86− DocD _ _ -> notImplemented "DocD"
87− RoleAnnotD NoExt x -> p_roleAnnot x
88− XHsDecl _ -> notImplemented "XHsDecl"
106+ TyClD NoExtField x -> p_tyClDecl style x
107+ ValD NoExtField x -> p_valDecl x
108+ SigD NoExtField x -> p_sigDecl x
109+ InstD NoExtField x -> p_instDecl style x
110+ DerivD NoExtField x -> p_derivDecl x
111+ DefD NoExtField x -> p_defaultDecl x
112+ ForD NoExtField x -> p_foreignDecl x
113+ WarningD NoExtField x -> p_warnDecls x
114+ AnnD NoExtField x -> p_annDecl x
115+ RuleD NoExtField x -> p_ruleDecls x
116+ SpliceD NoExtField x -> p_spliceDecl x
117+ DocD NoExtField docDecl ->
118+ case docDecl of
119+ DocCommentNext str -> p_hsDocString Pipe False (noLoc str)
120+ DocCommentPrev str -> p_hsDocString Caret False (noLoc str)
121+ DocCommentNamed name str -> p_hsDocString (Named name) False (noLoc str)
122+ DocGroup n str -> p_hsDocString (Asterisk n) False (noLoc str)
123+ RoleAnnotD NoExtField x -> p_roleAnnot x
124+ KindSigD NoExtField s -> p_standaloneKindSig s
125+ XHsDecl x -> noExtCon x
89126
90127p_tyClDecl :: FamilyStyle -> TyClDecl GhcPs -> R ()
91128p_tyClDecl style = \case
92− FamDecl NoExt x -> p_famDecl style x
129+ FamDecl NoExtField x -> p_famDecl style x
93130 SynDecl {..} -> p_synDecl tcdLName tcdFixity tcdTyVars tcdRhs
94131 DataDecl {..} ->
95132 p_dataDecl
@@ -109,36 +146,66 @@ p_tyClDecl style = \case
109146 tcdMeths
110147 tcdATs
111148 tcdATDefs
112− XTyClDecl {} -> notImplemented "XTyClDecl"
149+ tcdDocs
150+ XTyClDecl x -> noExtCon x
113151
114152p_instDecl :: FamilyStyle -> InstDecl GhcPs -> R ()
115153p_instDecl style = \case
116− ClsInstD NoExt x -> p_clsInstDecl x
117− TyFamInstD NoExt x -> p_tyFamInstDecl style x
118− DataFamInstD NoExt x -> p_dataFamInstDecl style x
119− XInstDecl _ -> notImplemented "XInstDecl"
154+ ClsInstD NoExtField x -> p_clsInstDecl x
155+ TyFamInstD NoExtField x -> p_tyFamInstDecl style x
156+ DataFamInstD NoExtField x -> p_dataFamInstDecl style x
157+ XInstDecl x -> noExtCon x
120158
121159p_derivDecl :: DerivDecl GhcPs -> R ()
122160p_derivDecl = \case
123− d@DerivDecl {..} -> p_standaloneDerivDecl d
124− XDerivDecl _ -> notImplemented "XDerivDecl standalone deriving"
161+ d@DerivDecl {} -> p_standaloneDerivDecl d
162+ XDerivDecl x -> noExtCon x
125163
126164-- | Determine if these declarations should be grouped together.
165+groupedDecls ::
166+ LHsDecl GhcPs ->
167+ LHsDecl GhcPs ->
168+ Bool
169+groupedDecls (L l_x x') (L l_y y') =
170+ case (x', y') of
171+ (TypeSignature ns, FunctionBody ns') -> ns `intersects` ns'
172+ (TypeSignature ns, DefaultSignature ns') -> ns `intersects` ns'
173+ (DefaultSignature ns, TypeSignature ns') -> ns `intersects` ns'
174+ (DefaultSignature ns, FunctionBody ns') -> ns `intersects` ns'
175+ (x, FunctionBody ns) | Just ns' <- isPragma x -> ns `intersects` ns'
176+ (FunctionBody ns, x) | Just ns' <- isPragma x -> ns `intersects` ns'
177+ (x, DataDeclaration n) | Just ns <- isPragma x -> n `elem` ns
178+ (DataDeclaration n, x)
179+ | Just ns <- isPragma x ->
180+ let f = occNameFS . rdrNameOcc in f n `elem` map f ns
181+ (x, y)
182+ | Just ns <- isPragma x,
183+ Just ns' <- isPragma y ->
184+ ns `intersects` ns'
185+ (x, TypeSignature ns) | Just ns' <- isPragma x -> ns `intersects` ns'
186+ (TypeSignature ns, x) | Just ns' <- isPragma x -> ns `intersects` ns'
187+ (PatternSignature ns, Pattern n) -> n `elem` ns
188+ (KindSignature n, DataDeclaration n') -> n == n'
189+ (KindSignature n, ClassDeclaration n') -> n == n'
190+ (KindSignature n, FamilyDeclaration n') -> n == n'
191+ -- Special case for TH splices, we look at locations
192+ (Splice, Splice) -> not (separatedByBlank id l_x l_y)
193+ -- This looks only at Haddocks, normal comments are handled elsewhere
194+ (DocNext, _) -> True
195+ (_, DocPrev) -> True
196+ _ -> False
127197
128−groupedDecls
129− :: HsDecl GhcPs
130− -> HsDecl GhcPs
131− -> Bool
132−groupedDecls (TypeSignature ns) (FunctionBody ns') = ns `intersects` ns'
133−groupedDecls x (FunctionBody ns) | Just ns' <- isPragma x = ns `intersects` ns'
134−groupedDecls (FunctionBody ns) x | Just ns' <- isPragma x = ns `intersects` ns'
135−groupedDecls x (DataDeclaration n) | Just ns <- isPragma x = n `elem` ns
136−groupedDecls (DataDeclaration n) x | Just ns <- isPragma x =
137− let f = occNameFS . rdrNameOcc in f n `elem` map f ns
138−groupedDecls x y | Just ns <- isPragma x, Just ns' <- isPragma y = ns `intersects` ns'
139−groupedDecls x (TypeSignature ns) | Just ns' <- isPragma x = ns `intersects` ns'
140−groupedDecls (PatternSignature ns) (Pattern n) = n `elem` ns
141−groupedDecls _ _ = False
198+-- | Detect declaration series that should not have blanks between them.
199+declSeries ::
200+ LHsDecl GhcPs ->
201+ LHsDecl GhcPs ->
202+ Bool
203+declSeries (L _ x) (L _ y) =
204+ case (x, y) of
205+ ( SigD NoExtField (TypeSig NoExtField _ _),
206+ SigD NoExtField (TypeSig NoExtField _ _)
207+ ) -> True
208+ _ -> False
142209
143210intersects :: Ord a => [a] -> [a] -> Bool
144211intersects a b = go (sort a) (sort b)
@@ -146,22 +213,14 @@ intersects a b = go (sort a) (sort b)
146213 go :: Ord a => [a] -> [a] -> Bool
147214 go _ [] = False
148215 go [] _ = False
149− go (x:xs) (y:ys)
150− | x < y = go xs (y:ys)
151− | x > y = go (x:xs) ys
216+ go (x : xs) (y : ys)
217+ | x < y = go xs (y : ys)
218+ | x > y = go (x : xs) ys
152219 | otherwise = True
153220
154−-- | Checks if given list of declarations contain a pair which should
155−-- be separated by a blank line.
156−
157−hasSeparatedDecls :: [LHsDecl GhcPs] -> Bool
158−hasSeparatedDecls xs = case groupDecls xs of
159− _:_:_ -> True
160− _ -> False
161−
162−isPragma
163− :: HsDecl GhcPs
164− -> Maybe [RdrName]
221+isPragma ::
222+ HsDecl GhcPs ->
223+ Maybe [RdrName]
165224isPragma = \case
166225 InlinePragma n -> Just [n]
167226 SpecializePragma n -> Just [n]
@@ -171,72 +230,98 @@ isPragma = \case
171230 WarningPragma n -> Just n
172231 _ -> Nothing
173232
233+-- Declarations that do not refer to names
234+
235+pattern Splice :: HsDecl GhcPs
236+pattern Splice <- SpliceD NoExtField (SpliceDecl NoExtField _ _)
237+
174238-- Declarations referring to a single name
175239
176−pattern InlinePragma
177− , SpecializePragma
178− , SCCPragma
179− , AnnTypePragma
180− , AnnValuePragma
181− , Pattern
182− , DataDeclaration :: RdrName -> HsDecl GhcPs
183−pattern InlinePragma n <- SigD NoExt (InlineSig NoExt (L _ n) _)
184−pattern SpecializePragma n <- SigD NoExt (SpecSig NoExt (L _ n) _ _)
185−pattern SCCPragma n <- SigD NoExt (SCCFunSig NoExt _ (L _ n) _)
186−pattern AnnTypePragma n <- AnnD NoExt (HsAnnotation NoExt _ (TypeAnnProvenance (L _ n)) _)
187−pattern AnnValuePragma n <- AnnD NoExt (HsAnnotation NoExt _ (ValueAnnProvenance (L _ n)) _)
188−pattern Pattern n <- ValD NoExt (PatSynBind NoExt (PSB _ (L _ n) _ _ _))
189−pattern DataDeclaration n <- TyClD NoExt (DataDecl NoExt (L _ n) _ _ _)
240+pattern
241+ InlinePragma,
242+ SpecializePragma,
243+ SCCPragma,
244+ AnnTypePragma,
245+ AnnValuePragma,
246+ Pattern,
247+ DataDeclaration,
248+ ClassDeclaration,
249+ KindSignature,
250+ FamilyDeclaration ::
251+ RdrName -> HsDecl GhcPs
252+pattern InlinePragma n <- SigD NoExtField (InlineSig NoExtField (L _ n) _)
253+pattern SpecializePragma n <- SigD NoExtField (SpecSig NoExtField (L _ n) _ _)
254+pattern SCCPragma n <- SigD NoExtField (SCCFunSig NoExtField _ (L _ n) _)
255+pattern AnnTypePragma n <- AnnD NoExtField (HsAnnotation NoExtField _ (TypeAnnProvenance (L _ n)) _)
256+pattern AnnValuePragma n <- AnnD NoExtField (HsAnnotation NoExtField _ (ValueAnnProvenance (L _ n)) _)
257+pattern Pattern n <- ValD NoExtField (PatSynBind NoExtField (PSB _ (L _ n) _ _ _))
258+pattern DataDeclaration n <- TyClD NoExtField (DataDecl NoExtField (L _ n) _ _ _)
259+pattern ClassDeclaration n <- TyClD NoExtField (ClassDecl NoExtField _ (L _ n) _ _ _ _ _ _ _ _)
260+pattern KindSignature n <- KindSigD NoExtField (StandaloneKindSig NoExtField (L _ n) _)
261+pattern FamilyDeclaration n <- TyClD NoExtField (FamDecl NoExtField (FamilyDecl NoExtField _ (L _ n) _ _ _ _))
190262
191263-- Declarations which can refer to multiple names
192264
193−pattern TypeSignature
194− , FunctionBody
195− , PatternSignature
196− , WarningPragma :: [RdrName] -> HsDecl GhcPs
265+pattern
266+ TypeSignature,
267+ DefaultSignature,
268+ FunctionBody,
269+ PatternSignature,
270+ WarningPragma ::
271+ [RdrName] -> HsDecl GhcPs
197272pattern TypeSignature n <- (sigRdrNames -> Just n)
273+pattern DefaultSignature n <- (defSigRdrNames -> Just n)
198274pattern FunctionBody n <- (funRdrNames -> Just n)
199275pattern PatternSignature n <- (patSigRdrNames -> Just n)
200276pattern WarningPragma n <- (warnSigRdrNames -> Just n)
201277
278+pattern DocNext, DocPrev :: HsDecl GhcPs
279+pattern DocNext <- (DocD NoExtField (DocCommentNext _))
280+pattern DocPrev <- (DocD NoExtField (DocCommentPrev _))
281+
202282sigRdrNames :: HsDecl GhcPs -> Maybe [RdrName]
203−sigRdrNames (SigD NoExt (TypeSig NoExt ns _)) = Just $ map unLoc ns
204−sigRdrNames (SigD NoExt (ClassOpSig NoExt _ ns _)) = Just $ map unLoc ns
205−sigRdrNames (SigD NoExt (PatSynSig NoExt ns _)) = Just $ map unLoc ns
283+sigRdrNames (SigD NoExtField (TypeSig NoExtField ns _)) = Just $ map unLoc ns
284+sigRdrNames (SigD NoExtField (ClassOpSig NoExtField _ ns _)) = Just $ map unLoc ns
285+sigRdrNames (SigD NoExtField (PatSynSig NoExtField ns _)) = Just $ map unLoc ns
206286sigRdrNames _ = Nothing
207287
288+defSigRdrNames :: HsDecl GhcPs -> Maybe [RdrName]
289+defSigRdrNames (SigD NoExtField (ClassOpSig NoExtField True ns _)) = Just $ map unLoc ns
290+defSigRdrNames _ = Nothing
291+
208292funRdrNames :: HsDecl GhcPs -> Maybe [RdrName]
209−funRdrNames (ValD NoExt (FunBind NoExt (L _ n) _ _ _)) = Just [n]
210−funRdrNames (ValD NoExt (PatBind NoExt (L _ n) _ _)) = Just $ patBindNames n
293+funRdrNames (ValD NoExtField (FunBind NoExtField (L _ n) _ _ _)) = Just [n]
294+funRdrNames (ValD NoExtField (PatBind NoExtField (L _ n) _ _)) = Just $ patBindNames n
211295funRdrNames _ = Nothing
212296
213297patSigRdrNames :: HsDecl GhcPs -> Maybe [RdrName]
214−patSigRdrNames (SigD NoExt (PatSynSig NoExt ns _)) = Just $ map unLoc ns
298+patSigRdrNames (SigD NoExtField (PatSynSig NoExtField ns _)) = Just $ map unLoc ns
215299patSigRdrNames _ = Nothing
216300
217301warnSigRdrNames :: HsDecl GhcPs -> Maybe [RdrName]
218−warnSigRdrNames (WarningD NoExt (Warnings NoExt _ ws)) = Just $ flip concatMap ws $ \case
219− L _ (Warning NoExt ns _) -> map unLoc ns
220− L _ (XWarnDecl NoExt) -> []
302+warnSigRdrNames (WarningD NoExtField (Warnings NoExtField _ ws)) = Just $
303+ flip concatMap ws $ \case
304+ L _ (Warning NoExtField ns _) -> map unLoc ns
305+ L _ (XWarnDecl x) -> noExtCon x
221306warnSigRdrNames _ = Nothing
222307
223308patBindNames :: Pat GhcPs -> [RdrName]
224−patBindNames (TuplePat NoExt ps _) = concatMap (patBindNames . unLoc) ps
225−patBindNames (VarPat NoExt (L _ n)) = [n]
226−patBindNames (WildPat NoExt) = []
227−patBindNames (LazyPat NoExt (L _ p)) = patBindNames p
228−patBindNames (BangPat NoExt (L _ p)) = patBindNames p
229−patBindNames (ParPat NoExt (L _ p)) = patBindNames p
230−patBindNames (ListPat NoExt ps) = concatMap (patBindNames . unLoc) ps
231−patBindNames (AsPat NoExt (L _ n) (L _ p)) = n : patBindNames p
232−patBindNames (SumPat NoExt (L _ p) _ _) = patBindNames p
233−patBindNames (ViewPat NoExt _ (L _ p)) = patBindNames p
234−patBindNames (SplicePat NoExt _) = []
235−patBindNames (LitPat NoExt _) = []
236−patBindNames (SigPat _ (L _ p)) = patBindNames p
237−patBindNames (NPat NoExt _ _ _) = []
238−patBindNames (NPlusKPat NoExt (L _ n) _ _ _ _) = [n]
309+patBindNames (TuplePat NoExtField ps _) = concatMap (patBindNames . unLoc) ps
310+patBindNames (VarPat NoExtField (L _ n)) = [n]
311+patBindNames (WildPat NoExtField) = []
312+patBindNames (LazyPat NoExtField (L _ p)) = patBindNames p
313+patBindNames (BangPat NoExtField (L _ p)) = patBindNames p
314+patBindNames (ParPat NoExtField (L _ p)) = patBindNames p
315+patBindNames (ListPat NoExtField ps) = concatMap (patBindNames . unLoc) ps
316+patBindNames (AsPat NoExtField (L _ n) (L _ p)) = n : patBindNames p
317+patBindNames (SumPat NoExtField (L _ p) _ _) = patBindNames p
318+patBindNames (ViewPat NoExtField _ (L _ p)) = patBindNames p
319+patBindNames (SplicePat NoExtField _) = []
320+patBindNames (LitPat NoExtField _) = []
321+patBindNames (SigPat _ (L _ p) _) = patBindNames p
322+patBindNames (NPat NoExtField _ _ _) = []
323+patBindNames (NPlusKPat NoExtField (L _ n) _ _ _ _) = [n]
239324patBindNames (ConPatIn _ d) = concatMap (patBindNames . unLoc) (hsConPatArgs d)
240−patBindNames (ConPatOut _ _ _ _ _ _ _) = notImplemented "ConPatOut" -- created by renamer
241−patBindNames (CoPat NoExt _ p _) = patBindNames p
242−patBindNames (XPat NoExt) = notImplemented "XPat"
325+patBindNames ConPatOut {} = notImplemented "ConPatOut" -- created by renamer
326+patBindNames (CoPat NoExtField _ p _) = patBindNames p
327+patBindNames (XPat x) = noExtCon x
src/Ormolu/Printer/Meat/Declaration.hs-boot+3−3
@@ -1,6 +1,6 @@
11module Ormolu.Printer.Meat.Declaration
2− ( p_hsDecls
3− , hasSeparatedDecls
2+ ( p_hsDecls,
3+ p_hsDeclsRespectGrouping,
44 )
55where
66
@@ -9,4 +9,4 @@ import Ormolu.Printer.Combinators
99import Ormolu.Printer.Meat.Common
1010
1111p_hsDecls :: FamilyStyle -> [LHsDecl GhcPs] -> R ()
12−hasSeparatedDecls :: [LHsDecl GhcPs] -> Bool
12+p_hsDeclsRespectGrouping :: FamilyStyle -> [LHsDecl GhcPs] -> R ()
src/Ormolu/Printer/Meat/Declaration/Annotation.hs+4−5
@@ -1,8 +1,8 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
33
44module Ormolu.Printer.Meat.Declaration.Annotation
5− ( p_annDecl
5+ ( p_annDecl,
66 )
77where
88
@@ -10,15 +10,14 @@ import GHC
1010import Ormolu.Printer.Combinators
1111import Ormolu.Printer.Meat.Common
1212import Ormolu.Printer.Meat.Declaration.Value
13−import Ormolu.Utils
1413
1514p_annDecl :: AnnDecl GhcPs -> R ()
1615p_annDecl = \case
17− HsAnnotation NoExt _ annProv expr -> pragma "ANN" . inci $ do
16+ HsAnnotation NoExtField _ annProv expr -> pragma "ANN" . inci $ do
1817 p_annProv annProv
1918 breakpoint
2019 located expr p_hsExpr
21− XAnnDecl {} -> notImplemented "XAnnDecl"
20+ XAnnDecl x -> noExtCon x
2221
2322p_annProv :: AnnProvenance (IdP GhcPs) -> R ()
2423p_annProv = \case
src/Ormolu/Printer/Meat/Declaration/Class.hs+43−53
@@ -1,11 +1,10 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
3+{-# LANGUAGE RecordWildCards #-}
44
55-- | Rendering of type class declarations.
6−
76module Ormolu.Printer.Meat.Declaration.Class
8− ( p_classDecl
7+ ( p_classDecl,
98 )
109where
1110
@@ -13,79 +12,77 @@ import Class
1312import Control.Arrow
1413import Control.Monad
1514import Data.Foldable
16−import Data.List (sortBy)
17−import Data.Ord (comparing)
15+import Data.List (sortOn)
1816import GHC
1917import Ormolu.Printer.Combinators
2018import Ormolu.Printer.Meat.Common
21−import Ormolu.Printer.Meat.Type
22−import Ormolu.Utils
23−import RdrName (RdrName (..))
2419import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
20+import Ormolu.Printer.Meat.Type
2521
26−p_classDecl
27− :: LHsContext GhcPs
28− -> Located RdrName
29− -> LHsQTyVars GhcPs
30− -> LexicalFixity
31− -> [Located (FunDep (Located RdrName))]
32− -> [LSig GhcPs]
33− -> LHsBinds GhcPs
34− -> [LFamilyDecl GhcPs]
35− -> [LTyFamDefltEqn GhcPs]
36− -> R ()
37−p_classDecl ctx name tvars fixity fdeps csigs cdefs cats catdefs = do
38− let HsQTvs {..} = tvars
39− variableSpans = getLoc <$> hsq_explicit
22+p_classDecl ::
23+ LHsContext GhcPs ->
24+ Located RdrName ->
25+ LHsQTyVars GhcPs ->
26+ LexicalFixity ->
27+ [Located (FunDep (Located RdrName))] ->
28+ [LSig GhcPs] ->
29+ LHsBinds GhcPs ->
30+ [LFamilyDecl GhcPs] ->
31+ [LTyFamDefltDecl GhcPs] ->
32+ [LDocDecl] ->
33+ R ()
34+p_classDecl ctx name HsQTvs {..} fixity fdeps csigs cdefs cats catdefs cdocs = do
35+ let variableSpans = getLoc <$> hsq_explicit
4036 signatureSpans = getLoc name : variableSpans
4137 dependencySpans = getLoc <$> fdeps
4238 combinedSpans = getLoc ctx : (signatureSpans ++ dependencySpans)
39+ -- GHC's AST does not necessarily store each kind of element in source
40+ -- location order. This happens because different declarations are stored
41+ -- in different lists. Consequently, to get all the declarations in proper
42+ -- order, they need to be manually sorted.
43+ sigs = (getLoc &&& fmap (SigD NoExtField)) <$> csigs
44+ vals = (getLoc &&& fmap (ValD NoExtField)) <$> toList cdefs
45+ tyFams = (getLoc &&& fmap (TyClD NoExtField . FamDecl NoExtField)) <$> cats
46+ docs = (getLoc &&& fmap (DocD NoExtField)) <$> cdocs
47+ tyFamDefs =
48+ ( getLoc &&& fmap (InstD NoExtField . TyFamInstD NoExtField)
49+ )
50+ <$> catdefs
51+ allDecls =
52+ snd <$> sortOn fst (sigs <> vals <> tyFams <> tyFamDefs <> docs)
4353 txt "class"
4454 switchLayout combinedSpans $ do
4555 breakpoint
4656 inci $ do
4757 p_classContext ctx
48− switchLayout signatureSpans $ do
58+ switchLayout signatureSpans $
4959 p_infixDefHelper
5060 (isInfix fixity)
51− inci
61+ True
5262 (p_rdrName name)
5363 (located' p_hsTyVarBndr <$> hsq_explicit)
5464 inci (p_classFundeps fdeps)
55− -- NOTE GHC's AST does not necessarily store each kind of element in
56− -- source location order. This happens because different declarations are
57− -- stored in different lists. Consequently, to get all the declarations in
58− -- proper order, they need to be manually sorted.
59− let sigs = (getLoc &&& fmap (SigD NoExt)) <$> csigs
60− vals = (getLoc &&& fmap (ValD NoExt)) <$> toList cdefs
61− tyFams = (getLoc &&& fmap (TyClD NoExt . FamDecl NoExt)) <$> cats
62− tyFamDefs =
63− ( getLoc &&& fmap (InstD NoExt . TyFamInstD NoExt . defltEqnToInstDecl)
64− ) <$> catdefs
65− allDecls =
66− snd <$> sortBy (comparing fst) (sigs <> vals <> tyFams <> tyFamDefs)
65+ unless (null allDecls) $ do
66+ breakpoint
67+ txt "where"
6768 unless (null allDecls) $ do
68− space
69− txt "where"
7069 breakpoint -- Ensure whitespace is added after where clause.
71− -- Add newline before first declaration if the body contains separate
72− -- declarations.
73− when (hasSeparatedDecls allDecls) breakpoint'
74− inci (p_hsDecls Associated allDecls)
70+ inci (p_hsDeclsRespectGrouping Associated allDecls)
71+p_classDecl _ _ (XLHsQTyVars c) _ _ _ _ _ _ _ = noExtCon c
7572
7673p_classContext :: LHsContext GhcPs -> R ()
7774p_classContext ctx = unless (null (unLoc ctx)) $ do
7875 located ctx p_hsContext
79− breakpoint
80− txt "=>"
8176 space
77+ txt "=>"
78+ breakpoint
8279
8380p_classFundeps :: [Located (FunDep (Located RdrName))] -> R ()
8481p_classFundeps fdeps = unless (null fdeps) $ do
8582 breakpoint
8683 txt "|"
8784 space
88− sitcc $ sep (comma >> breakpoint) (sitcc . located' p_funDep) fdeps
85+ inci $ sep commaDel (sitcc . located' p_funDep) fdeps
8986
9087p_funDep :: FunDep (Located RdrName) -> R ()
9188p_funDep (before, after) = do
@@ -98,13 +95,6 @@ p_funDep (before, after) = do
9895----------------------------------------------------------------------------
9996-- Helpers
10097
101−defltEqnToInstDecl :: TyFamDefltEqn GhcPs -> TyFamInstDecl GhcPs
102−defltEqnToInstDecl FamEqn {..} = TyFamInstDecl {..}
103− where
104− eqn = FamEqn {feqn_pats = tyVarsToTypes feqn_pats, ..}
105− tfid_eqn = HsIB {hsib_ext = NoExt, hsib_body = eqn}
106−defltEqnToInstDecl XFamEqn {} = notImplemented "XFamEqn"
107−
10898isInfix :: LexicalFixity -> Bool
10999isInfix = \case
110100 Infix -> True
src/Ormolu/Printer/Meat/Declaration/Data.hs+168−107
@@ -1,31 +1,33 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
3+{-# LANGUAGE RecordWildCards #-}
44
55-- | Renedring of data type declarations.
6−
76module Ormolu.Printer.Meat.Declaration.Data
8− ( p_dataDecl
7+ ( p_dataDecl,
98 )
109where
1110
1211import Control.Monad
13−import Data.Maybe (isJust)
12+import Data.Maybe (isJust, maybeToList)
1413import GHC
1514import Ormolu.Printer.Combinators
1615import Ormolu.Printer.Meat.Common
1716import Ormolu.Printer.Meat.Type
1817import Ormolu.Utils
19−import RdrName (RdrName (..))
20−import SrcLoc (Located)
2118
22−p_dataDecl
23− :: FamilyStyle -- ^ Whether to format as data family
24− -> Located RdrName -- ^ Type constructor
25− -> [LHsType GhcPs] -- ^ Type patterns
26− -> LexicalFixity -- ^ Lexical fixity
27− -> HsDataDefn GhcPs -- ^ Data definition
28− -> R ()
19+p_dataDecl ::
20+ -- | Whether to format as data family
21+ FamilyStyle ->
22+ -- | Type constructor
23+ Located RdrName ->
24+ -- | Type patterns
25+ [LHsType GhcPs] ->
26+ -- | Lexical fixity
27+ LexicalFixity ->
28+ -- | Data definition
29+ HsDataDefn GhcPs ->
30+ R ()
2931p_dataDecl style name tpats fixity HsDataDefn {..} = do
3032 txt $ case dd_ND of
3133 NewType -> "newtype"
@@ -33,13 +35,15 @@ p_dataDecl style name tpats fixity HsDataDefn {..} = do
3335 txt $ case style of
3436 Associated -> mempty
3537 Free -> " instance"
36− switchLayout (getLoc name : fmap getLoc tpats) $ do
38+ let constructorSpans = getLoc name : fmap getLoc tpats
39+ switchLayout constructorSpans $ do
3740 breakpoint
38− inci $ p_infixDefHelper
39− (isInfix fixity)
40− inci
41− (p_rdrName name)
42− (located' p_hsType <$> tpats)
41+ inci $
42+ p_infixDefHelper
43+ (isInfix fixity)
44+ True
45+ (p_rdrName name)
46+ (located' p_hsType <$> tpats)
4347 case dd_kindSig of
4448 Nothing -> return ()
4549 Just k -> do
@@ -50,99 +54,141 @@ p_dataDecl style name tpats fixity HsDataDefn {..} = do
5054 let gadt = isJust dd_kindSig || any (isGadt . unLoc) dd_cons
5155 unless (null dd_cons) $
5256 if gadt
53− then do
54− space
55− txt "where"
56− breakpoint
57− inci $ sepSemi (located' p_conDecl) dd_cons
58− else switchLayout (getLoc name : (getLoc <$> dd_cons)) $
59− inci $ do
57+ then inci $ do
58+ switchLayout constructorSpans $ do
6059 breakpoint
61− txt "="
62− space
63− let s = vlayout (txt " | ") (newline >> txt "| ")
64− sep s (sitcc . located' p_conDecl) dd_cons
65−
60+ txt "where"
61+ breakpoint
62+ sepSemi (located' (p_conDecl False)) dd_cons
63+ else switchLayout (getLoc name : (getLoc <$> dd_cons)) . inci $ do
64+ let singleConstRec = isSingleConstRec dd_cons
65+ if singleConstRec
66+ then space
67+ else
68+ if hasHaddocks dd_cons
69+ then newline
70+ else breakpoint
71+ equals
72+ space
73+ layout <- getLayout
74+ let s =
75+ if layout == MultiLine || hasHaddocks dd_cons
76+ then newline >> txt "|" >> space
77+ else space >> txt "|" >> space
78+ sitcc' =
79+ if singleConstRec
80+ then id
81+ else sitcc
82+ sep s (sitcc' . located' (p_conDecl singleConstRec)) dd_cons
6683 unless (null $ unLoc dd_derivs) breakpoint
67− inci . located dd_derivs $ \xs -> do
84+ inci . located dd_derivs $ \xs ->
6885 sep newline (located' p_hsDerivingClause) xs
69−p_dataDecl _ _ _ _ (XHsDataDefn NoExt) = notImplemented "XHsDataDefn"
86+p_dataDecl _ _ _ _ (XHsDataDefn x) = noExtCon x
7087
71−p_conDecl :: ConDecl GhcPs -> R ()
72−p_conDecl = \case
88+p_conDecl ::
89+ Bool ->
90+ ConDecl GhcPs ->
91+ R ()
92+p_conDecl singleConstRec = \case
7393 ConDeclGADT {..} -> do
74− case con_names of
75− [] -> return ()
76− (c:cs) -> do
77− p_rdrName c
78− unless (null cs) . inci $ do
79− comma
80− breakpoint
81− sitcc $ sep (comma >> breakpoint) p_rdrName cs
82− breakpoint
83− inci $ do
84− txt "::"
85− space
86− p_forallBndrs (hsq_explicit con_qvars)
94+ mapM_ (p_hsDocString Pipe True) con_doc
95+ let conDeclSpn =
96+ fmap getLoc con_names
97+ <> [getLoc con_forall]
98+ <> conTyVarsSpans con_qvars
99+ <> maybeToList (fmap getLoc con_mb_cxt)
100+ <> conArgsSpans con_args
101+ switchLayout conDeclSpn $ do
102+ case con_names of
103+ [] -> return ()
104+ (c : cs) -> do
105+ p_rdrName c
106+ unless (null cs) . inci $ do
107+ commaDel
108+ sep commaDel p_rdrName cs
109+ inci $ do
110+ space
111+ txt "::"
112+ let interArgBreak =
113+ if hasDocStrings (unLoc con_res_ty)
114+ then newline
115+ else breakpoint
116+ interArgBreak
117+ when (unLoc con_forall) $ do
118+ p_forallBndrs ForallInvis p_hsTyVarBndr (hsq_explicit con_qvars)
119+ interArgBreak
120+ forM_ con_mb_cxt p_lhsContext
121+ case con_args of
122+ PrefixCon xs -> do
123+ sep breakpoint (located' p_hsType) xs
124+ unless (null xs) $ do
125+ space
126+ txt "->"
127+ breakpoint
128+ RecCon l -> do
129+ located l p_conDeclFields
130+ unless (null $ unLoc l) $ do
131+ space
132+ txt "->"
133+ breakpoint
134+ InfixCon _ _ -> notImplemented "InfixCon"
135+ p_hsType (unLoc con_res_ty)
136+ ConDeclH98 {..} -> do
137+ mapM_ (p_hsDocString Pipe True) con_doc
138+ let conDeclWithContextSpn =
139+ [getLoc con_forall]
140+ <> fmap getLoc con_ex_tvs
141+ <> maybeToList (fmap getLoc con_mb_cxt)
142+ <> conDeclSpn
143+ conDeclSpn =
144+ getLoc con_name : conArgsSpans con_args
145+ switchLayout conDeclWithContextSpn $ do
146+ when (unLoc con_forall) $ do
147+ p_forallBndrs ForallInvis p_hsTyVarBndr con_ex_tvs
148+ breakpoint
87149 forM_ con_mb_cxt p_lhsContext
88− case con_args of
150+ switchLayout conDeclSpn $ case con_args of
89151 PrefixCon xs -> do
90− sep breakpoint (located' p_hsType) xs
91− unless (null xs) $ do
92− breakpoint
93− txt "->"
94− space
152+ p_rdrName con_name
153+ unless (null xs) breakpoint
154+ inci . sitcc $ sep breakpoint (sitcc . located' p_hsTypePostDoc) xs
95155 RecCon l -> do
96− located l p_conDeclFields
97− unless (null $ unLoc l) $ do
98− breakpoint
99− txt "->"
100− space
101− InfixCon _ _ -> notImplemented "InfixCon"
102− p_hsType (unLoc con_res_ty)
103− ConDeclH98 {..} -> do
104− p_forallBndrs con_ex_tvs
105− forM_ con_mb_cxt p_lhsContext
106− case con_args of
107− PrefixCon xs -> do
108− p_rdrName con_name
109− unless (null xs) breakpoint
110− inci . sitcc $ sep breakpoint (sitcc . located' p_hsType) xs
111− RecCon l -> do
112− p_rdrName con_name
113− breakpoint
114− inci $ located l p_conDeclFields
115− InfixCon x y -> do
116− located x p_hsType
117− breakpoint
118− inci $ do
119156 p_rdrName con_name
120− space
121− located y p_hsType
122− XConDecl NoExt -> notImplemented "XConDecl"
157+ breakpoint
158+ inciIf (not singleConstRec) (located l p_conDeclFields)
159+ InfixCon x y -> do
160+ located x p_hsType
161+ breakpoint
162+ inci $ do
163+ p_rdrName con_name
164+ space
165+ located y p_hsType
166+ XConDecl x -> noExtCon x
123167
124−p_forallBndrs
125− :: [LHsTyVarBndr GhcPs]
126− -> R ()
127−p_forallBndrs = \case
128− [] -> return ()
129− bndrs -> do
130− txt "forall"
131− space
132− sep space (located' p_hsTyVarBndr) bndrs
133− txt "."
134− space
168+conArgsSpans :: HsConDeclDetails GhcPs -> [SrcSpan]
169+conArgsSpans = \case
170+ PrefixCon xs ->
171+ getLoc <$> xs
172+ RecCon l ->
173+ [getLoc l]
174+ InfixCon x y ->
175+ [getLoc x, getLoc y]
176+
177+conTyVarsSpans :: LHsQTyVars GhcPs -> [SrcSpan]
178+conTyVarsSpans = \case
179+ HsQTvs {..} -> getLoc <$> hsq_explicit
180+ XLHsQTyVars x -> noExtCon x
135181
136−p_lhsContext
137− :: LHsContext GhcPs
138− -> R ()
182+p_lhsContext ::
183+ LHsContext GhcPs ->
184+ R ()
139185p_lhsContext = \case
140186 L _ [] -> pure ()
141187 ctx -> do
142188 located ctx p_hsContext
143− breakpoint
144− txt "=>"
145189 space
190+ txt "=>"
191+ breakpoint
146192
147193isGadt :: ConDecl GhcPs -> Bool
148194isGadt = \case
@@ -150,17 +196,19 @@ isGadt = \case
150196 ConDeclH98 {} -> False
151197 XConDecl {} -> False
152198
153−p_hsDerivingClause
154− :: HsDerivingClause GhcPs
155− -> R ()
199+p_hsDerivingClause ::
200+ HsDerivingClause GhcPs ->
201+ R ()
156202p_hsDerivingClause HsDerivingClause {..} = do
157203 txt "deriving"
158204 let derivingWhat = located deriv_clause_tys $ \case
159205 [] -> txt "()"
160− xs -> parens . sitcc $ sep
161− (comma >> breakpoint)
162− (sitcc . located' p_hsType . hsib_body)
163− xs
206+ xs ->
207+ parens N $
208+ sep
209+ commaDel
210+ (sitcc . located' p_hsType . hsib_body)
211+ xs
164212 space
165213 case deriv_clause_strategy of
166214 Nothing -> do
@@ -187,9 +235,9 @@ p_hsDerivingClause HsDerivingClause {..} = do
187235 txt "via"
188236 space
189237 located hsib_body p_hsType
190− ViaStrategy (XHsImplicitBndrs NoExt) ->
191− notImplemented "XHsImplicitBndrs"
192−p_hsDerivingClause (XHsDerivingClause NoExt) = notImplemented "XHsDerivingClause"
238+ ViaStrategy (XHsImplicitBndrs x) ->
239+ noExtCon x
240+p_hsDerivingClause (XHsDerivingClause x) = noExtCon x
193241
194242----------------------------------------------------------------------------
195243-- Helpers
@@ -198,3 +246,16 @@ isInfix :: LexicalFixity -> Bool
198246isInfix = \case
199247 Infix -> True
200248 Prefix -> False
249+
250+isSingleConstRec :: [LConDecl GhcPs] -> Bool
251+isSingleConstRec [(L _ ConDeclH98 {..})] =
252+ case con_args of
253+ RecCon _ -> True
254+ _ -> False
255+isSingleConstRec _ = False
256+
257+hasHaddocks :: [LConDecl GhcPs] -> Bool
258+hasHaddocks = any (f . unLoc)
259+ where
260+ f ConDeclH98 {..} = isJust con_doc
261+ f _ = False
src/Ormolu/Printer/Meat/Declaration/Default.hs+6−7
@@ -1,21 +1,20 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
33
44module Ormolu.Printer.Meat.Declaration.Default
5− ( p_defaultDecl
5+ ( p_defaultDecl,
66 )
77where
88
99import GHC
1010import Ormolu.Printer.Combinators
1111import Ormolu.Printer.Meat.Type
12−import Ormolu.Utils
1312
1413p_defaultDecl :: DefaultDecl GhcPs -> R ()
1514p_defaultDecl = \case
16− DefaultDecl NoExt ts -> do
15+ DefaultDecl NoExtField ts -> do
1716 txt "default"
1817 breakpoint
19− inci . parens . sitcc $
20− sep (comma >> breakpoint) (sitcc . located' p_hsType) ts
21− XDefaultDecl {} -> notImplemented "XDefaultDecl"
18+ inci . parens N $
19+ sep commaDel (sitcc . located' p_hsType) ts
20+ XDefaultDecl x -> noExtCon x
src/Ormolu/Printer/Meat/Declaration/Foreign.hs+12−12
@@ -1,9 +1,9 @@
1−{-# LANGUAGE LambdaCase #-}
2−{-# LANGUAGE NamedFieldPuns #-}
1+{-# LANGUAGE LambdaCase #-}
2+{-# LANGUAGE NamedFieldPuns #-}
33{-# LANGUAGE OverloadedStrings #-}
44
55module Ormolu.Printer.Meat.Declaration.Foreign
6− ( p_foreignDecl
6+ ( p_foreignDecl,
77 )
88where
99
@@ -15,7 +15,6 @@ import GHC
1515import Ormolu.Printer.Combinators
1616import Ormolu.Printer.Meat.Common
1717import Ormolu.Printer.Meat.Declaration.Signature
18−import Ormolu.Utils
1918
2019p_foreignDecl :: ForeignDecl GhcPs -> R ()
2120p_foreignDecl = \case
@@ -25,19 +24,21 @@ p_foreignDecl = \case
2524 fd@ForeignExport {fd_fe} -> do
2625 p_foreignExport fd_fe
2726 p_foreignTypeSig fd
28− XForeignDecl {} -> notImplemented "XForeignDecl"
27+ XForeignDecl x -> noExtCon x
2928
3029-- | Printer for the last part of an import\/export, which is function name
3130-- and type signature.
32−
3331p_foreignTypeSig :: ForeignDecl GhcPs -> R ()
3432p_foreignTypeSig fd = do
3533 breakpoint
36− -- Switch into the layout of the signature, to allow us to pull name and
37− -- signature onto a single line.
38− inci . switchLayout [getLoc . hsib_body $ fd_sig_ty fd] $ do
39− p_rdrName (fd_name fd)
40− p_typeAscription (HsWC NoExt (fd_sig_ty fd))
34+ inci
35+ . switchLayout
36+ [ getLoc (fd_name fd),
37+ (getLoc . hsib_body . fd_sig_ty) fd
38+ ]
39+ $ do
40+ p_rdrName (fd_name fd)
41+ p_typeAscription (HsWC NoExtField (fd_sig_ty fd))
4142
4243-- | Printer for 'ForeignImport'.
4344--
@@ -51,7 +52,6 @@ p_foreignTypeSig fd = do
5152-- We also layout the identifier using the 'SourceText', because printing
5253-- with the other two fields of 'CImport' is very complicated. See the
5354-- 'Outputable' instance of 'ForeignImport' for details.
54−
5555p_foreignImport :: ForeignImport -> R ()
5656p_foreignImport (CImport cCallConv safety _ _ sourceText) = do
5757 txt "foreign import"
src/Ormolu/Printer/Meat/Declaration/Instance.hs+33−38
@@ -1,14 +1,13 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
3+{-# LANGUAGE RecordWildCards #-}
44
55-- | Type class, type family, and data family instance declarations.
6−
76module Ormolu.Printer.Meat.Declaration.Instance
8− ( p_clsInstDecl
9− , p_tyFamInstDecl
10− , p_dataFamInstDecl
11− , p_standaloneDerivDecl
7+ ( p_clsInstDecl,
8+ p_tyFamInstDecl,
9+ p_dataFamInstDecl,
10+ p_standaloneDerivDecl,
1211 )
1312where
1413
@@ -16,16 +15,15 @@ import BasicTypes
1615import Control.Arrow
1716import Control.Monad
1817import Data.Foldable
19−import Data.List (sortBy)
20−import Data.Ord (comparing)
18+import Data.List (sortOn)
2119import GHC
2220import Ormolu.Printer.Combinators
2321import Ormolu.Printer.Meat.Common
22+import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
2423import Ormolu.Printer.Meat.Declaration.Data
2524import Ormolu.Printer.Meat.Declaration.TypeFamily
2625import Ormolu.Printer.Meat.Type
2726import Ormolu.Utils
28−import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
2927
3028p_standaloneDerivDecl :: DerivDecl GhcPs -> R ()
3129p_standaloneDerivDecl DerivDecl {..} = do
@@ -34,13 +32,11 @@ p_standaloneDerivDecl DerivDecl {..} = do
3432 txt "instance"
3533 breakpoint
3634 match_overlap_mode deriv_overlap_mode breakpoint
37− if toIndent
38− then inci typesAfterInstance
39− else typesAfterInstance
35+ inciIf toIndent typesAfterInstance
4036 txt "deriving"
4137 space
4238 case deriv_strategy of
43− Nothing -> do
39+ Nothing ->
4440 instTypes False
4541 Just (L _ a) -> case a of
4642 StockStrategy -> do
@@ -58,8 +54,8 @@ p_standaloneDerivDecl DerivDecl {..} = do
5854 inci (located hsib_body p_hsType)
5955 breakpoint
6056 instTypes True
61− ViaStrategy (XHsImplicitBndrs NoExt) ->
62− notImplemented "XHsImplicitBndrs"
57+ ViaStrategy (XHsImplicitBndrs x) ->
58+ noExtCon x
6359p_standaloneDerivDecl (XDerivDecl _) = notImplemented "XDerivDecl"
6460
6561p_clsInstDecl :: ClsInstDecl GhcPs -> R ()
@@ -72,17 +68,18 @@ p_clsInstDecl = \case
7268 -- location order. This happens because different declarations are stored in
7369 -- different lists. Consequently, to get all the declarations in proper
7470 -- order, they need to be manually sorted.
75− let sigs = (getLoc &&& fmap (SigD NoExt)) <$> cid_sigs
76− vals = (getLoc &&& fmap (ValD NoExt)) <$> toList cid_binds
71+ let sigs = (getLoc &&& fmap (SigD NoExtField)) <$> cid_sigs
72+ vals = (getLoc &&& fmap (ValD NoExtField)) <$> toList cid_binds
7773 tyFamInsts =
78− ( getLoc &&& fmap (InstD NoExt . TyFamInstD NoExt)
79− ) <$> cid_tyfam_insts
74+ ( getLoc &&& fmap (InstD NoExtField . TyFamInstD NoExtField)
75+ )
76+ <$> cid_tyfam_insts
8077 dataFamInsts =
81− ( getLoc &&& fmap (InstD NoExt . DataFamInstD NoExt)
82− ) <$> cid_datafam_insts
78+ ( getLoc &&& fmap (InstD NoExtField . DataFamInstD NoExtField)
79+ )
80+ <$> cid_datafam_insts
8381 allDecls =
84− snd <$>
85− sortBy (comparing fst) (sigs <> vals <> tyFamInsts <> dataFamInsts)
82+ snd <$> sortOn fst (sigs <> vals <> tyFamInsts <> dataFamInsts)
8683 located hsib_body $ \x -> do
8784 breakpoint
8885 inci $ do
@@ -91,16 +88,12 @@ p_clsInstDecl = \case
9188 unless (null allDecls) $ do
9289 breakpoint
9390 txt "where"
94− unless (null allDecls) $ do
95− inci $ do
96− -- Ensure whitespace is added after where clause.
97− breakpoint
98− -- Add newline before first declaration if the body contains separate
99− -- declarations
100− when (hasSeparatedDecls allDecls) breakpoint'
101− dontUseBraces $ p_hsDecls Associated allDecls
102− XHsImplicitBndrs NoExt -> notImplemented "XHsImplicitBndrs"
103− XClsInstDecl NoExt -> notImplemented "XClsInstDecl"
91+ unless (null allDecls) . inci $ do
92+ -- Ensure whitespace is added after where clause.
93+ breakpoint
94+ dontUseBraces $ p_hsDeclsRespectGrouping Associated allDecls
95+ XHsImplicitBndrs x -> noExtCon x
96+ XClsInstDecl x -> noExtCon x
10497
10598p_tyFamInstDecl :: FamilyStyle -> TyFamInstDecl GhcPs -> R ()
10699p_tyFamInstDecl style = \case
@@ -113,10 +106,12 @@ p_tyFamInstDecl style = \case
113106
114107p_dataFamInstDecl :: FamilyStyle -> DataFamInstDecl GhcPs -> R ()
115108p_dataFamInstDecl style = \case
116− DataFamInstDecl {..} -> do
117− let HsIB {..} = dfid_eqn
118− FamEqn {..} = hsib_body
119− p_dataDecl style feqn_tycon feqn_pats feqn_fixity feqn_rhs
109+ DataFamInstDecl {dfid_eqn = HsIB {hsib_body = FamEqn {..}}} ->
110+ p_dataDecl style feqn_tycon (map typeArgToType feqn_pats) feqn_fixity feqn_rhs
111+ DataFamInstDecl {dfid_eqn = HsIB {hsib_body = XFamEqn {}}} ->
112+ notImplemented "XFamEqn"
113+ DataFamInstDecl {dfid_eqn = XHsImplicitBndrs {}} ->
114+ notImplemented "XHsImplicitBndrs"
120115
121116match_overlap_mode :: Maybe (Located OverlapMode) -> R () -> R ()
122117match_overlap_mode overlap_mode layoutStrategy =
src/Ormolu/Printer/Meat/Declaration/RoleAnnotation.hs+5−11
@@ -1,12 +1,10 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
43{-# LANGUAGE TypeFamilies #-}
54
65-- | Rendering of Role annotation declarations.
7−
86module Ormolu.Printer.Meat.Declaration.RoleAnnotation
9− ( p_roleAnnot
7+ ( p_roleAnnot,
108 )
119where
1210
@@ -14,14 +12,11 @@ import CoAxiom
1412import GHC
1513import Ormolu.Printer.Combinators
1614import Ormolu.Printer.Meat.Common
17−import Ormolu.Utils
18−import RdrName (RdrName (..))
19−import SrcLoc (Located)
2015
2116p_roleAnnot :: RoleAnnotDecl GhcPs -> R ()
2217p_roleAnnot = \case
23− RoleAnnotDecl NoExt l_name anns -> p_roleAnnot' l_name anns
24− XRoleAnnotDecl _ -> notImplemented "XRoleAnnotDecl"
18+ RoleAnnotDecl NoExtField l_name anns -> p_roleAnnot' l_name anns
19+ XRoleAnnotDecl x -> noExtCon x
2520
2621p_roleAnnot' :: Located RdrName -> [Located (Maybe Role)] -> R ()
2722p_roleAnnot' l_name anns = do
@@ -30,8 +25,7 @@ p_roleAnnot' l_name anns = do
3025 inci $ do
3126 p_rdrName l_name
3227 breakpoint
33− let
34− p_role' = maybe (txt "_") p_role
28+ let p_role' = maybe (txt "_") p_role
3529 inci . sitcc $ sep breakpoint (sitcc . located' p_role') anns
3630
3731p_role :: Role -> R ()
src/Ormolu/Printer/Meat/Declaration/Rule.hs+25−25
@@ -1,61 +1,61 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
43
54module Ormolu.Printer.Meat.Declaration.Rule
6− ( p_ruleDecls
5+ ( p_ruleDecls,
76 )
87where
98
109import BasicTypes
10+import Control.Monad (unless)
1111import GHC
1212import Ormolu.Printer.Combinators
1313import Ormolu.Printer.Meat.Common
1414import Ormolu.Printer.Meat.Declaration.Signature
1515import Ormolu.Printer.Meat.Declaration.Value
16−import Ormolu.Utils
16+import Ormolu.Printer.Meat.Type
1717
1818p_ruleDecls :: RuleDecls GhcPs -> R ()
1919p_ruleDecls = \case
20− HsRules NoExt _ xs -> pragma "RULES" . sitcc $
21− sep breakpoint (sitcc . located' p_ruleDecl) xs
22− XRuleDecls NoExt -> notImplemented "XRuleDecls"
20+ HsRules NoExtField _ xs ->
21+ pragma "RULES" $
22+ sep breakpoint (sitcc . located' p_ruleDecl) xs
23+ XRuleDecls x -> noExtCon x
2324
2425p_ruleDecl :: RuleDecl GhcPs -> R ()
2526p_ruleDecl = \case
26− HsRule NoExt ruleName activation ruleBndrs lhs rhs -> do
27+ HsRule NoExtField ruleName activation tyvars ruleBndrs lhs rhs -> do
2728 located ruleName p_ruleName
2829 space
2930 p_activation activation
3031 space
31− p_ruleBndrs ruleBndrs
32+ case tyvars of
33+ Nothing -> return ()
34+ Just xs -> do
35+ p_forallBndrs ForallInvis p_hsTyVarBndr xs
36+ space
37+ -- It appears that there is no way to tell if there was an empty forall
38+ -- in the input or no forall at all. We do not want to add redundant
39+ -- foralls, so let's just skip the empty ones.
40+ unless (null ruleBndrs) $
41+ p_forallBndrs ForallInvis p_ruleBndr ruleBndrs
3242 breakpoint
3343 inci $ do
3444 located lhs p_hsExpr
3545 space
36− txt "="
46+ equals
3747 inci $ do
3848 breakpoint
3949 located rhs p_hsExpr
40− XRuleDecl NoExt -> notImplemented "XRuleDecl"
50+ XRuleDecl x -> noExtCon x
4151
4252p_ruleName :: (SourceText, RuleName) -> R ()
43−p_ruleName (_, name) = atom $ HsString NoSourceText name
44−
45−p_ruleBndrs :: [LRuleBndr GhcPs] -> R ()
46−p_ruleBndrs [] = return ()
47−p_ruleBndrs bndrs =
48− switchLayout (getLoc <$> bndrs) $ do
49− txt "forall"
50− breakpoint
51− inci $ do
52− sitcc $ sep breakpoint (sitcc . located' p_ruleBndr) bndrs
53− txt "."
53+p_ruleName (_, name) = atom $ (HsString NoSourceText name :: HsLit GhcPs)
5454
5555p_ruleBndr :: RuleBndr GhcPs -> R ()
5656p_ruleBndr = \case
57− RuleBndr NoExt x -> p_rdrName x
58− RuleBndrSig NoExt x hswc -> parens $ do
57+ RuleBndr NoExtField x -> p_rdrName x
58+ RuleBndrSig NoExtField x hswc -> parens N $ do
5959 p_rdrName x
6060 p_typeAscription hswc
61− XRuleBndr NoExt -> notImplemented "XRuleBndr"
61+ XRuleBndr x -> noExtCon x
src/Ormolu/Printer/Meat/Declaration/Signature.hs+134−97
@@ -1,20 +1,19 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
3+{-# LANGUAGE RecordWildCards #-}
44
55-- | Type signature declarations.
6−
76module Ormolu.Printer.Meat.Declaration.Signature
8− ( p_sigDecl
9− , p_typeAscription
10− , p_activation
7+ ( p_sigDecl,
8+ p_typeAscription,
9+ p_activation,
10+ p_standaloneKindSig,
1111 )
1212where
1313
1414import BasicTypes
1515import BooleanFormula
1616import Control.Monad
17−import Data.Bool (bool)
1817import GHC
1918import Ormolu.Printer.Combinators
2019import Ormolu.Printer.Meat.Common
@@ -23,70 +22,81 @@ import Ormolu.Utils
2322
2423p_sigDecl :: Sig GhcPs -> R ()
2524p_sigDecl = \case
26− TypeSig NoExt names hswc -> p_typeSig True names hswc
27− PatSynSig NoExt names hsib -> p_patSynSig names hsib
28− ClassOpSig NoExt def names hsib -> p_classOpSig def names hsib
29− FixSig NoExt sig -> p_fixSig sig
30− InlineSig NoExt name inlinePragma -> p_inlineSig name inlinePragma
31− SpecSig NoExt name ts inlinePragma -> p_specSig name ts inlinePragma
32− SpecInstSig NoExt _ hsib -> p_specInstSig hsib
33− MinimalSig NoExt _ booleanFormula -> p_minimalSig booleanFormula
34− CompleteMatchSig NoExt _sourceText cs ty -> p_completeSig cs ty
35− SCCFunSig NoExt _ name literal -> p_sccSig name literal
25+ TypeSig NoExtField names hswc -> p_typeSig True names hswc
26+ PatSynSig NoExtField names hsib -> p_patSynSig names hsib
27+ ClassOpSig NoExtField def names hsib -> p_classOpSig def names hsib
28+ FixSig NoExtField sig -> p_fixSig sig
29+ InlineSig NoExtField name inlinePragma -> p_inlineSig name inlinePragma
30+ SpecSig NoExtField name ts inlinePragma -> p_specSig name ts inlinePragma
31+ SpecInstSig NoExtField _ hsib -> p_specInstSig hsib
32+ MinimalSig NoExtField _ booleanFormula -> p_minimalSig booleanFormula
33+ CompleteMatchSig NoExtField _sourceText cs ty -> p_completeSig cs ty
34+ SCCFunSig NoExtField _ name literal -> p_sccSig name literal
3635 _ -> notImplemented "certain types of signature declarations"
3736
38−p_typeSig
39− :: Bool -- ^ Should the tail of the names be indented
40− -> [Located RdrName] -- ^ Names (before @::@)
41− -> LHsSigWcType GhcPs -- ^ Type
42− -> R ()
37+p_typeSig ::
38+ -- | Should the tail of the names be indented
39+ Bool ->
40+ -- | Names (before @::@)
41+ [Located RdrName] ->
42+ -- | Type
43+ LHsSigWcType GhcPs ->
44+ R ()
4345p_typeSig _ [] _ = return () -- should not happen though
44−p_typeSig indentTail (n:ns) hswc = do
46+p_typeSig indentTail (n : ns) hswc = do
4547 p_rdrName n
4648 if null ns
4749 then p_typeAscription hswc
48− else bool id inci indentTail $ do
49− comma
50− breakpoint
51− sep (comma >> breakpoint) p_rdrName ns
50+ else inciIf indentTail $ do
51+ commaDel
52+ sep commaDel p_rdrName ns
5253 p_typeAscription hswc
5354
54−p_typeAscription
55− :: LHsSigWcType GhcPs
56− -> R ()
57−p_typeAscription HsWC {..} = do
58− breakpoint
59− inci $ do
60− txt "::"
61− space
62− located (hsib_body hswc_body) p_hsType
63−p_typeAscription (XHsWildCardBndrs NoExt) = notImplemented "XHsWildCardBndrs"
64−
65−p_patSynSig
66− :: [Located RdrName]
67− -> HsImplicitBndrs GhcPs (LHsType GhcPs)
68− -> R ()
55+p_typeAscription ::
56+ LHsSigWcType GhcPs ->
57+ R ()
58+p_typeAscription HsWC {..} = inci $ do
59+ space
60+ txt "::"
61+ let t = hsib_body hswc_body
62+ if hasDocStrings (unLoc t)
63+ then newline
64+ else breakpoint
65+ located t p_hsType
66+p_typeAscription (XHsWildCardBndrs x) = noExtCon x
67+
68+p_patSynSig ::
69+ [Located RdrName] ->
70+ HsImplicitBndrs GhcPs (LHsType GhcPs) ->
71+ R ()
6972p_patSynSig names hsib = do
7073 txt "pattern"
71− let body = p_typeSig False names HsWC {hswc_ext = NoExt, hswc_body = hsib}
74+ let body =
75+ p_typeSig
76+ False
77+ names
78+ HsWC {hswc_ext = NoExtField, hswc_body = hsib}
7279 if length names > 1
7380 then breakpoint >> inci body
7481 else space >> body
7582
76−p_classOpSig
77− :: Bool -- ^ Whether this is a \"default\" signature
78− -> [Located RdrName] -- ^ Names (before @::@)
79− -> HsImplicitBndrs GhcPs (LHsType GhcPs) -- ^ Type
80− -> R ()
81−p_classOpSig def names hsib = do
83+p_classOpSig ::
84+ -- | Whether this is a \"default\" signature
85+ Bool ->
86+ -- | Names (before @::@)
87+ [Located RdrName] ->
88+ -- | Type
89+ HsImplicitBndrs GhcPs (LHsType GhcPs) ->
90+ R ()
91+p_classOpSig def names hsib = do
8292 when def (txt "default" >> space)
83− p_typeSig True names HsWC {hswc_ext = NoExt, hswc_body = hsib}
93+ p_typeSig True names HsWC {hswc_ext = NoExtField, hswc_body = hsib}
8494
85−p_fixSig
86− :: FixitySig GhcPs
87− -> R ()
95+p_fixSig ::
96+ FixitySig GhcPs ->
97+ R ()
8898p_fixSig = \case
89− FixitySig NoExt names (Fixity _ n dir) -> do
99+ FixitySig NoExtField names (Fixity _ n dir) -> do
90100 txt $ case dir of
91101 InfixL -> "infixl"
92102 InfixR -> "infixr"
@@ -94,13 +104,15 @@ p_fixSig = \case
94104 space
95105 atom n
96106 space
97− sitcc $ sep (comma >> breakpoint) p_rdrName names
98− XFixitySig NoExt -> notImplemented "XFixitySig"
99−
100−p_inlineSig
101− :: Located RdrName -- ^ Name
102− -> InlinePragma -- ^ Inline pragma specification
103− -> R ()
107+ sitcc $ sep commaDel p_rdrName names
108+ XFixitySig x -> noExtCon x
109+
110+p_inlineSig ::
111+ -- | Name
112+ Located RdrName ->
113+ -- | Inline pragma specification
114+ InlinePragma ->
115+ R ()
104116p_inlineSig name InlinePragma {..} = pragmaBraces $ do
105117 p_inlineSpec inl_inline
106118 space
@@ -112,11 +124,14 @@ p_inlineSig name InlinePragma {..} = pragmaBraces $ do
112124 space
113125 p_rdrName name
114126
115−p_specSig
116− :: Located RdrName -- ^ Name
117− -> [LHsSigType GhcPs] -- ^ The types to specialize to
118− -> InlinePragma -- ^ For specialize inline
119− -> R ()
127+p_specSig ::
128+ -- | Name
129+ Located RdrName ->
130+ -- | The types to specialize to
131+ [LHsSigType GhcPs] ->
132+ -- | For specialize inline
133+ InlinePragma ->
134+ R ()
120135p_specSig name ts InlinePragma {..} = pragmaBraces $ do
121136 txt "SPECIALIZE"
122137 space
@@ -125,10 +140,10 @@ p_specSig name ts InlinePragma {..} = pragmaBraces $ do
125140 p_activation inl_act
126141 space
127142 p_rdrName name
143+ space
144+ txt "::"
128145 breakpoint
129− inci $ do
130− txt ":: "
131− sep (comma >> breakpoint) (located' p_hsType . hsib_body) ts
146+ inci $ sep commaDel (located' p_hsType . hsib_body) ts
132147
133148p_inlineSpec :: InlineSpec -> R ()
134149p_inlineSpec = \case
@@ -151,45 +166,53 @@ p_activation = \case
151166 txt "]"
152167
153168p_specInstSig :: LHsSigType GhcPs -> R ()
154−p_specInstSig hsib = pragma "SPECIALIZE instance" . inci $
155− located (hsib_body hsib) p_hsType
156−
157−p_minimalSig
158− :: LBooleanFormula (Located RdrName) -- ^ Boolean formula
159− -> R ()
169+p_specInstSig hsib =
170+ pragma "SPECIALIZE instance" . inci $
171+ located (hsib_body hsib) p_hsType
172+
173+p_minimalSig ::
174+ -- | Boolean formula
175+ LBooleanFormula (Located RdrName) ->
176+ R ()
160177p_minimalSig =
161178 located' $ \booleanFormula ->
162179 pragma "MINIMAL" (inci $ p_booleanFormula booleanFormula)
163180
164−p_booleanFormula
165− :: BooleanFormula (Located RdrName) -- ^ Boolean formula
166− -> R ()
181+p_booleanFormula ::
182+ -- | Boolean formula
183+ BooleanFormula (Located RdrName) ->
184+ R ()
167185p_booleanFormula = \case
168186 Var name -> p_rdrName name
169− And xs -> sitcc $ sep
170− (comma >> breakpoint)
171− (located' p_booleanFormula)
172− xs
173− Or xs -> sitcc $ sep
174− (breakpoint >> txt "| ")
175− (located' p_booleanFormula)
176− xs
177− Parens l -> located l (parens . p_booleanFormula)
178−
179−p_completeSig
180− :: Located [Located RdrName] -- ^ Constructors\/patterns
181− -> Maybe (Located RdrName) -- ^ Type
182− -> R ()
187+ And xs ->
188+ sitcc $
189+ sep
190+ commaDel
191+ (located' p_booleanFormula)
192+ xs
193+ Or xs ->
194+ sitcc $
195+ sep
196+ (breakpoint >> txt "|" >> space)
197+ (located' p_booleanFormula)
198+ xs
199+ Parens l -> located l (parens N . p_booleanFormula)
200+
201+p_completeSig ::
202+ -- | Constructors\/patterns
203+ Located [Located RdrName] ->
204+ -- | Type
205+ Maybe (Located RdrName) ->
206+ R ()
183207p_completeSig cs' mty =
184208 located cs' $ \cs ->
185209 pragma "COMPLETE" . inci $ do
186− sitcc $ sep (comma >> breakpoint) p_rdrName cs
210+ sep commaDel p_rdrName cs
187211 forM_ mty $ \ty -> do
212+ space
213+ txt "::"
188214 breakpoint
189− inci $ do
190− txt "::"
191− space
192− p_rdrName ty
215+ inci (p_rdrName ty)
193216
194217p_sccSig :: Located (IdP GhcPs) -> Maybe (Located StringLiteral) -> R ()
195218p_sccSig loc literal = pragma "SCC" . inci $ do
@@ -197,3 +220,17 @@ p_sccSig loc literal = pragma "SCC" . inci $ do
197220 forM_ literal $ \x -> do
198221 breakpoint
199222 atom x
223+
224+p_standaloneKindSig :: StandaloneKindSig GhcPs -> R ()
225+p_standaloneKindSig (StandaloneKindSig NoExtField name bndrs) = do
226+ txt "type"
227+ inci $ do
228+ space
229+ p_rdrName name
230+ space
231+ txt "::"
232+ breakpoint
233+ case bndrs of
234+ HsIB NoExtField sig -> located sig p_hsType
235+ XHsImplicitBndrs x -> noExtCon x
236+p_standaloneKindSig (XStandaloneKindSig c) = noExtCon c
src/Ormolu/Printer/Meat/Declaration/Splice.hs+3−4
@@ -1,16 +1,15 @@
11{-# LANGUAGE LambdaCase #-}
22
33module Ormolu.Printer.Meat.Declaration.Splice
4− ( p_spliceDecl
4+ ( p_spliceDecl,
55 )
66where
77
88import GHC
99import Ormolu.Printer.Combinators
1010import Ormolu.Printer.Meat.Declaration.Value (p_hsSplice)
11−import Ormolu.Utils
1211
1312p_spliceDecl :: SpliceDecl GhcPs -> R ()
1413p_spliceDecl = \case
15− SpliceDecl NoExt splice _explicit -> located splice p_hsSplice
16− XSpliceDecl {} -> notImplemented "XSpliceDecl"
14+ SpliceDecl NoExtField splice _explicit -> located splice p_hsSplice
15+ XSpliceDecl x -> noExtCon x
src/Ormolu/Printer/Meat/Declaration/Type.hs+22−20
@@ -1,10 +1,9 @@
11{-# LANGUAGE OverloadedStrings #-}
2−{-# LANGUAGE RecordWildCards #-}
2+{-# LANGUAGE RecordWildCards #-}
33
44-- | Rendering of type synonym declarations.
5−
65module Ormolu.Printer.Meat.Declaration.Type
7− ( p_synDecl
6+ ( p_synDecl,
87 )
98where
109
@@ -12,27 +11,30 @@ import GHC
1211import Ormolu.Printer.Combinators
1312import Ormolu.Printer.Meat.Common
1413import Ormolu.Printer.Meat.Type
15−import RdrName (RdrName (..))
16−import SrcLoc (Located)
1714
18−p_synDecl
19− :: Located RdrName -- ^ Type constructor
20− -> LexicalFixity -- ^ Fixity
21− -> LHsQTyVars GhcPs -- ^ Type variables
22− -> LHsType GhcPs -- ^ RHS of type declaration
23− -> R ()
24−p_synDecl name fixity tvars t = do
15+p_synDecl ::
16+ -- | Type constructor
17+ Located RdrName ->
18+ -- | Fixity
19+ LexicalFixity ->
20+ -- | Type variables
21+ LHsQTyVars GhcPs ->
22+ -- | RHS of type declaration
23+ LHsType GhcPs ->
24+ R ()
25+p_synDecl name fixity HsQTvs {..} t = do
2526 txt "type"
2627 space
27− let HsQTvs {..} = tvars
28− switchLayout (getLoc name : map getLoc hsq_explicit) $ do
28+ switchLayout (getLoc name : map getLoc hsq_explicit) $
2929 p_infixDefHelper
3030 (case fixity of Infix -> True; _ -> False)
31− inci
31+ True
3232 (p_rdrName name)
3333 (map (located' p_hsTyVarBndr) hsq_explicit)
34− breakpoint
35− inci $ do
36− txt "="
37− space
38− located t p_hsType
34+ space
35+ equals
36+ if hasDocStrings (unLoc t)
37+ then newline
38+ else breakpoint
39+ inci (located t p_hsType)
40+p_synDecl _ _ (XLHsQTyVars x) _ = noExtCon x
src/Ormolu/Printer/Meat/Declaration/TypeFamily.hs+51−46
@@ -1,27 +1,24 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
3+{-# LANGUAGE RecordWildCards #-}
44
55-- | Rendering of data\/type families.
6−
76module Ormolu.Printer.Meat.Declaration.TypeFamily
8− ( p_famDecl
9− , p_tyFamInstEqn
7+ ( p_famDecl,
8+ p_tyFamInstEqn,
109 )
1110where
1211
13−import BasicTypes (LexicalFixity (..))
1412import Control.Monad
15−import Data.Maybe (isNothing, isJust)
13+import Data.Maybe (isNothing)
1614import GHC
1715import Ormolu.Printer.Combinators
1816import Ormolu.Printer.Meat.Common
1917import Ormolu.Printer.Meat.Type
2018import Ormolu.Utils
21−import SrcLoc (Located, GenLocated (..))
2219
2320p_famDecl :: FamilyStyle -> FamilyDecl GhcPs -> R ()
24−p_famDecl style FamilyDecl {..} = do
21+p_famDecl style FamilyDecl {fdTyVars = HsQTvs {..}, ..} = do
2522 mmeqs <- case fdInfo of
2623 DataFamily -> Nothing <$ txt "data"
2724 OpenTypeFamily -> Nothing <$ txt "type"
@@ -29,27 +26,26 @@ p_famDecl style FamilyDecl {..} = do
2926 txt $ case style of
3027 Associated -> mempty
3128 Free -> " family"
32− let HsQTvs {..} = fdTyVars
3329 breakpoint
3430 inci $ do
35− switchLayout (getLoc fdLName : (getLoc <$> hsq_explicit)) $ do
31+ switchLayout (getLoc fdLName : (getLoc <$> hsq_explicit)) $
3632 p_infixDefHelper
3733 (isInfix fdFixity)
38− inci
34+ True
3935 (p_rdrName fdLName)
4036 (located' p_hsTyVarBndr <$> hsq_explicit)
41− let rsig = p_familyResultSigL (isJust fdInjectivityAnn) fdResultSig
42− unless (isNothing rsig && isNothing fdInjectivityAnn) $
43− breakpoint
37+ let resultSig = p_familyResultSigL fdResultSig
38+ unless (isNothing resultSig && isNothing fdInjectivityAnn) space
4439 inci $ do
45− sequence_ rsig
46− when (isJust rsig && isJust fdInjectivityAnn) breakpoint
40+ sequence_ resultSig
41+ space
4742 forM_ fdInjectivityAnn (located' p_injectivityAnn)
4843 case mmeqs of
4944 Nothing -> return ()
5045 Just meqs -> do
51− space
52− txt "where"
46+ inci $ do
47+ breakpoint
48+ txt "where"
5349 case meqs of
5450 Nothing -> do
5551 space
@@ -57,26 +53,27 @@ p_famDecl style FamilyDecl {..} = do
5753 Just eqs -> do
5854 newline
5955 sep newline (located' (inci . p_tyFamInstEqn)) eqs
60−p_famDecl _ (XFamilyDecl NoExt) = notImplemented "XFamilyDecl"
56+p_famDecl _ FamilyDecl {fdTyVars = XLHsQTyVars {}} =
57+ notImplemented "XLHsQTyVars"
58+p_famDecl _ (XFamilyDecl x) = noExtCon x
6159
62−p_familyResultSigL
63− :: Bool
64− -> Located (FamilyResultSig GhcPs)
65− -> Maybe (R ())
66−p_familyResultSigL injAnn l =
60+p_familyResultSigL ::
61+ Located (FamilyResultSig GhcPs) ->
62+ Maybe (R ())
63+p_familyResultSigL l =
6764 case l of
6865 L _ a -> case a of
69− NoSig NoExt -> Nothing
70− KindSig NoExt k -> Just $ do
71− if injAnn then txt "=" else txt "::"
72− space
66+ NoSig NoExtField -> Nothing
67+ KindSig NoExtField k -> Just $ do
68+ txt "::"
69+ breakpoint
7370 located k p_hsType
74− TyVarSig NoExt bndr -> Just $ do
75− if injAnn then txt "=" else txt "::"
76− space
71+ TyVarSig NoExtField bndr -> Just $ do
72+ equals
73+ breakpoint
7774 located bndr p_hsTyVarBndr
78− XFamilyResultSig NoExt ->
79− notImplemented "XFamilyResultSig"
75+ XFamilyResultSig x ->
76+ noExtCon x
8077
8178p_injectivityAnn :: InjectivityAnn GhcPs -> R ()
8279p_injectivityAnn (InjectivityAnn a bs) = do
@@ -89,18 +86,26 @@ p_injectivityAnn (InjectivityAnn a bs) = do
8986 sep space p_rdrName bs
9087
9188p_tyFamInstEqn :: TyFamInstEqn GhcPs -> R ()
92−p_tyFamInstEqn HsIB {..} = do
93− let FamEqn {..} = hsib_body
94− switchLayout (getLoc feqn_tycon : (getLoc <$> feqn_pats)) $ p_infixDefHelper
95− (isInfix feqn_fixity)
96− inci
97− (p_rdrName feqn_tycon)
98− (located' p_hsType <$> feqn_pats)
99− space
100− txt "="
101− breakpoint
102− inci (located feqn_rhs p_hsType)
103−p_tyFamInstEqn (XHsImplicitBndrs NoExt) = notImplemented "XHsImplicitBndrs"
89+p_tyFamInstEqn HsIB {hsib_body = FamEqn {..}} = do
90+ case feqn_bndrs of
91+ Nothing -> return ()
92+ Just bndrs -> do
93+ p_forallBndrs ForallInvis p_hsTyVarBndr bndrs
94+ breakpoint
95+ inciIf (not $ null feqn_bndrs) $ do
96+ let famLhsSpn = getLoc feqn_tycon : fmap (getLoc . typeArgToType) feqn_pats
97+ switchLayout famLhsSpn $
98+ p_infixDefHelper
99+ (isInfix feqn_fixity)
100+ True
101+ (p_rdrName feqn_tycon)
102+ (located' p_hsType . typeArgToType <$> feqn_pats)
103+ space
104+ equals
105+ breakpoint
106+ inci (located feqn_rhs p_hsType)
107+p_tyFamInstEqn HsIB {hsib_body = XFamEqn x} = noExtCon x
108+p_tyFamInstEqn (XHsImplicitBndrs x) = noExtCon x
104109
105110----------------------------------------------------------------------------
106111-- Helpers
src/Ormolu/Printer/Meat/Declaration/Value.hs+848−537
@@ -1,38 +1,43 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
2+{-# LANGUAGE MultiWayIf #-}
23{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
4+{-# LANGUAGE RecordWildCards #-}
5+{-# LANGUAGE TypeApplications #-}
46
57module Ormolu.Printer.Meat.Declaration.Value
6− ( p_valDecl
7− , p_pat
8− , p_hsExpr
9− , p_hsSplice
8+ ( p_valDecl,
9+ p_pat,
10+ p_hsExpr,
11+ p_hsSplice,
12+ p_stringLit,
1013 )
1114where
1215
1316import Bag (bagToList)
1417import BasicTypes
1518import Control.Monad
19+import Ctype (is_space)
1620import Data.Bool (bool)
1721import Data.Char (isPunctuation, isSymbol)
1822import Data.Data hiding (Infix, Prefix)
23+import Data.Functor ((<&>))
1924import Data.List (intersperse, sortOn)
20−import Data.List.NonEmpty (NonEmpty ((:|)))
25+import Data.List.NonEmpty (NonEmpty (..), (<|))
26+import qualified Data.List.NonEmpty as NE
2127import Data.Text (Text)
28+import qualified Data.Text as Text
2229import GHC
30+import OccName (occNameString)
2331import Ormolu.Printer.Combinators
32+import Ormolu.Printer.Internal
2433import Ormolu.Printer.Meat.Common
34+import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
2535import Ormolu.Printer.Meat.Declaration.Signature
2636import Ormolu.Printer.Meat.Type
37+import Ormolu.Printer.Operators
2738import Ormolu.Utils
28−import Outputable (Outputable (..))
29−import RdrName (rdrNameOcc)
30−import SrcLoc (combineSrcSpans, isOneLineSpan)
31−import qualified Data.List.NonEmpty as NE
32−import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
3339
3440-- | Style of a group of equations.
35−
3641data MatchGroupStyle
3742 = Function (Located RdrName)
3843 | PatternBind
@@ -41,56 +46,61 @@ data MatchGroupStyle
4146 | LambdaCase
4247
4348-- | Style of equations in a group.
44−
4549data GroupStyle
4650 = EqualSign
4751 | RightArrow
4852
4953-- | Expression placement. This marks the places where expressions that
5054-- implement handing forms may use them.
51−
5255data Placement
53− = Normal -- ^ Multi-line layout should cause
54− -- insertion of a newline and indentation
55− -- bump
56− | Hanging -- ^ Expressions that have hanging form
57− -- should use it and avoid bumping one level
58− -- of indentation
56+ = -- | Multi-line layout should cause
57+ -- insertion of a newline and indentation
58+ -- bump
59+ Normal
60+ | -- | Expressions that have hanging form
61+ -- should use it and avoid bumping one level
62+ -- of indentation
63+ Hanging
64+ deriving (Eq, Show)
5965
6066p_valDecl :: HsBindLR GhcPs GhcPs -> R ()
6167p_valDecl = \case
62− FunBind NoExt funId funMatches _ _ -> p_funBind funId funMatches
63− PatBind NoExt pat grhss _ -> p_match PatternBind False NoSrcStrict [pat] grhss
68+ FunBind NoExtField funId funMatches _ _ -> p_funBind funId funMatches
69+ PatBind NoExtField pat grhss _ -> p_match PatternBind False NoSrcStrict [pat] grhss
6470 VarBind {} -> notImplemented "VarBinds" -- introduced by the type checker
6571 AbsBinds {} -> notImplemented "AbsBinds" -- introduced by the type checker
66− PatSynBind NoExt psb -> p_patSynBind psb
67− XHsBindsLR NoExt -> notImplemented "XHsBindsLR"
72+ PatSynBind NoExtField psb -> p_patSynBind psb
73+ XHsBindsLR x -> noExtCon x
6874
69−p_funBind
70− :: Located RdrName
71− -> MatchGroup GhcPs (LHsExpr GhcPs)
72− -> R ()
75+p_funBind ::
76+ Located RdrName ->
77+ MatchGroup GhcPs (LHsExpr GhcPs) ->
78+ R ()
7379p_funBind name = p_matchGroup (Function name)
7480
75−p_matchGroup
76− :: MatchGroupStyle
77− -> MatchGroup GhcPs (LHsExpr GhcPs)
78− -> R ()
81+p_matchGroup ::
82+ MatchGroupStyle ->
83+ MatchGroup GhcPs (LHsExpr GhcPs) ->
84+ R ()
7985p_matchGroup = p_matchGroup' exprPlacement p_hsExpr
8086
81−p_matchGroup'
82− :: Data body
83− => (body -> Placement) -- ^ How to get body placement
84− -> (body -> R ()) -- ^ How to print body
85− -> MatchGroupStyle -- ^ Style of this group of equations
86− -> MatchGroup GhcPs (Located body) -- ^ Match group
87− -> R ()
88−p_matchGroup' placer pretty style MG {..} = do
87+p_matchGroup' ::
88+ Data body =>
89+ -- | How to get body placement
90+ (body -> Placement) ->
91+ -- | How to print body
92+ (body -> R ()) ->
93+ -- | Style of this group of equations
94+ MatchGroupStyle ->
95+ -- | Match group
96+ MatchGroup GhcPs (Located body) ->
97+ R ()
98+p_matchGroup' placer render style MG {..} = do
8999 let ob = case style of
90100 Case -> id
91101 LambdaCase -> id
92102 _ -> dontUseBraces
93− -- NOTE since we are forcing braces on 'sepSemi' based on 'ob', we have to
103+ -- Since we are forcing braces on 'sepSemi' based on 'ob', we have to
94104 -- restore the brace state inside the sepsemi.
95105 ub <- bool dontUseBraces useBraces <$> canUseBraces
96106 ob $ sepSemi (located' (ub . p_Match)) (unLoc mg_alts)
@@ -98,14 +108,14 @@ p_matchGroup' placer pretty style MG {..} = do
98108 p_Match m@Match {..} =
99109 p_match'
100110 placer
101− pretty
111+ render
102112 (adjustMatchGroupStyle m style)
103113 (isInfixMatch m)
104114 (matchStrictness m)
105115 m_pats
106116 m_grhss
107− p_Match _ = notImplemented "XMatch"
108−p_matchGroup' _ _ _ (XMatchGroup NoExt) = notImplemented "XMatchGroup"
117+ p_Match (XMatch x) = noExtCon x
118+p_matchGroup' _ _ _ (XMatchGroup x) = noExtCon x
109119
110120-- | Function id obtained through pattern matching on 'FunBind' should not
111121-- be used to print the actual equations because the different ‘RdrNames’
@@ -113,11 +123,10 @@ p_matchGroup' _ _ _ (XMatchGroup NoExt) = notImplemented "XMatchGroup"
113123-- and paretheses) associated with them. It is necessary to use per-equation
114124-- names obtained from 'm_ctxt' of 'Match'. This function replaces function
115125-- name inside of 'Function' accordingly.
116−
117−adjustMatchGroupStyle
118− :: Match GhcPs body
119− -> MatchGroupStyle
120− -> MatchGroupStyle
126+adjustMatchGroupStyle ::
127+ Match GhcPs body ->
128+ MatchGroupStyle ->
129+ MatchGroupStyle
121130adjustMatchGroupStyle m = \case
122131 Function _ -> (Function . mc_fun . m_ctxt) m
123132 style -> style
@@ -125,31 +134,43 @@ adjustMatchGroupStyle m = \case
125134matchStrictness :: Match id body -> SrcStrictness
126135matchStrictness match =
127136 case m_ctxt match of
128− FunRhs{mc_strictness=s} -> s
137+ FunRhs {mc_strictness = s} -> s
129138 _ -> NoSrcStrict
130139
131−p_match
132− :: MatchGroupStyle -- ^ Style of the group
133− -> Bool -- ^ Is this an infix match?
134− -> SrcStrictness -- ^ Strictness prefix (FunBind)
135− -> [LPat GhcPs] -- ^ Argument patterns
136− -> GRHSs GhcPs (LHsExpr GhcPs) -- ^ Equations
137− -> R ()
140+p_match ::
141+ -- | Style of the group
142+ MatchGroupStyle ->
143+ -- | Is this an infix match?
144+ Bool ->
145+ -- | Strictness prefix (FunBind)
146+ SrcStrictness ->
147+ -- | Argument patterns
148+ [LPat GhcPs] ->
149+ -- | Equations
150+ GRHSs GhcPs (LHsExpr GhcPs) ->
151+ R ()
138152p_match = p_match' exprPlacement p_hsExpr
139153
140−p_match'
141− :: Data body
142− => (body -> Placement) -- ^ How to get body placement
143− -> (body -> R ()) -- ^ How to print body
144− -> MatchGroupStyle -- ^ Style of this group of equations
145− -> Bool -- ^ Is this an infix match?
146− -> SrcStrictness -- ^ Strictness prefix (FunBind)
147− -> [LPat GhcPs] -- ^ Argument patterns
148− -> GRHSs GhcPs (Located body) -- ^ Equations
149− -> R ()
150−p_match' placer pretty style isInfix strictness m_pats m_grhss = do
151− -- NOTE Normally, since patterns may be placed in a multi-line layout, it
152− -- is necessary to bump indentation for the pattern group so it's more
154+p_match' ::
155+ Data body =>
156+ -- | How to get body placement
157+ (body -> Placement) ->
158+ -- | How to print body
159+ (body -> R ()) ->
160+ -- | Style of this group of equations
161+ MatchGroupStyle ->
162+ -- | Is this an infix match?
163+ Bool ->
164+ -- | Strictness prefix (FunBind)
165+ SrcStrictness ->
166+ -- | Argument patterns
167+ [LPat GhcPs] ->
168+ -- | Equations
169+ GRHSs GhcPs (Located body) ->
170+ R ()
171+p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
172+ -- Normally, since patterns may be placed in a multi-line layout, it is
173+ -- necessary to bump indentation for the pattern group so it's more
153174 -- indented than function name. This in turn means that indentation for
154175 -- the body should also be bumped. Normally this would mean that bodies
155176 -- would start with two indentation steps applied, which is ugly, so we
@@ -159,23 +180,24 @@ p_match' placer pretty style isInfix strictness m_pats m_grhss = do
159180 NoSrcStrict -> return ()
160181 SrcStrict -> txt "!"
161182 SrcLazy -> txt "~"
162− inci' <- case NE.nonEmpty m_pats of
163− Nothing -> id <$ case style of
164− Function name -> p_rdrName name
165− _ -> return ()
183+ indentBody <- case NE.nonEmpty m_pats of
184+ Nothing ->
185+ False <$ case style of
186+ Function name -> p_rdrName name
187+ _ -> return ()
166188 Just ne_pats -> do
167− let combinedSpans = combineSrcSpans' $
168− getLoc <$> ne_pats
169− inci' = if isOneLineSpan combinedSpans
170− then id
171− else inci
189+ let combinedSpans = case style of
190+ Function name -> combineSrcSpans (getLoc name) patSpans
191+ _ -> patSpans
192+ patSpans = combineSrcSpans' (getLoc <$> ne_pats)
193+ indentBody = not (isOneLineSpan combinedSpans)
172194 switchLayout [combinedSpans] $ do
173195 let stdCase = sep breakpoint (located' p_pat) m_pats
174196 case style of
175197 Function name ->
176198 p_infixDefHelper
177199 isInfix
178− inci'
200+ indentBody
179201 (p_rdrName name)
180202 (located' p_pat <$> m_pats)
181203 PatternBind -> stdCase
@@ -190,46 +212,40 @@ p_match' placer pretty style isInfix strictness m_pats m_grhss = do
190212 when needsSpace space
191213 sitcc stdCase
192214 LambdaCase -> stdCase
193− return inci'
194− let
195− -- Calculate position of end of patterns. This is useful when we decide
196− -- about putting certain constructions in hanging positions.
197− endOfPats = case NE.nonEmpty m_pats of
198− Nothing -> case style of
199− Function name -> (Just . srcSpanEnd . getLoc) name
200− _ -> Nothing
201− Just pats -> (Just . srcSpanEnd . getLoc . NE.last) pats
202− isCase = \case
203− Case -> True
204− LambdaCase -> True
205− _ -> False
206− let GRHSs {..} = m_grhss
215+ return indentBody
216+ let -- Calculate position of end of patterns. This is useful when we decide
217+ -- about putting certain constructions in hanging positions.
218+ endOfPats = case NE.nonEmpty m_pats of
219+ Nothing -> case style of
220+ Function name -> Just (getLoc name)
221+ _ -> Nothing
222+ Just pats -> (Just . getLoc . NE.last) pats
223+ isCase = \case
224+ Case -> True
225+ LambdaCase -> True
226+ _ -> False
207227 hasGuards = withGuards grhssGRHSs
208− unless (length grhssGRHSs > 1) $ do
209− case style of
210− Function _ | hasGuards -> return ()
211− Function _ -> space >> txt "="
212− PatternBind -> space >> txt "="
213− s | isCase s && hasGuards -> return ()
214− _ -> space >> txt "->"
215− let grhssSpan = combineSrcSpans' $
216− getGRHSSpan . unLoc <$> NE.fromList grhssGRHSs
217− patGrhssSpan = maybe grhssSpan
218− (combineSrcSpans grhssSpan . srcLocSpan) endOfPats
228+ grhssSpan =
229+ combineSrcSpans' $
230+ getGRHSSpan . unLoc <$> NE.fromList grhssGRHSs
231+ patGrhssSpan =
232+ maybe
233+ grhssSpan
234+ (combineSrcSpans grhssSpan . srcLocSpan . srcSpanEnd)
235+ endOfPats
219236 placement =
220237 case endOfPats of
221238 Nothing -> blockPlacement placer grhssGRHSs
222239 Just spn ->
223− if isOneLineSpan
224− (mkSrcSpan spn (srcSpanStart grhssSpan))
240+ if onTheSameLine spn grhssSpan
225241 then blockPlacement placer grhssGRHSs
226242 else Normal
227243 p_body = do
228244 let groupStyle =
229245 if isCase style && hasGuards
230− then RightArrow
231− else EqualSign
232− sep newline (located' (p_grhs' pretty groupStyle)) grhssGRHSs
246+ then RightArrow
247+ else EqualSign
248+ sep newline (located' (p_grhs' placer render groupStyle)) grhssGRHSs
233249 p_where = do
234250 let whereIsEmpty = GHC.isEmptyLocalBindsPR (unLoc grhssLocalBinds)
235251 unless (GHC.eqEmptyLocalBinds (unLoc grhssLocalBinds)) $ do
@@ -237,175 +253,211 @@ p_match' placer pretty style isInfix strictness m_pats m_grhss = do
237253 txt "where"
238254 unless whereIsEmpty breakpoint
239255 inci $ located grhssLocalBinds p_hsLocalBinds
240− inci' $ do
256+ inciIf indentBody $ do
257+ unless (length grhssGRHSs > 1) $
258+ case style of
259+ Function _ | hasGuards -> return ()
260+ Function _ -> space >> inci equals
261+ PatternBind -> space >> inci equals
262+ s | isCase s && hasGuards -> return ()
263+ _ -> space >> txt "->"
241264 switchLayout [patGrhssSpan] $
242265 placeHanging placement p_body
243266 inci p_where
267+p_match' _ _ _ _ _ _ (XGRHSs x) = noExtCon x
244268
245269p_grhs :: GroupStyle -> GRHS GhcPs (LHsExpr GhcPs) -> R ()
246−p_grhs = p_grhs' p_hsExpr
270+p_grhs = p_grhs' exprPlacement p_hsExpr
247271
248−p_grhs'
249− :: Data body
250− => (body -> R ())
251− -> GroupStyle
252− -> GRHS GhcPs (Located body)
253− -> R ()
254−p_grhs' pretty style (GRHS NoExt guards body) =
272+p_grhs' ::
273+ Data body =>
274+ -- | How to get body placement
275+ (body -> Placement) ->
276+ -- | How to print body
277+ (body -> R ()) ->
278+ GroupStyle ->
279+ GRHS GhcPs (Located body) ->
280+ R ()
281+p_grhs' placer render style (GRHS NoExtField guards body) =
255282 case guards of
256283 [] -> p_body
257284 xs -> do
258285 txt "|"
259286 space
260− sitcc (sep (comma >> breakpoint) (sitcc . located' p_stmt) xs)
287+ sitcc (sep commaDel (sitcc . located' p_stmt) xs)
261288 space
262− txt $ case style of
263− EqualSign -> "="
264− RightArrow -> "->"
265− breakpoint
266− inci p_body
289+ inci $ case style of
290+ EqualSign -> equals
291+ RightArrow -> txt "->"
292+ placeHanging placement p_body
267293 where
268− p_body = located body pretty
269−p_grhs' _ _ (XGRHS NoExt) = notImplemented "XGRHS"
294+ placement =
295+ case endOfGuards of
296+ Nothing -> placer (unLoc body)
297+ Just spn ->
298+ if onTheSameLine spn (getLoc body)
299+ then placer (unLoc body)
300+ else Normal
301+ endOfGuards =
302+ case NE.nonEmpty guards of
303+ Nothing -> Nothing
304+ Just gs -> (Just . getLoc . NE.last) gs
305+ p_body = located body render
306+p_grhs' _ _ _ (XGRHS x) = noExtCon x
270307
271308p_hsCmd :: HsCmd GhcPs -> R ()
272309p_hsCmd = \case
273− HsCmdArrApp NoExt body input arrType _ -> do
310+ HsCmdArrApp NoExtField body input arrType _ -> do
274311 located body p_hsExpr
275− space
276− case arrType of
277− HsFirstOrderApp -> txt "-<"
278− HsHigherOrderApp -> txt "-<<"
279− placeHanging (exprPlacement (unLoc input)) $
280− located input p_hsExpr
281− HsCmdArrForm NoExt form Prefix _ cmds -> banana $ sitcc $ do
312+ breakpoint
313+ inci $ do
314+ case arrType of
315+ HsFirstOrderApp -> txt "-<"
316+ HsHigherOrderApp -> txt "-<<"
317+ placeHanging (exprPlacement (unLoc input)) $
318+ located input p_hsExpr
319+ HsCmdArrForm NoExtField form Prefix _ cmds -> banana $ do
282320 located form p_hsExpr
283321 unless (null cmds) $ do
284322 breakpoint
285323 inci (sequence_ (intersperse breakpoint (located' p_hsCmdTop <$> cmds)))
286− HsCmdArrForm NoExt form Infix _ [left, right] -> do
324+ HsCmdArrForm NoExtField form Infix _ [left, right] -> do
287325 located left p_hsCmdTop
288326 space
289327 located form p_hsExpr
290328 placeHanging (cmdTopPlacement (unLoc right)) $
291329 located right p_hsCmdTop
292− HsCmdArrForm NoExt _ Infix _ _ -> notImplemented "HsCmdArrForm"
330+ HsCmdArrForm NoExtField _ Infix _ _ -> notImplemented "HsCmdArrForm"
293331 HsCmdApp {} ->
294332 -- XXX Does this ever occur in the syntax tree? It does not seem like it
295333 -- does. Open an issue and ping @yumiova if this ever occurs in output.
296334 notImplemented "HsCmdApp"
297− HsCmdLam NoExt mgroup -> p_matchGroup' cmdPlacement p_hsCmd Lambda mgroup
298− HsCmdPar NoExt c -> parens (located c p_hsCmd)
299− HsCmdCase NoExt e mgroup -> do
300− txt "case"
301− space
302− located e p_hsExpr
303− space
304− txt "of"
305− breakpoint
306− inci (p_matchGroup' cmdPlacement p_hsCmd Case mgroup)
307− HsCmdIf NoExt _ if' then' else' -> do
308− txt "if"
309− space
310− located if' p_hsExpr
311− breakpoint
312− txt "then"
313− located then' $ \x -> do
314− breakpoint
315− inci (p_hsCmd x)
316− breakpoint
317− txt "else"
318− located else' $ \x -> do
319− breakpoint
320− inci (p_hsCmd x)
321− HsCmdLet NoExt localBinds c -> do
322− txt "let"
323− space
324− sitcc (located localBinds p_hsLocalBinds)
325− breakpoint
326− txt "in"
327− space
328− sitcc (located c p_hsCmd)
329− HsCmdDo NoExt es -> do
335+ HsCmdLam NoExtField mgroup -> p_matchGroup' cmdPlacement p_hsCmd Lambda mgroup
336+ HsCmdPar NoExtField c -> parens N (located c p_hsCmd)
337+ HsCmdCase NoExtField e mgroup ->
338+ p_case cmdPlacement p_hsCmd e mgroup
339+ HsCmdIf NoExtField _ if' then' else' ->
340+ p_if cmdPlacement p_hsCmd if' then' else'
341+ HsCmdLet NoExtField localBinds c ->
342+ p_let p_hsCmd localBinds c
343+ HsCmdDo NoExtField es -> do
330344 txt "do"
331345 newline
332− inci (located es (sitcc . sep newline (located' (sitcc . p_stmt' p_hsCmd))))
346+ inci . located es $
347+ sitcc . sep newline (sitcc . withSpacing (p_stmt' cmdPlacement p_hsCmd))
333348 HsCmdWrap {} -> notImplemented "HsCmdWrap"
334− XCmd {} -> notImplemented "XCmd"
349+ XCmd x -> noExtCon x
335350
336351p_hsCmdTop :: HsCmdTop GhcPs -> R ()
337352p_hsCmdTop = \case
338− HsCmdTop NoExt cmd -> located cmd p_hsCmd
339− XCmdTop {} -> notImplemented "XHsCmdTop"
353+ HsCmdTop NoExtField cmd -> located cmd p_hsCmd
354+ XCmdTop x -> noExtCon x
355+
356+-- | Render an expression preserving blank lines between such consecutive
357+-- expressions found in the original source code.
358+withSpacing ::
359+ -- | Rendering function
360+ (a -> R ()) ->
361+ -- | Entity to render
362+ Located a ->
363+ R ()
364+withSpacing f l = located l $ \x -> do
365+ case getLoc l of
366+ UnhelpfulSpan _ -> f x
367+ RealSrcSpan currentSpn -> do
368+ getSpanMark >>= \case
369+ -- Spacing before comments will be handled by the code
370+ -- that prints comments, so we just have to deal with
371+ -- blank lines between statements here.
372+ Just (StatementSpan lastSpn) ->
373+ if srcSpanStartLine currentSpn > srcSpanEndLine lastSpn + 1
374+ then newline
375+ else return ()
376+ _ -> return ()
377+ f x
378+ -- In some cases the (f x) expression may insert a new mark. We want
379+ -- to be careful not to override comment marks.
380+ getSpanMark >>= \case
381+ Just (HaddockSpan _ _) -> return ()
382+ Just (CommentSpan _) -> return ()
383+ _ -> setSpanMark (StatementSpan currentSpn)
340384
341385p_stmt :: Stmt GhcPs (LHsExpr GhcPs) -> R ()
342−p_stmt = p_stmt' p_hsExpr
386+p_stmt = p_stmt' exprPlacement p_hsExpr
343387
344−p_stmt'
345− :: Data body
346− => (body -> R ())
347− -> Stmt GhcPs (Located body)
348− -> R ()
349−p_stmt' pretty = \case
350− LastStmt NoExt body _ _ -> located body pretty
351− BindStmt NoExt l f _ _ -> do
352− located l p_pat
388+p_stmt' ::
389+ Data body =>
390+ -- | Placer
391+ (body -> Placement) ->
392+ -- | Render
393+ (body -> R ()) ->
394+ -- | Statement to render
395+ Stmt GhcPs (Located body) ->
396+ R ()
397+p_stmt' placer render = \case
398+ LastStmt NoExtField body _ _ -> located body render
399+ BindStmt NoExtField p f _ _ -> do
400+ located p p_pat
353401 space
354402 txt "<-"
355− breakpoint
356− inci (located f pretty)
403+ let loc = getLoc p
404+ placement =
405+ case f of
406+ L l' x ->
407+ if isOneLineSpan
408+ (mkSrcSpan (srcSpanEnd loc) (srcSpanStart l'))
409+ then placer x
410+ else Normal
411+ switchLayout [loc, getLoc f] $
412+ placeHanging placement (located f render)
357413 ApplicativeStmt {} -> notImplemented "ApplicativeStmt" -- generated by renamer
358− BodyStmt NoExt body _ _ -> located body pretty
359− LetStmt NoExt binds -> do
414+ BodyStmt NoExtField body _ _ -> located body render
415+ LetStmt NoExtField binds -> do
360416 txt "let"
361417 space
362418 sitcc $ located binds p_hsLocalBinds
363419 ParStmt {} ->
364− -- NOTE 'ParStmt' should always be eliminated in 'gatherStmt' already,
365− -- such that it never occurs in 'p_stmt''. Consequently, handling it
366− -- here would be redundant.
420+ -- 'ParStmt' should always be eliminated in 'gatherStmt' already, such
421+ -- that it never occurs in 'p_stmt''. Consequently, handling it here
422+ -- would be redundant.
367423 notImplemented "ParStmt"
368− TransStmt {..} -> do
369− -- NOTE 'TransStmt' only needs to account for pretty printing itself,
370− -- since pretty printing of relevant statements (e.g., in 'trS_stmts')
371− -- is handled through 'gatherStmt'.
424+ TransStmt {..} ->
425+ -- 'TransStmt' only needs to account for render printing itself, since
426+ -- pretty printing of relevant statements (e.g., in 'trS_stmts') is
427+ -- handled through 'gatherStmt'.
372428 case (trS_form, trS_by) of
373− (ThenForm, Nothing) -> located trS_using $ \x -> do
429+ (ThenForm, Nothing) -> do
374430 txt "then"
375431 breakpoint
376− inci (p_hsExpr x)
432+ inci $ located trS_using p_hsExpr
377433 (ThenForm, Just e) -> do
378− located trS_using $ \x -> do
379− txt "then"
380− breakpoint
381− inci (p_hsExpr x)
434+ txt "then"
382435 breakpoint
383− located e $ \x -> do
384− txt "by"
385− breakpoint
386− inci (p_hsExpr x)
387− (GroupForm, Nothing) -> located trS_using $ \x -> do
436+ inci $ located trS_using p_hsExpr
437+ breakpoint
438+ txt "by"
439+ breakpoint
440+ inci $ located e p_hsExpr
441+ (GroupForm, Nothing) -> do
388442 txt "then group using"
389443 breakpoint
390− inci (p_hsExpr x)
444+ inci $ located trS_using p_hsExpr
391445 (GroupForm, Just e) -> do
392− located e $ \x -> do
393− txt "then group by"
394− breakpoint
395− inci (p_hsExpr x)
446+ txt "then group by"
396447 breakpoint
397− located trS_using $ \x -> do
398− txt "using"
399− breakpoint
400− inci (p_hsExpr x)
448+ inci $ located e p_hsExpr
449+ breakpoint
450+ txt "using"
451+ breakpoint
452+ inci $ located trS_using p_hsExpr
401453 RecStmt {..} -> do
402454 txt "rec"
403455 space
404− sitcc $ sepSemi (located' (p_stmt' pretty)) recS_stmts
405− XStmtLR {} -> notImplemented "XStmtLR"
456+ sitcc $ sepSemi (withSpacing (p_stmt' placer render)) recS_stmts
457+ XStmtLR c -> noExtCon c
406458
407459gatherStmt :: ExprLStmt GhcPs -> [[ExprLStmt GhcPs]]
408−gatherStmt (L _ (ParStmt NoExt block _ _)) =
460+gatherStmt (L _ (ParStmt NoExtField block _ _)) =
409461 foldr ((<>) . gatherStmtBlock) [] block
410462gatherStmt (L s stmt@TransStmt {..}) =
411463 foldr liftAppend [] ((gatherStmt <$> trS_stmts) <> pure [[L s stmt]])
@@ -414,195 +466,230 @@ gatherStmt stmt = [[stmt]]
414466gatherStmtBlock :: ParStmtBlock GhcPs GhcPs -> [[ExprLStmt GhcPs]]
415467gatherStmtBlock (ParStmtBlock _ stmts _ _) =
416468 foldr (liftAppend . gatherStmt) [] stmts
417−gatherStmtBlock XParStmtBlock {} = notImplemented "XParStmtBlock"
469+gatherStmtBlock (XParStmtBlock x) = noExtCon x
418470
419471p_hsLocalBinds :: HsLocalBindsLR GhcPs GhcPs -> R ()
420472p_hsLocalBinds = \case
421− HsValBinds NoExt (ValBinds NoExt bag lsigs) -> do
422− let ssStart = either
423− (srcSpanStart . getLoc)
424− (srcSpanStart . getLoc)
425− items =
426− (Left <$> bagToList bag) ++ (Right <$> lsigs)
427− p_item (Left x) = located x p_valDecl
428− p_item (Right x) = located x p_sigDecl
429− -- Assigns 'False' to the last element, 'True' to the rest.
430− markInit :: [a] -> [(Bool, a)]
431− markInit [] = []
432− markInit (x:[]) = [(False, x)]
433− markInit (x:xs) = (True, x) : markInit xs
434− -- NOTE When in a single-line layout, there is a chance that the inner
473+ HsValBinds NoExtField (ValBinds NoExtField bag lsigs) -> do
474+ -- When in a single-line layout, there is a chance that the inner
435475 -- elements will also contain semicolons and they will confuse the
436476 -- parser. so we request braces around every element except the last.
437− br <- vlayout (return useBraces) (return id)
438− sitcc $ sepSemi
439− (\(m, i) -> (if m then br else id) $ p_item i)
440− (markInit $ sortOn ssStart items)
441− HsValBinds NoExt _ -> notImplemented "HsValBinds"
442− HsIPBinds NoExt (IPBinds NoExt xs) ->
477+ br <- layoutToBraces <$> getLayout
478+ let items =
479+ let injectLeft (L l x) = L l (Left x)
480+ injectRight (L l x) = L l (Right x)
481+ in (injectLeft <$> bagToList bag) ++ (injectRight <$> lsigs)
482+ positionToBracing = \case
483+ SinglePos -> id
484+ FirstPos -> br
485+ MiddlePos -> br
486+ LastPos -> id
487+ p_item' (p, item) =
488+ positionToBracing p $
489+ withSpacing (either p_valDecl p_sigDecl) item
490+ binds = sortOn (srcSpanStart . getLoc) items
491+ sitcc $ sepSemi p_item' (attachRelativePos binds)
492+ HsValBinds NoExtField _ -> notImplemented "HsValBinds"
493+ HsIPBinds NoExtField (IPBinds NoExtField xs) ->
443494 -- Second argument of IPBind is always Left before type-checking.
444− let p_ipBind (IPBind NoExt (Left name) expr) = do
495+ let p_ipBind (IPBind NoExtField (Left name) expr) = do
445496 atom name
446497 space
447− txt "="
498+ equals
448499 breakpoint
449500 useBraces $ inci $ located expr p_hsExpr
450− p_ipBind _ = notImplemented "XHsIPBinds"
501+ p_ipBind (IPBind NoExtField (Right _) _) =
502+ -- Should only occur after the type checker
503+ notImplemented "IPBind _ (Right _) _"
504+ p_ipBind (XIPBind x) = noExtCon x
451505 in sepSemi (located' p_ipBind) xs
452− HsIPBinds NoExt _ -> notImplemented "HsIpBinds"
453− EmptyLocalBinds NoExt -> return ()
454− XHsLocalBindsLR _ -> notImplemented "XHsLocalBindsLR"
506+ HsIPBinds NoExtField _ -> notImplemented "HsIpBinds"
507+ EmptyLocalBinds NoExtField -> return ()
508+ XHsLocalBindsLR x -> noExtCon x
455509
456−p_hsRecField
457− :: (Data id, Outputable id)
458− => HsRecField' id (LHsExpr GhcPs)
459− -> R ()
460−p_hsRecField = \HsRecField {..} -> do
461− located hsRecFieldLbl atom
510+p_hsRecField ::
511+ HsRecField' RdrName (LHsExpr GhcPs) ->
512+ R ()
513+p_hsRecField HsRecField {..} = do
514+ p_rdrName hsRecFieldLbl
462515 unless hsRecPun $ do
463516 space
464− txt "="
465− let placement = exprPlacement (unLoc hsRecFieldArg)
466− placeHanging placement $ located hsRecFieldArg p_hsExpr
467−
468−p_hsTupArg :: HsTupArg GhcPs -> R ()
469−p_hsTupArg = \case
470− Present NoExt x -> located x p_hsExpr
471− Missing NoExt -> pure ()
472− XTupArg {} -> notImplemented "XTupArg"
517+ equals
518+ let placement =
519+ if onTheSameLine (getLoc hsRecFieldLbl) (getLoc hsRecFieldArg)
520+ then exprPlacement (unLoc hsRecFieldArg)
521+ else Normal
522+ placeHanging placement (located hsRecFieldArg p_hsExpr)
473523
474524p_hsExpr :: HsExpr GhcPs -> R ()
475−p_hsExpr = \case
476− HsVar NoExt name -> p_rdrName name
477− HsUnboundVar NoExt _ -> notImplemented "HsUnboundVar"
478− HsConLikeOut NoExt _ -> notImplemented "HsConLikeOut"
479− HsRecFld NoExt x ->
525+p_hsExpr = p_hsExpr' N
526+
527+p_hsExpr' :: BracketStyle -> HsExpr GhcPs -> R ()
528+p_hsExpr' s = \case
529+ HsVar NoExtField name -> p_rdrName name
530+ HsUnboundVar NoExtField v -> atom (unboundVarOcc v)
531+ HsConLikeOut NoExtField _ -> notImplemented "HsConLikeOut"
532+ HsRecFld NoExtField x ->
480533 case x of
481− Unambiguous NoExt name -> p_rdrName name
482− Ambiguous NoExt name -> p_rdrName name
483− XAmbiguousFieldOcc NoExt -> notImplemented "XAmbiguousFieldOcc"
484− HsOverLabel NoExt _ v -> do
534+ Unambiguous NoExtField name -> p_rdrName name
535+ Ambiguous NoExtField name -> p_rdrName name
536+ XAmbiguousFieldOcc xx -> noExtCon xx
537+ HsOverLabel NoExtField _ v -> do
485538 txt "#"
486539 atom v
487− HsIPVar NoExt (HsIPName name) -> do
540+ HsIPVar NoExtField (HsIPName name) -> do
488541 txt "?"
489542 atom name
490− HsOverLit NoExt v -> atom (ol_val v)
491− HsLit NoExt lit -> atom lit
492− HsLam NoExt mgroup ->
543+ HsOverLit NoExtField v -> atom (ol_val v)
544+ HsLit NoExtField lit ->
545+ case lit of
546+ HsString (SourceText stxt) _ -> p_stringLit stxt
547+ HsStringPrim (SourceText stxt) _ -> p_stringLit stxt
548+ r -> atom r
549+ HsLam NoExtField mgroup ->
493550 p_matchGroup Lambda mgroup
494− HsLamCase NoExt mgroup -> do
551+ HsLamCase NoExtField mgroup -> do
495552 txt "\\case"
496553 breakpoint
497554 inci (p_matchGroup LambdaCase mgroup)
498− HsApp NoExt f x -> sitcc $ do
499− located f p_hsExpr
500− -- Second argument can be a `do` or `case` block with `-XBlockArguments`.
501− placeHanging (exprPlacement (unLoc x)) $
502− located x p_hsExpr
503− HsAppType a e -> do
555+ HsApp NoExtField f x -> do
556+ let -- In order to format function applications with multiple parameters
557+ -- nicer, traverse the AST to gather the function and all the
558+ -- parameters together.
559+ gatherArgs f' knownArgs =
560+ case f' of
561+ L _ (HsApp _ l r) -> gatherArgs l (r <| knownArgs)
562+ _ -> (f', knownArgs)
563+ (func, args) = gatherArgs f (x :| [])
564+ -- We need to handle the last argument specially if it is a
565+ -- hanging construct, so separate it from the rest.
566+ (initp, lastp) = (NE.init args, NE.last args)
567+ initSpan =
568+ combineSrcSpans' $
569+ getLoc f :| [(srcLocSpan . srcSpanStart . getLoc) lastp]
570+ -- Hang the last argument only if the initial arguments span one
571+ -- line.
572+ placement =
573+ if isOneLineSpan initSpan
574+ then exprPlacement (unLoc lastp)
575+ else Normal
576+ -- If the last argument is not hanging, just separate every argument as
577+ -- usual. If it is hanging, print the initial arguments and hang the
578+ -- last one. Also, use braces around the every argument except the last
579+ -- one.
580+ case placement of
581+ Normal -> do
582+ let -- Usually we want to bump indentation for arguments for the
583+ -- sake of readability. However, when the function itself is a
584+ -- do-block or case expression it is not a good idea. It seems
585+ -- to be safe to always bump indentation when the function
586+ -- expression is parenthesised.
587+ doIndent =
588+ case func of
589+ L _ (HsPar NoExtField _) -> True
590+ L _ (HsAppType NoExtField _ _) -> True
591+ L _ (HsMultiIf NoExtField _) -> True
592+ L spn _ -> isOneLineSpan spn
593+ ub <-
594+ getLayout <&> \case
595+ SingleLine -> useBraces
596+ MultiLine -> id
597+ ub $ do
598+ located func (p_hsExpr' s)
599+ breakpoint
600+ inciIf doIndent $ sep breakpoint (located' p_hsExpr) initp
601+ inciIf doIndent $ do
602+ unless (null initp) breakpoint
603+ located lastp p_hsExpr
604+ Hanging -> do
605+ useBraces . switchLayout [initSpan] $ do
606+ located func (p_hsExpr' s)
607+ breakpoint
608+ sep breakpoint (located' p_hsExpr) initp
609+ placeHanging placement $
610+ located lastp p_hsExpr
611+ HsAppType NoExtField e a -> do
504612 located e p_hsExpr
505613 breakpoint
506614 inci $ do
507615 txt "@"
616+ -- Insert a space when the type is represented as a TH splice to avoid
617+ -- gluing @ and $ together.
618+ case unLoc (hswc_body a) of
619+ HsSpliceTy {} -> space
620+ _ -> return ()
508621 located (hswc_body a) p_hsType
509− OpApp NoExt x op y -> do
510− -- NOTE If the beginning of the first argument and the second argument
511− -- are on the same line, and the second argument has a hanging form, use
512− -- hanging placement.
513− let placement =
514− if isOneLineSpan
515− (mkSrcSpan (srcSpanStart (getLoc x)) (srcSpanStart (getLoc y)))
516− then exprPlacement (unLoc y)
517− else Normal
518− opWrapper = case unLoc op of
519− EWildPat NoExt -> backticks
520− _ -> id
521− ub <- vlayout
522− (return useBraces)
523− (return $ case placement of
524− Hanging -> useBraces
525− Normal -> dontUseBraces)
526− ub $ located x p_hsExpr
527− placeHanging placement $ do
528− located op (opWrapper . p_hsExpr)
529− space
530− located y p_hsExpr
531− NegApp NoExt e _ -> do
622+ OpApp NoExtField x op y -> do
623+ let opTree = OpBranch (exprOpTree x) op (exprOpTree y)
624+ p_exprOpTree s (reassociateOpTree getOpName opTree)
625+ NegApp NoExtField e _ -> do
532626 txt "-"
533627 space
534628 located e p_hsExpr
535− HsPar NoExt e -> parens (located e p_hsExpr)
536− SectionL NoExt x op -> do
629+ HsPar NoExtField e ->
630+ parens s (located e (dontUseBraces . p_hsExpr))
631+ SectionL NoExtField x op -> do
537632 located x p_hsExpr
538633 breakpoint
539634 inci (located op p_hsExpr)
540− SectionR NoExt op x -> do
635+ SectionR NoExtField op x -> do
541636 located op p_hsExpr
542− breakpoint
637+ useRecordDot' <- useRecordDot
638+ let isRecordDot' = isRecordDot (unLoc op) (getLoc x)
639+ unless (useRecordDot' && isRecordDot') breakpoint
543640 inci (located x p_hsExpr)
544− ExplicitTuple NoExt args boxity -> do
641+ ExplicitTuple NoExtField args boxity ->
545642 let isSection = any (isMissing . unLoc) args
546643 isMissing = \case
547− Missing NoExt -> True
644+ Missing NoExtField -> True
548645 _ -> False
549− let parens' =
646+ p_arg = \case
647+ Present NoExtField x -> located x p_hsExpr
648+ Missing NoExtField -> pure ()
649+ XTupArg x -> noExtCon x
650+ p_larg = sitcc . located' p_arg
651+ parens' =
550652 case boxity of
551653 Boxed -> parens
552654 Unboxed -> parensHash
553− if isSection
554− then switchLayout [] . parens' $
555− sep comma (located' p_hsTupArg) args
556− else switchLayout (getLoc <$> args) . parens' . sitcc $
557− sep (comma >> breakpoint) (sitcc . located' p_hsTupArg) args
558− ExplicitSum NoExt tag arity e ->
559− p_unboxedSum tag arity (located e p_hsExpr)
560− HsCase NoExt e mgroup -> do
561− txt "case"
562− space
563− located e p_hsExpr
564− space
565− txt "of"
566− breakpoint
567− inci (p_matchGroup Case mgroup)
568− HsIf NoExt _ if' then' else' -> do
569− txt "if"
570− space
571− located if' p_hsExpr
572− breakpoint
573− inci $ do
574− txt "then"
575− located then' $ \x ->
576− placeHanging (exprPlacement x) (p_hsExpr x)
577− breakpoint
578− txt "else"
579− located else' $ \x ->
580− placeHanging (exprPlacement x) (p_hsExpr x)
581− HsMultiIf NoExt guards -> do
655+ in if isSection
656+ then
657+ switchLayout [] . parens' s $
658+ sep comma p_larg args
659+ else
660+ switchLayout (getLoc <$> args) . parens' s $
661+ sep commaDel p_larg args
662+ ExplicitSum NoExtField tag arity e ->
663+ p_unboxedSum N tag arity (located e p_hsExpr)
664+ HsCase NoExtField e mgroup ->
665+ p_case exprPlacement p_hsExpr e mgroup
666+ HsIf NoExtField _ if' then' else' ->
667+ p_if exprPlacement p_hsExpr if' then' else'
668+ HsMultiIf NoExtField guards -> do
582669 txt "if"
583670 breakpoint
584− inci . sitcc $ sep newline (located' (p_grhs RightArrow)) guards
585− HsLet NoExt localBinds e -> sitcc $ do
586− txt "let"
587− space
588− dontUseBraces $ sitcc (located localBinds p_hsLocalBinds)
589− vlayout space (newline >> txt " ")
590− txt "in"
591− space
592− sitcc (located e p_hsExpr)
593− HsDo NoExt ctx es -> do
671+ inci . inci $ sep newline (located' (p_grhs RightArrow)) guards
672+ HsLet NoExtField localBinds e ->
673+ p_let p_hsExpr localBinds e
674+ HsDo NoExtField ctx es -> do
594675 let doBody header = do
595676 txt header
596677 breakpoint
597− ub <- vlayout (return useBraces) (return id)
598− inci $ sepSemi (located' (ub . p_stmt)) (unLoc es)
599− compBody = brackets $ located es $ \xs -> do
600− let p_parBody = sep
601− (breakpoint >> txt "| ")
602− p_seqBody
603− p_seqBody = sitcc . sep
604− (comma >> breakpoint)
605− (located' (sitcc . p_stmt))
678+ ub <- layoutToBraces <$> getLayout
679+ inci $
680+ sepSemi
681+ (ub . withSpacing (p_stmt' exprPlacement (p_hsExpr' S)))
682+ (unLoc es)
683+ compBody = brackets N . located es $ \xs -> do
684+ let p_parBody =
685+ sep
686+ (breakpoint >> txt "|" >> space)
687+ p_seqBody
688+ p_seqBody =
689+ sitcc
690+ . sep
691+ commaDel
692+ (located' (sitcc . p_stmt))
606693 stmts = init xs
607694 yield = last xs
608695 lists = foldr (liftAppend . gatherStmt) [] stmts
@@ -616,76 +703,100 @@ p_hsExpr = \case
616703 MDoExpr -> doBody "mdo"
617704 ListComp -> compBody
618705 MonadComp -> notImplemented "MonadComp"
619− ArrowExpr -> notImplemented "ArrowExpr"
706+ ArrowExpr -> notImplemented "ArrowExpr"
620707 GhciStmtCtxt -> notImplemented "GhciStmtCtxt"
621708 PatGuard _ -> notImplemented "PatGuard"
622709 ParStmtCtxt _ -> notImplemented "ParStmtCtxt"
623710 TransStmtCtxt _ -> notImplemented "TransStmtCtxt"
624711 ExplicitList _ _ xs ->
625− brackets . sitcc $ sep (comma >> breakpoint) (sitcc . located' p_hsExpr) xs
712+ brackets s $
713+ sep commaDel (sitcc . located' p_hsExpr) xs
626714 RecordCon {..} -> do
627715 located rcon_con_name atom
628716 breakpoint
629717 let HsRecFields {..} = rcon_flds
630− fields = located' p_hsRecField <$> rec_flds
718+ updName f =
719+ (f :: HsRecField GhcPs (LHsExpr GhcPs))
720+ { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
721+ FieldOcc _ n -> n
722+ XFieldOcc x -> noExtCon x
723+ }
724+ fields = located' (p_hsRecField . updName) <$> rec_flds
631725 dotdot =
632726 case rec_dotdot of
633727 Just {} -> [txt ".."]
634728 Nothing -> []
635− inci . braces . sitcc $ sep (comma >> breakpoint) sitcc (fields <> dotdot)
729+ inci . braces N $
730+ sep commaDel sitcc (fields <> dotdot)
636731 RecordUpd {..} -> do
637732 located rupd_expr p_hsExpr
638− breakpoint
639− inci . braces . sitcc $
640− sep (comma >> breakpoint) (sitcc . located' p_hsRecField) rupd_flds
641− ExprWithTySig affix x -> sitcc $ do
733+ useRecordDot' <- useRecordDot
734+ let mrs sp = case getLoc sp of
735+ RealSrcSpan r -> Just r
736+ _ -> Nothing
737+ let isPluginForm =
738+ ((1 +) . srcSpanEndCol <$> mrs rupd_expr)
739+ == (srcSpanStartCol <$> mrs (head rupd_flds))
740+ unless (useRecordDot' && isPluginForm) breakpoint
741+ let updName f =
742+ (f :: HsRecUpdField GhcPs)
743+ { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
744+ Ambiguous _ n -> n
745+ Unambiguous _ n -> n
746+ XAmbiguousFieldOcc x -> noExtCon x
747+ }
748+ inci . braces N $
749+ sep
750+ commaDel
751+ (sitcc . located' (p_hsRecField . updName))
752+ rupd_flds
753+ ExprWithTySig NoExtField x HsWC {hswc_body = HsIB {..}} -> sitcc $ do
642754 located x p_hsExpr
755+ space
756+ txt "::"
643757 breakpoint
644− inci $ do
645− txt "::"
646− space
647− let HsWC {..} = affix
648− HsIB {..} = hswc_body
649− located hsib_body p_hsType
650− ArithSeq NoExt _ x -> do
758+ inci $ located hsib_body p_hsType
759+ ExprWithTySig NoExtField _ HsWC {hswc_body = XHsImplicitBndrs x} -> noExtCon x
760+ ExprWithTySig NoExtField _ (XHsWildCardBndrs x) -> noExtCon x
761+ ArithSeq NoExtField _ x ->
651762 case x of
652− From from -> brackets . sitcc $ do
763+ From from -> brackets s $ do
653764 located from p_hsExpr
654765 breakpoint
655766 txt ".."
656− FromThen from next -> brackets . sitcc $ do
657− sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
767+ FromThen from next -> brackets s $ do
768+ sep commaDel (located' p_hsExpr) [from, next]
658769 breakpoint
659770 txt ".."
660− FromTo from to -> brackets . sitcc $ do
771+ FromTo from to -> brackets s $ do
661772 located from p_hsExpr
662773 breakpoint
663774 txt ".."
664775 space
665776 located to p_hsExpr
666− FromThenTo from next to -> brackets . sitcc $ do
667− sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
777+ FromThenTo from next to -> brackets s $ do
778+ sep commaDel (located' p_hsExpr) [from, next]
668779 breakpoint
669780 txt ".."
670781 space
671782 located to p_hsExpr
672− HsSCC NoExt _ name x -> do
783+ HsSCC NoExtField _ name x -> do
673784 txt "{-# SCC "
674785 atom name
675786 txt " #-}"
676787 breakpoint
677788 located x p_hsExpr
678− HsCoreAnn NoExt _ value x -> do
789+ HsCoreAnn NoExtField _ value x -> do
679790 txt "{-# CORE "
680791 atom value
681792 txt " #-}"
682793 breakpoint
683794 located x p_hsExpr
684− HsBracket NoExt x -> p_hsBracket x
795+ HsBracket NoExtField x -> p_hsBracket x
685796 HsRnBracketOut {} -> notImplemented "HsRnBracketOut"
686797 HsTcBracketOut {} -> notImplemented "HsTcBracketOut"
687− HsSpliceE NoExt splice -> p_hsSplice splice
688− HsProc NoExt p e -> do
798+ HsSpliceE NoExtField splice -> p_hsSplice splice
799+ HsProc NoExtField p e -> do
689800 txt "proc"
690801 located p $ \x -> do
691802 breakpoint
@@ -694,64 +805,46 @@ p_hsExpr = \case
694805 txt "->"
695806 placeHanging (cmdTopPlacement (unLoc e)) $
696807 located e p_hsCmdTop
697− HsStatic _ e -> do
808+ HsStatic _ e -> do
698809 txt "static"
699810 breakpoint
700811 inci (located e p_hsExpr)
701− HsArrApp NoExt body input arrType cond ->
702− p_hsCmd (HsCmdArrApp NoExt body input arrType cond)
703− HsArrForm NoExt form mfixity cmds ->
704− p_hsCmd (HsCmdArrForm NoExt form Prefix mfixity cmds)
705812 HsTick {} -> notImplemented "HsTick"
706813 HsBinTick {} -> notImplemented "HsBinTick"
707814 HsTickPragma {} -> notImplemented "HsTickPragma"
708− -- These four constructs should never appear in correct programs.
709− -- See: https://github.com/tweag/ormolu/issues/343
710− EWildPat NoExt -> txt "_"
711− EAsPat NoExt n p -> do
712− p_rdrName n
713− txt "@"
714− located p p_hsExpr
715− EViewPat NoExt p e -> do
716− located p p_hsExpr
717− space
718− txt "->"
719− breakpoint
720− inci (located e p_hsExpr)
721− ELazyPat NoExt p -> do
722− txt "~"
723− located p p_hsExpr
724815 HsWrap {} -> notImplemented "HsWrap"
725− XExpr {} -> notImplemented "XExpr"
816+ XExpr x -> noExtCon x
726817
727818p_patSynBind :: PatSynBind GhcPs GhcPs -> R ()
728819p_patSynBind PSB {..} = do
729− let rhs = case psb_dir of
730− Unidirectional -> do
731− txt "<-"
732− space
733− located psb_def p_pat
734− ImplicitBidirectional -> do
735− txt "="
736− space
737− located psb_def p_pat
738− ExplicitBidirectional mgroup -> do
739− txt "<-"
740− space
741− located psb_def p_pat
742− newline
743− line (txt "where")
744− inci (p_matchGroup (Function psb_id) mgroup)
820+ let rhs = do
821+ space
822+ case psb_dir of
823+ Unidirectional -> do
824+ txt "<-"
825+ breakpoint
826+ located psb_def p_pat
827+ ImplicitBidirectional -> do
828+ equals
829+ breakpoint
830+ located psb_def p_pat
831+ ExplicitBidirectional mgroup -> do
832+ txt "<-"
833+ breakpoint
834+ located psb_def p_pat
835+ newline
836+ txt "where"
837+ newline
838+ inci (p_matchGroup (Function psb_id) mgroup)
745839 txt "pattern"
746840 case psb_args of
747841 PrefixCon xs -> do
748842 space
749843 p_rdrName psb_id
750− inci $ do
844+ inci $ do
751845 switchLayout (getLoc <$> xs) $ do
752846 unless (null xs) breakpoint
753847 sitcc (sep breakpoint p_rdrName xs)
754− breakpoint
755848 rhs
756849 RecCon xs -> do
757850 space
@@ -759,9 +852,8 @@ p_patSynBind PSB {..} = do
759852 inci $ do
760853 switchLayout (getLoc . recordPatSynPatVar <$> xs) $ do
761854 unless (null xs) breakpoint
762− braces . sitcc $
763− sep (comma >> breakpoint) (p_rdrName . recordPatSynPatVar) xs
764− breakpoint
855+ braces N $
856+ sep commaDel (p_rdrName . recordPatSynPatVar) xs
765857 rhs
766858 InfixCon l r -> do
767859 switchLayout [getLoc l, getLoc r] $ do
@@ -772,37 +864,100 @@ p_patSynBind PSB {..} = do
772864 p_rdrName psb_id
773865 space
774866 p_rdrName r
775− inci $ do
776− breakpoint
777− rhs
778−p_patSynBind (XPatSynBind NoExt) = notImplemented "XPatSynBind"
867+ inci rhs
868+p_patSynBind (XPatSynBind x) = noExtCon x
869+
870+p_case ::
871+ Data body =>
872+ -- | Placer
873+ (body -> Placement) ->
874+ -- | Render
875+ (body -> R ()) ->
876+ -- | Expression
877+ LHsExpr GhcPs ->
878+ -- | Match group
879+ MatchGroup GhcPs (Located body) ->
880+ R ()
881+p_case placer render e mgroup = do
882+ txt "case"
883+ space
884+ located e p_hsExpr
885+ space
886+ txt "of"
887+ breakpoint
888+ inci (p_matchGroup' placer render Case mgroup)
889+
890+p_if ::
891+ Data body =>
892+ -- | Placer
893+ (body -> Placement) ->
894+ -- | Render
895+ (body -> R ()) ->
896+ -- | If
897+ LHsExpr GhcPs ->
898+ -- | Then
899+ Located body ->
900+ -- | Else
901+ Located body ->
902+ R ()
903+p_if placer render if' then' else' = do
904+ txt "if"
905+ space
906+ located if' p_hsExpr
907+ breakpoint
908+ inci $ do
909+ txt "then"
910+ space
911+ located then' $ \x ->
912+ placeHanging (placer x) (render x)
913+ breakpoint
914+ txt "else"
915+ space
916+ located else' $ \x ->
917+ placeHanging (placer x) (render x)
918+
919+p_let ::
920+ Data body =>
921+ -- | Render
922+ (body -> R ()) ->
923+ Located (HsLocalBindsLR GhcPs GhcPs) ->
924+ Located body ->
925+ R ()
926+p_let render localBinds e = sitcc $ do
927+ txt "let"
928+ space
929+ dontUseBraces $ sitcc (located localBinds p_hsLocalBinds)
930+ vlayout space (newline >> txt " ")
931+ txt "in"
932+ space
933+ sitcc (located e render)
779934
780935p_pat :: Pat GhcPs -> R ()
781936p_pat = \case
782− WildPat NoExt -> txt "_"
783− VarPat NoExt name -> p_rdrName name
784− LazyPat NoExt pat -> do
937+ WildPat NoExtField -> txt "_"
938+ VarPat NoExtField name -> p_rdrName name
939+ LazyPat NoExtField pat -> do
785940 txt "~"
786941 located pat p_pat
787− AsPat NoExt name pat -> do
942+ AsPat NoExtField name pat -> do
788943 p_rdrName name
789944 txt "@"
790945 located pat p_pat
791− ParPat NoExt pat ->
792− located pat (parens . p_pat)
793− BangPat NoExt pat -> do
946+ ParPat NoExtField pat ->
947+ located pat (parens S . p_pat)
948+ BangPat NoExtField pat -> do
794949 txt "!"
795950 located pat p_pat
796− ListPat NoExt pats -> do
797− brackets . sitcc $ sep (comma >> breakpoint) (located' p_pat) pats
798− TuplePat NoExt pats boxing -> do
799− let f =
951+ ListPat NoExtField pats ->
952+ brackets S $ sep commaDel (located' p_pat) pats
953+ TuplePat NoExtField pats boxing -> do
954+ let parens' =
800955 case boxing of
801− Boxed -> parens
802− Unboxed -> parensHash
803− f . sitcc $ sep (comma >> breakpoint) (sitcc . located' p_pat) pats
804− SumPat NoExt pat tag arity ->
805− p_unboxedSum tag arity (located pat p_pat)
956+ Boxed -> parens S
957+ Unboxed -> parensHash S
958+ parens' $ sep commaDel (sitcc . located' p_pat) pats
959+ SumPat NoExtField pat tag arity ->
960+ p_unboxedSum S tag arity (located pat p_pat)
806961 ConPatIn pat details ->
807962 case details of
808963 PrefixCon xs -> sitcc $ do
@@ -816,37 +971,40 @@ p_pat = \case
816971 let f = \case
817972 Nothing -> txt ".."
818973 Just x -> located x p_pat_hsRecField
819− inci . braces . sitcc . sep (comma >> breakpoint) f $ case dotdot of
820− Nothing -> Just <$> fields
821− Just n -> (Just <$> take n fields) ++ [Nothing]
822− InfixCon x y -> do
823− located x p_pat
824− space
825− p_rdrName pat
826− breakpoint
827− inci (located y p_pat)
974+ inci . braces N . sep commaDel f $
975+ case dotdot of
976+ Nothing -> Just <$> fields
977+ Just (L _ n) -> (Just <$> take n fields) ++ [Nothing]
978+ InfixCon l r -> do
979+ switchLayout [getLoc l, getLoc r] $ do
980+ located l p_pat
981+ breakpoint
982+ inci $ do
983+ p_rdrName pat
984+ space
985+ located r p_pat
828986 ConPatOut {} -> notImplemented "ConPatOut" -- presumably created by renamer?
829− ViewPat NoExt expr pat -> sitcc $ do
987+ ViewPat NoExtField expr pat -> sitcc $ do
830988 located expr p_hsExpr
831989 space
832990 txt "->"
833991 breakpoint
834992 inci (located pat p_pat)
835− SplicePat NoExt splice -> p_hsSplice splice
836− LitPat NoExt p -> atom p
837− NPat NoExt v _ _ -> located v (atom . ol_val)
838− NPlusKPat NoExt n k _ _ _ -> sitcc $ do
993+ SplicePat NoExtField splice -> p_hsSplice splice
994+ LitPat NoExtField p -> atom p
995+ NPat NoExtField v _ _ -> located v (atom . ol_val)
996+ NPlusKPat NoExtField n k _ _ _ -> sitcc $ do
839997 p_rdrName n
840998 breakpoint
841999 inci $ do
8421000 txt "+"
8431001 space
8441002 located k (atom . ol_val)
845− SigPat hswc pat -> do
1003+ SigPat NoExtField pat hswc -> do
8461004 located pat p_pat
8471005 p_typeAscription hswc
8481006 CoPat {} -> notImplemented "CoPat" -- apparently created at some later stage
849− XPat NoExt -> notImplemented "XPat"
1007+ XPat x -> noExtCon x
8501008
8511009p_pat_hsRecField :: HsRecField' (FieldOcc GhcPs) (LPat GhcPs) -> R ()
8521010p_pat_hsRecField HsRecField {..} = do
@@ -854,51 +1012,53 @@ p_pat_hsRecField HsRecField {..} = do
8541012 p_rdrName (rdrNameFieldOcc x)
8551013 unless hsRecPun $ do
8561014 space
857− txt "="
1015+ equals
8581016 breakpoint
8591017 inci (located hsRecFieldArg p_pat)
8601018
861−p_unboxedSum :: ConTag -> Arity -> R () -> R ()
862−p_unboxedSum tag arity m = do
1019+p_unboxedSum :: BracketStyle -> ConTag -> Arity -> R () -> R ()
1020+p_unboxedSum s tag arity m = do
8631021 let before = tag - 1
8641022 after = arity - before - 1
8651023 args = replicate before Nothing <> [Just m] <> replicate after Nothing
866− f (x,i) = do
867− let isFirst = i == 0
868− isLast = i == arity - 1
1024+ f x =
8691025 case x :: Maybe (R ()) of
8701026 Nothing ->
871− unless (isFirst || isLast) space
1027+ space
8721028 Just m' -> do
873− unless isFirst space
1029+ space
8741030 m'
875− unless isLast space
876− parensHash $ sep (txt "|") f (zip args [0..])
1031+ space
1032+ parensHash s $ sep (txt "|") f args
8771033
8781034p_hsSplice :: HsSplice GhcPs -> R ()
8791035p_hsSplice = \case
880− HsTypedSplice NoExt deco _ expr -> p_hsSpliceTH True expr deco
881− HsUntypedSplice NoExt deco _ expr -> p_hsSpliceTH False expr deco
882− HsQuasiQuote NoExt _ quoterName srcSpan str -> do
1036+ HsTypedSplice NoExtField deco _ expr -> p_hsSpliceTH True expr deco
1037+ HsUntypedSplice NoExtField deco _ expr -> p_hsSpliceTH False expr deco
1038+ HsQuasiQuote NoExtField _ quoterName srcSpan str -> do
8831039 txt "["
8841040 p_rdrName (L srcSpan quoterName)
8851041 txt "|"
886− -- NOTE QuasiQuoters often rely on precise custom strings. We cannot do
887− -- any formatting here without potentially breaking someone's code.
1042+ -- QuasiQuoters often rely on precise custom strings. We cannot do any
1043+ -- formatting here without potentially breaking someone's code.
8881044 atom str
8891045 txt "|]"
8901046 HsSpliced {} -> notImplemented "HsSpliced"
891− XSplice {} -> notImplemented "XSplice"
1047+ HsSplicedT {} -> notImplemented "HsSplicedT"
1048+ XSplice x -> noExtCon x
8921049
893−p_hsSpliceTH
894− :: Bool -- ^ Typed splice?
895− -> LHsExpr GhcPs -- ^ Splice expression
896− -> SpliceDecoration -- ^ Splice decoration
897− -> R ()
1050+p_hsSpliceTH ::
1051+ -- | Typed splice?
1052+ Bool ->
1053+ -- | Splice expression
1054+ LHsExpr GhcPs ->
1055+ -- | Splice decoration
1056+ SpliceDecoration ->
1057+ R ()
8981058p_hsSpliceTH isTyped expr = \case
8991059 HasParens -> do
9001060 txt decoSymbol
901− parens (located expr (sitcc . p_hsExpr))
1061+ parens N (located expr (sitcc . p_hsExpr))
9021062 HasDollar -> do
9031063 txt decoSymbol
9041064 located expr (sitcc . p_hsExpr)
@@ -909,17 +1069,17 @@ p_hsSpliceTH isTyped expr = \case
9091069
9101070p_hsBracket :: HsBracket GhcPs -> R ()
9111071p_hsBracket = \case
912− ExpBr NoExt expr -> do
1072+ ExpBr NoExtField expr -> do
9131073 anns <- getEnclosingAnns
9141074 let name = case anns of
915− AnnOpenEQ:_ -> ""
1075+ AnnOpenEQ : _ -> ""
9161076 _ -> "e"
9171077 quote name (located expr p_hsExpr)
918− PatBr NoExt pat -> quote "p" (located pat p_pat)
919− DecBrL NoExt decls -> quote "d" (p_hsDecls Free decls)
920− DecBrG NoExt _ -> notImplemented "DecBrG" -- result of renamer
921− TypBr NoExt ty -> quote "t" (located ty p_hsType)
922− VarBr NoExt isSingleQuote name -> do
1078+ PatBr NoExtField pat -> located pat (quote "p" . p_pat)
1079+ DecBrL NoExtField decls -> quote "d" (p_hsDecls Free decls)
1080+ DecBrG NoExtField _ -> notImplemented "DecBrG" -- result of renamer
1081+ TypBr NoExtField ty -> quote "t" (located ty p_hsType)
1082+ VarBr NoExtField isSingleQuote name -> do
9231083 txt (bool "''" "'" isSingleQuote)
9241084 -- HACK As you can see we use 'noLoc' here to be able to pass name into
9251085 -- 'p_rdrName' since the latter expects a "located" thing. The problem
@@ -927,19 +1087,20 @@ p_hsBracket = \case
9271087 -- turn makes it impossible to detect if there are parentheses around
9281088 -- it, etc. So we have to add parentheses manually assuming they are
9291089 -- necessary for all operators.
930− let isOperator = all
931− (\i -> isPunctuation i || isSymbol i)
932− (showOutputable (rdrNameOcc name))
933− && not (doesNotNeedExtraParens name)
934− wrapper = if isOperator then parens else id
1090+ let isOperator =
1091+ all
1092+ (\i -> isPunctuation i || isSymbol i)
1093+ (showOutputable (rdrNameOcc name))
1094+ && not (doesNotNeedExtraParens name)
1095+ wrapper = if isOperator then parens N else id
9351096 wrapper $ p_rdrName (noLoc name)
936− TExpBr NoExt expr -> do
1097+ TExpBr NoExtField expr -> do
9371098 txt "[||"
9381099 breakpoint'
9391100 located expr p_hsExpr
9401101 breakpoint'
9411102 txt "||]"
942− XBracket {} -> notImplemented "XBracket"
1103+ XBracket x -> noExtCon x
9431104 where
9441105 quote :: Text -> R () -> R ()
9451106 quote name body = do
@@ -952,12 +1113,65 @@ p_hsBracket = \case
9521113 breakpoint'
9531114 txt "|]"
9541115
1116+-- Print the source text of a string literal while indenting
1117+-- gaps correctly.
1118+
1119+p_stringLit :: String -> R ()
1120+p_stringLit src =
1121+ let s = splitGaps src
1122+ singleLine =
1123+ txt $ Text.pack (mconcat s)
1124+ multiLine =
1125+ sitcc $ sep breakpoint (txt . Text.pack) (backslashes s)
1126+ in vlayout singleLine multiLine
1127+ where
1128+ -- Split a string on gaps (backslash delimited whitespaces)
1129+ --
1130+ -- > splitGaps "bar\\ \\fo\\&o" == ["bar", "fo\\&o"]
1131+ splitGaps :: String -> [String]
1132+ splitGaps "" = []
1133+ splitGaps s =
1134+ let -- A backslash and a whitespace starts a "gap"
1135+ p (Just '\\', _, _) = True
1136+ p (_, '\\', Just c) | ghcSpace c = False
1137+ p _ = True
1138+ in case span p (zipPrevNext s) of
1139+ (l, r) ->
1140+ let -- drop the initial '\', any amount of 'ghcSpace', and another '\'
1141+ r' = drop 1 . dropWhile ghcSpace . drop 1 $ map orig r
1142+ in map orig l : splitGaps r'
1143+ -- GHC's definition of whitespaces in strings
1144+ -- See: https://gitlab.haskell.org/ghc/ghc/blob/86753475/compiler/parser/Lexer.x#L1653
1145+ ghcSpace :: Char -> Bool
1146+ ghcSpace c = c <= '\x7f' && is_space c
1147+ -- Add backslashes to the inner side of the strings
1148+ --
1149+ -- > backslashes ["a", "b", "c"] == ["a\\", "\\b\\", "\\c"]
1150+ backslashes :: [String] -> [String]
1151+ backslashes (x : y : xs) = (x ++ "\\") : backslashes (('\\' : y) : xs)
1152+ backslashes xs = xs
1153+ -- Attaches previous and next items to each list element
1154+ zipPrevNext :: [a] -> [(Maybe a, a, Maybe a)]
1155+ zipPrevNext xs =
1156+ let z =
1157+ zip
1158+ (zip (Nothing : map Just xs) xs)
1159+ (map Just (tail xs) ++ repeat Nothing)
1160+ in map (\((p, x), n) -> (p, x, n)) z
1161+ orig (_, x, _) = x
1162+
9551163----------------------------------------------------------------------------
9561164-- Helpers
9571165
1166+-- | Return the wrapping function controlling the use of braces according to
1167+-- the current layout.
1168+layoutToBraces :: Layout -> R () -> R ()
1169+layoutToBraces = \case
1170+ SingleLine -> useBraces
1171+ MultiLine -> id
1172+
9581173-- | Append each element in both lists with semigroups. If one list is shorter
9591174-- than the other, return the rest of the longer list unchanged.
960−
9611175liftAppend :: Semigroup a => [a] -> [a] -> [a]
9621176liftAppend [] [] = []
9631177liftAppend [] (y : ys) = y : ys
@@ -965,14 +1179,13 @@ liftAppend (x : xs) [] = x : xs
9651179liftAppend (x : xs) (y : ys) = x <> y : liftAppend xs ys
9661180
9671181getGRHSSpan :: GRHS GhcPs (Located body) -> SrcSpan
968−getGRHSSpan (GRHS NoExt guards body) =
1182+getGRHSSpan (GRHS NoExtField guards body) =
9691183 combineSrcSpans' $ getLoc body :| map getLoc guards
970−getGRHSSpan (XGRHS NoExt) = notImplemented "XGRHS"
1184+getGRHSSpan (XGRHS x) = noExtCon x
9711185
9721186-- | Place a thing that may have a hanging form. This function handles how
9731187-- to separate it from preceding expressions and whether to bump indentation
9741188-- depending on what sort of expression we have.
975−
9761189placeHanging :: Placement -> R () -> R ()
9771190placeHanging placement m =
9781191 case placement of
@@ -985,67 +1198,165 @@ placeHanging placement m =
9851198
9861199-- | Check if given block contains single expression which has a hanging
9871200-- form.
988−
989−blockPlacement
990− :: (body -> Placement)
991− -> [LGRHS GhcPs (Located body)]
992− -> Placement
993−blockPlacement placer [(L _ (GRHS NoExt _ (L _ x)))] = placer x
1201+blockPlacement ::
1202+ (body -> Placement) ->
1203+ [LGRHS GhcPs (Located body)] ->
1204+ Placement
1205+blockPlacement placer [L _ (GRHS NoExtField _ (L _ x))] = placer x
9941206blockPlacement _ _ = Normal
9951207
9961208-- | Check if given command has a hanging form.
997−
9981209cmdPlacement :: HsCmd GhcPs -> Placement
9991210cmdPlacement = \case
1000− HsCmdLam NoExt _ -> Hanging
1001− HsCmdCase NoExt _ _ -> Hanging
1002− HsCmdDo NoExt _ -> Hanging
1211+ HsCmdLam NoExtField _ -> Hanging
1212+ HsCmdCase NoExtField _ _ -> Hanging
1213+ HsCmdDo NoExtField _ -> Hanging
10031214 _ -> Normal
10041215
10051216cmdTopPlacement :: HsCmdTop GhcPs -> Placement
10061217cmdTopPlacement = \case
1007− HsCmdTop NoExt (L _ x) -> cmdPlacement x
1008− XCmdTop {} -> notImplemented "XCmdTop"
1218+ HsCmdTop NoExtField (L _ x) -> cmdPlacement x
1219+ XCmdTop x -> noExtCon x
10091220
10101221-- | Check if given expression has a hanging form.
1011−
10121222exprPlacement :: HsExpr GhcPs -> Placement
10131223exprPlacement = \case
10141224 -- Only hang lambdas with single line parameter lists
1015− HsLam NoExt mg -> case mg of
1016− MG _ (L _ [L _ (Match NoExt _ (x:xs) _)]) _
1017− | isOneLineSpan (combineSrcSpans' $ fmap getLoc (x :| xs))
1018− -> Hanging
1225+ HsLam NoExtField mg -> case mg of
1226+ MG _ (L _ [L _ (Match NoExtField _ (x : xs) _)]) _
1227+ | isOneLineSpan (combineSrcSpans' $ fmap getLoc (x :| xs)) ->
1228+ Hanging
10191229 _ -> Normal
1020− HsLamCase NoExt _ -> Hanging
1021− HsCase NoExt _ _ -> Hanging
1022− HsDo NoExt DoExpr _ -> Hanging
1023− HsDo NoExt MDoExpr _ -> Hanging
1024− RecordCon NoExt _ _ -> Hanging
1025− -- If the rightmost expression in an operator chain is hanging, make the
1026− -- whole block hanging; so that we can use the common @f = foo $ do@
1027− -- style.
1028− OpApp NoExt _ _ y -> exprPlacement (unLoc y)
1029− HsProc NoExt (L s _) _ ->
1230+ HsLamCase NoExtField _ -> Hanging
1231+ HsCase NoExtField _ _ -> Hanging
1232+ HsDo NoExtField DoExpr _ -> Hanging
1233+ HsDo NoExtField MDoExpr _ -> Hanging
1234+ OpApp NoExtField _ op y ->
1235+ case (fmap getOpNameStr . getOpName . unLoc) op of
1236+ Just "$" -> exprPlacement (unLoc y)
1237+ _ -> Normal
1238+ HsApp NoExtField _ y -> exprPlacement (unLoc y)
1239+ HsProc NoExtField p _ ->
10301240 -- Indentation breaks if pattern is longer than one line and left
10311241 -- hanging. Consequently, only apply hanging when it is safe.
1032− if isOneLineSpan s
1033− then Hanging
1034− else Normal
1242+ if isOneLineSpan (getLoc p)
1243+ then Hanging
1244+ else Normal
10351245 _ -> Normal
10361246
10371247withGuards :: [LGRHS GhcPs (Located body)] -> Bool
10381248withGuards = any (checkOne . unLoc)
10391249 where
10401250 checkOne :: GRHS GhcPs (Located body) -> Bool
1041− checkOne (GRHS NoExt [] _) = False
1251+ checkOne (GRHS NoExtField [] _) = False
10421252 checkOne _ = True
10431253
1044−-- | Get annotations for the enclosing element.
1254+exprOpTree :: LHsExpr GhcPs -> OpTree (LHsExpr GhcPs) (LHsExpr GhcPs)
1255+exprOpTree (L _ (OpApp NoExtField x op y)) = OpBranch (exprOpTree x) op (exprOpTree y)
1256+exprOpTree n = OpNode n
1257+
1258+getOpName :: HsExpr GhcPs -> Maybe RdrName
1259+getOpName = \case
1260+ HsVar NoExtField (L _ a) -> Just a
1261+ _ -> Nothing
1262+
1263+getOpNameStr :: RdrName -> String
1264+getOpNameStr = occNameString . rdrNameOcc
10451265
1266+p_exprOpTree ::
1267+ -- | Bracket style to use
1268+ BracketStyle ->
1269+ OpTree (LHsExpr GhcPs) (LHsExpr GhcPs) ->
1270+ R ()
1271+p_exprOpTree s (OpNode x) = located x (p_hsExpr' s)
1272+p_exprOpTree s (OpBranch x op y) = do
1273+ -- If the beginning of the first argument and the second argument are on
1274+ -- the same line, and the second argument has a hanging form, use hanging
1275+ -- placement.
1276+ let placement =
1277+ if isOneLineSpan
1278+ (mkSrcSpan (srcSpanStart (opTreeLoc x)) (srcSpanStart (opTreeLoc y)))
1279+ then case y of
1280+ OpNode (L _ n) -> exprPlacement n
1281+ _ -> Normal
1282+ else Normal
1283+ -- Distinguish holes used in infix notation.
1284+ -- eg. '1 _foo 2' and '1 `_foo` 2'
1285+ opWrapper = case unLoc op of
1286+ HsUnboundVar NoExtField _ -> backticks
1287+ _ -> id
1288+ layout <- getLayout
1289+ let ub = case layout of
1290+ SingleLine -> useBraces
1291+ MultiLine -> case placement of
1292+ Hanging -> useBraces
1293+ Normal -> dontUseBraces
1294+ opNameStr = (fmap getOpNameStr . getOpName . unLoc) op
1295+ gotDollar = opNameStr == Just "$"
1296+ gotColon = opNameStr == Just ":"
1297+ gotRecordDot = isRecordDot (unLoc op) (opTreeLoc y)
1298+ lhs =
1299+ switchLayout [opTreeLoc x] $
1300+ p_exprOpTree s x
1301+ p_op = located op (opWrapper . p_hsExpr)
1302+ p_y = switchLayout [opTreeLoc y] (p_exprOpTree N y)
1303+ isSection = case (opTreeLoc x, getLoc op) of
1304+ (RealSrcSpan treeSpan, RealSrcSpan opSpan) ->
1305+ srcSpanEndCol treeSpan /= srcSpanStartCol opSpan
1306+ _ -> False
1307+ isDoBlock = \case
1308+ OpNode (L _ HsDo {}) -> True
1309+ _ -> False
1310+ useRecordDot' <- useRecordDot
1311+ if
1312+ | gotColon -> do
1313+ lhs
1314+ space
1315+ p_op
1316+ case placement of
1317+ Hanging -> do
1318+ space
1319+ p_y
1320+ Normal -> do
1321+ breakpoint
1322+ inciIf (isDoBlock y) p_y
1323+ | gotDollar
1324+ && isOneLineSpan (opTreeLoc x)
1325+ && placement == Normal -> do
1326+ useBraces lhs
1327+ space
1328+ p_op
1329+ breakpoint
1330+ inci p_y
1331+ | useRecordDot' && gotRecordDot -> do
1332+ lhs
1333+ when isSection space
1334+ p_op
1335+ p_y
1336+ | otherwise -> do
1337+ ub lhs
1338+ placeHanging placement $ do
1339+ p_op
1340+ space
1341+ p_y
1342+
1343+-- | Return 'True' if given expression is a record-dot operator expression.
1344+isRecordDot ::
1345+ -- | Operator expression
1346+ HsExpr GhcPs ->
1347+ -- | Span of the expression on the right-hand side of the operator
1348+ SrcSpan ->
1349+ Bool
1350+isRecordDot op (RealSrcSpan ySpan) = case op of
1351+ HsVar NoExtField (L (RealSrcSpan opSpan) opName) ->
1352+ (getOpNameStr opName == ".") && (srcSpanEndCol opSpan == srcSpanStartCol ySpan)
1353+ _ -> False
1354+isRecordDot _ _ = False
1355+
1356+-- | Get annotations for the enclosing element.
10461357getEnclosingAnns :: R [AnnKeywordId]
10471358getEnclosingAnns = do
10481359 e <- getEnclosingSpan (const True)
10491360 case e of
10501361 Nothing -> return []
1051− Just e' -> getAnns (RealSrcSpan e')
1362+ Just e' -> getAnns (RealSrcSpan e')
src/Ormolu/Printer/Meat/Declaration/Value.hs-boot+6−7
@@ -1,8 +1,9 @@
11module Ormolu.Printer.Meat.Declaration.Value
2− ( p_valDecl
3− , p_pat
4− , p_hsExpr
5− , p_hsSplice
2+ ( p_valDecl,
3+ p_pat,
4+ p_hsExpr,
5+ p_hsSplice,
6+ p_stringLit,
67 )
78where
89
@@ -10,9 +11,7 @@ import GHC
1011import Ormolu.Printer.Combinators
1112
1213p_valDecl :: HsBindLR GhcPs GhcPs -> R ()
13−
1414p_pat :: Pat GhcPs -> R ()
15−
1615p_hsExpr :: HsExpr GhcPs -> R ()
17−
1816p_hsSplice :: HsSplice GhcPs -> R ()
17+p_stringLit :: String -> R ()
src/Ormolu/Printer/Meat/Declaration/Warning.hs+11−13
@@ -1,9 +1,9 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
33
44module Ormolu.Printer.Meat.Declaration.Warning
5− ( p_warnDecls
6− , p_moduleWarning
5+ ( p_warnDecls,
6+ p_moduleWarning,
77 )
88where
99
@@ -13,30 +13,28 @@ import Data.Text (Text)
1313import GHC
1414import Ormolu.Printer.Combinators
1515import Ormolu.Printer.Meat.Common
16−import Ormolu.Utils
1716
1817p_warnDecls :: WarnDecls GhcPs -> R ()
19−p_warnDecls (Warnings NoExt _ warnings) =
18+p_warnDecls (Warnings NoExtField _ warnings) =
2019 traverse_ (located' p_warnDecl) warnings
21−p_warnDecls XWarnDecls {} = notImplemented "XWarnDecls"
20+p_warnDecls (XWarnDecls x) = noExtCon x
2221
2322p_warnDecl :: WarnDecl GhcPs -> R ()
24−p_warnDecl (Warning NoExt functions warningTxt) =
23+p_warnDecl (Warning NoExtField functions warningTxt) =
2524 p_topLevelWarning functions warningTxt
26−p_warnDecl XWarnDecl {} = notImplemented "XWarnDecl"
25+p_warnDecl (XWarnDecl x) = noExtCon x
2726
2827p_moduleWarning :: WarningTxt -> R ()
2928p_moduleWarning wtxt = do
3029 let (pragmaText, lits) = warningText wtxt
31− switchLayout (getLoc <$> lits) $ do
32− inci $ pragma pragmaText (inci $ p_lits lits)
30+ inci $ pragma pragmaText $ inci $ p_lits lits
3331
3432p_topLevelWarning :: [Located RdrName] -> WarningTxt -> R ()
3533p_topLevelWarning fnames wtxt = do
3634 let (pragmaText, lits) = warningText wtxt
37− switchLayout (fmap getLoc fnames ++ fmap getLoc lits) $ do
35+ switchLayout (fmap getLoc fnames ++ fmap getLoc lits) $
3836 pragma pragmaText . inci $ do
39− sitcc $ sep (comma >> breakpoint) p_rdrName fnames
37+ sep commaDel p_rdrName fnames
4038 breakpoint
4139 p_lits lits
4240
@@ -48,4 +46,4 @@ warningText = \case
4846p_lits :: [Located StringLiteral] -> R ()
4947p_lits = \case
5048 [l] -> atom l
51− ls -> brackets . sitcc $ sep (comma >> breakpoint) atom ls
49+ ls -> brackets N $ sep commaDel atom ls
src/Ormolu/Printer/Meat/ImportExport.hs+83−46
@@ -1,21 +1,19 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
3+{-# LANGUAGE RecordWildCards #-}
44
55-- | Rendering of import and export lists.
6−
76module Ormolu.Printer.Meat.ImportExport
8− ( p_hsmodExports
9− , p_hsmodImport
7+ ( p_hsmodExports,
8+ p_hsmodImport,
109 )
1110where
1211
1312import Control.Monad
1413import GHC
15−import HsImpExp (IE (..))
1614import Ormolu.Printer.Combinators
1715import Ormolu.Printer.Meat.Common
18−import Ormolu.Utils
16+import Ormolu.Utils (RelativePos (..), attachRelativePos)
1917
2018p_hsmodExports :: [LIE GhcPs] -> R ()
2119p_hsmodExports [] = do
@@ -23,67 +21,106 @@ p_hsmodExports [] = do
2321 breakpoint'
2422 txt ")"
2523p_hsmodExports xs =
26− parens . sitcc $ sep (comma >> breakpoint) (sitcc . located' p_lie) xs
24+ parens N $ do
25+ layout <- getLayout
26+ sep
27+ breakpoint
28+ (\(p, l) -> sitcc (located l (p_lie layout p)))
29+ (attachRelativePos xs)
2730
28−p_hsmodImport :: ImportDecl GhcPs -> R ()
29−p_hsmodImport ImportDecl {..} = line $ do
31+p_hsmodImport :: Bool -> ImportDecl GhcPs -> R ()
32+p_hsmodImport useQualifiedPost ImportDecl {..} = do
3033 txt "import"
3134 space
3235 when ideclSource (txt "{-# SOURCE #-}")
3336 space
3437 when ideclSafe (txt "safe")
3538 space
36− when ideclQualified (txt "qualified")
39+ when
40+ (isImportDeclQualified ideclQualified && not useQualifiedPost)
41+ (txt "qualified")
3742 space
3843 case ideclPkgQual of
3944 Nothing -> return ()
4045 Just slit -> atom slit
4146 space
42− located ideclName atom
43− case ideclAs of
44− Nothing -> return ()
45− Just l -> do
46− space
47− txt "as"
48− space
49− located l atom
50− space
51− case ideclHiding of
52− Nothing -> return ()
53− Just (hiding, _) ->
54− when hiding (txt "hiding")
55− case ideclHiding of
56− Nothing -> return ()
57− Just (_, (L _ a)) -> do
58− breakpoint
59− inci . parens . sitcc $
60− sep (comma >> breakpoint) (sitcc . located' p_lie) a
61−p_hsmodImport (XImportDecl NoExt) = notImplemented "XImportDecl"
47+ inci $ do
48+ located ideclName atom
49+ when
50+ (isImportDeclQualified ideclQualified && useQualifiedPost)
51+ (space >> txt "qualified")
52+ case ideclAs of
53+ Nothing -> return ()
54+ Just l -> do
55+ space
56+ txt "as"
57+ space
58+ located l atom
59+ space
60+ case ideclHiding of
61+ Nothing -> return ()
62+ Just (hiding, _) ->
63+ when hiding (txt "hiding")
64+ case ideclHiding of
65+ Nothing -> return ()
66+ Just (_, L _ xs) -> do
67+ breakpoint
68+ parens N $ do
69+ layout <- getLayout
70+ sep
71+ breakpoint
72+ (\(p, l) -> sitcc (located l (p_lie layout p)))
73+ (attachRelativePos xs)
74+ newline
75+p_hsmodImport _ (XImportDecl x) = noExtCon x
6276
63−p_lie :: IE GhcPs -> R ()
64−p_lie = \case
65− IEVar NoExt l1 -> located l1 p_ieWrappedName
66− IEThingAbs NoExt l1 -> located l1 p_ieWrappedName
67− IEThingAll NoExt l1 -> do
77+p_lie :: Layout -> RelativePos -> IE GhcPs -> R ()
78+p_lie encLayout relativePos = \case
79+ IEVar NoExtField l1 -> do
80+ located l1 p_ieWrappedName
81+ p_comma
82+ IEThingAbs NoExtField l1 -> do
83+ located l1 p_ieWrappedName
84+ p_comma
85+ IEThingAll NoExtField l1 -> do
6886 located l1 p_ieWrappedName
6987 space
7088 txt "(..)"
71− IEThingWith NoExt l1 w xs _ -> sitcc $ do
72− -- XXX I have no idea what field labels are in this context.
89+ p_comma
90+ IEThingWith NoExtField l1 w xs _ -> sitcc $ do
7391 located l1 p_ieWrappedName
7492 breakpoint
7593 inci $ do
7694 let names :: [R ()]
7795 names = located' p_ieWrappedName <$> xs
78− parens . sitcc . sep (comma >> breakpoint) sitcc $
96+ parens N . sep commaDel sitcc $
7997 case w of
8098 NoIEWildcard -> names
8199 IEWildcard n ->
82100 let (before, after) = splitAt n names
83− in before ++ [txt ".."] ++ after
84− IEModuleContents NoExt l1 -> located l1 p_hsmodName
85− -- XXX I have no idea what these things are for.
86− IEGroup NoExt _ _ -> return ()
87− IEDoc NoExt _ -> return ()
88− IEDocNamed NoExt _ -> return ()
89− XIE NoExt -> notImplemented "XIE"
101+ in before ++ [txt ".."] ++ after
102+ p_comma
103+ IEModuleContents NoExtField l1 -> do
104+ located l1 p_hsmodName
105+ p_comma
106+ IEGroup NoExtField n str -> do
107+ case relativePos of
108+ SinglePos -> return ()
109+ FirstPos -> return ()
110+ MiddlePos -> newline
111+ LastPos -> newline
112+ p_hsDocString (Asterisk n) False (noLoc str)
113+ IEDoc NoExtField str ->
114+ p_hsDocString Pipe False (noLoc str)
115+ IEDocNamed NoExtField str -> p_hsDocName str
116+ XIE x -> noExtCon x
117+ where
118+ p_comma =
119+ case encLayout of
120+ SingleLine ->
121+ case relativePos of
122+ SinglePos -> return ()
123+ FirstPos -> comma
124+ MiddlePos -> comma
125+ LastPos -> return ()
126+ MultiLine -> comma
src/Ormolu/Printer/Meat/Module.hs+49−42
@@ -1,19 +1,20 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
3+{-# LANGUAGE RecordWildCards #-}
44
55-- | Rendering of modules.
6−
76module Ormolu.Printer.Meat.Module
8− ( p_hsModule
7+ ( p_hsModule,
98 )
109where
1110
1211import Control.Monad
13−import Data.Maybe (isJust)
12+import qualified Data.Text as T
1413import GHC
15−import Ormolu.Imports
14+import Ormolu.Imports (normalizeImports)
15+import Ormolu.Parser.CommentStream
1616import Ormolu.Parser.Pragma
17+import Ormolu.Parser.Shebang
1718import Ormolu.Printer.Combinators
1819import Ormolu.Printer.Comments
1920import Ormolu.Printer.Meat.Common
@@ -22,49 +23,55 @@ import Ormolu.Printer.Meat.Declaration.Warning
2223import Ormolu.Printer.Meat.ImportExport
2324import Ormolu.Printer.Meat.Pragma
2425
25−p_hsModule :: [Pragma] -> ParsedSource -> R ()
26−p_hsModule pragmas (L moduleSpan HsModule {..}) = do
27− -- NOTE If span of exports in multiline, the whole thing is multiline.
28− -- This is especially important because span of module itself always seems
29− -- to have length zero, so it's not reliable for layout selection.
30− let exportSpans = maybe [] (\(L s _) -> [s]) hsmodExports
31− deprecSpan = maybe [] (\(L s _) -> [s]) hsmodDeprecMessage
32− spans' = exportSpans ++ deprecSpan ++ [moduleSpan]
33− switchLayout spans' $ do
34− let hasLangPragmas = not (null pragmas)
35− hasModuleHeader = isJust hsmodName
36− hasImports = not (null hsmodImports)
37− hasDecls = not (null hsmodDecls)
38− p_pragmas pragmas
39− when (hasLangPragmas &&
40− (hasModuleHeader || hasImports || hasDecls)) $
26+-- | Render a module.
27+p_hsModule ::
28+ -- | Stack header
29+ Maybe (RealLocated Comment) ->
30+ -- | Shebangs
31+ [Shebang] ->
32+ -- | Pragmas and the associated comments
33+ [([RealLocated Comment], Pragma)] ->
34+ -- | Whether to use postfix qualified imports
35+ Bool ->
36+ -- | AST to print
37+ HsModule GhcPs ->
38+ R ()
39+p_hsModule mstackHeader shebangs pragmas qualifiedPost HsModule {..} = do
40+ let deprecSpan = maybe [] (\(L s _) -> [s]) hsmodDeprecMessage
41+ exportSpans = maybe [] (\(L s _) -> [s]) hsmodExports
42+ switchLayout (deprecSpan <> exportSpans) $ do
43+ forM_ shebangs $ \(Shebang x) ->
44+ located x $ \shebang -> do
45+ txt (T.pack shebang)
46+ newline
47+ forM_ mstackHeader $ \(L spn comment) -> do
48+ spitCommentNow spn comment
4149 newline
50+ newline
51+ p_pragmas pragmas
52+ newline
4253 case hsmodName of
43− Nothing -> pure ()
44− Just hsmodName' -> line $ do
45− located hsmodName' p_hsmodName
54+ Nothing -> return ()
55+ Just hsmodName' -> do
56+ located hsmodName' $ \name -> do
57+ forM_ hsmodHaddockModHeader (p_hsDocString Pipe True)
58+ p_hsmodName name
59+ breakpoint
4660 forM_ hsmodDeprecMessage $ \w -> do
47− breakpoint
4861 located' p_moduleWarning w
62+ breakpoint
4963 case hsmodExports of
5064 Nothing -> return ()
51− Just hsmodExports' -> do
65+ Just l -> do
66+ located l $ \exports -> do
67+ inci (p_hsmodExports exports)
5268 breakpoint
53− inci (p_hsmodExports (unLoc hsmodExports'))
54− breakpoint
5569 txt "where"
56− when (hasImports || hasDecls) newline
57− forM_ (sortImports hsmodImports) (located' p_hsmodImport)
58− when (hasImports && hasDecls) newline
59− switchLayout (map getLoc hsmodDecls) $ do
60− p_hsDecls Free hsmodDecls
61− trailingComments <- hasMoreComments
62− when hasDecls $ do
63− newlineModified <- isNewlineModified
6470 newline
65− -- In this case we need to insert a newline between the comments
66− -- output as a side effect of the previous newline and trailing
67− -- comments to prevent them from merging.
68− when (newlineModified && trailingComments) newline
69− when (trailingComments && hasModuleHeader) newline
71+ newline
72+ forM_ (normalizeImports hsmodImports) (located' (p_hsmodImport qualifiedPost))
73+ newline
74+ switchLayout (getLoc <$> hsmodDecls) $ do
75+ p_hsDecls Free hsmodDecls
76+ newline
7077 spitRemainingComments
src/Ormolu/Printer/Meat/Pragma.hs+74−20
@@ -1,37 +1,91 @@
1−-- | Pretty-printing of language pragmas.
2−
3−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
42{-# LANGUAGE OverloadedStrings #-}
5−{-# LANGUAGE TupleSections #-}
3+{-# LANGUAGE TupleSections #-}
64
5+-- | Pretty-printing of language pragmas.
76module Ormolu.Printer.Meat.Pragma
8− ( p_pragmas
7+ ( p_pragmas,
98 )
109where
1110
12−import Ormolu.Printer.Combinators
13−import Ormolu.Parser.Pragma (Pragma (..))
14−import qualified Data.Set as S
11+import Control.Monad
12+import Data.Char (isUpper)
13+import qualified Data.List as L
14+import Data.Maybe (listToMaybe)
1515import qualified Data.Text as T
16+import Ormolu.Parser.CommentStream
17+import Ormolu.Parser.Pragma (Pragma (..))
18+import Ormolu.Printer.Combinators
19+import Ormolu.Printer.Comments
20+import SrcLoc
1621
17−data PragmaTy = Language | OptionsGHC | OptionsHaddock
22+-- | Pragma classification.
23+data PragmaTy
24+ = Language LanguagePragmaClass
25+ | OptionsGHC
26+ | OptionsHaddock
1827 deriving (Eq, Ord)
1928
20−p_pragmas :: [Pragma] -> R ()
21−p_pragmas ps =
22− let prepare = concatMap $ \case
23− PragmaLanguage xs -> (Language,) <$> xs
24− PragmaOptionsGHC x -> [(OptionsGHC, x)]
25− PragmaOptionsHaddock x -> [(OptionsHaddock, x)]
26− in mapM_ (uncurry p_pragma) (S.toAscList . S.fromList . prepare $ ps)
29+-- | Language pragma classification.
30+--
31+-- The order in which language pragmas are put in the input sometimes
32+-- matters. This is because some language extensions can enable other
33+-- extensions, yet the extensions coming later in the list have the ability
34+-- to change it. So here we classify all extensions by assigning one of the
35+-- four groups to them. Then we only sort inside of the groups.
36+--
37+-- 'Ord' instance of this data type is what affects the sorting.
38+--
39+-- See also: <https://github.com/tweag/ormolu/issues/404>
40+data LanguagePragmaClass
41+ = -- | All other extensions
42+ Normal
43+ | -- | Extensions starting with "No"
44+ Disabling
45+ | -- | Extensions that should go after everything else
46+ Final
47+ deriving (Eq, Ord)
2748
28−p_pragma :: PragmaTy -> String -> R ()
29−p_pragma ty c = line $ do
49+-- | Print a collection of 'Pragma's with their associated comments.
50+p_pragmas :: [([RealLocated Comment], Pragma)] -> R ()
51+p_pragmas ps = do
52+ let prepare = L.sortOn snd . L.nub . concatMap analyze
53+ analyze = \case
54+ (cs, PragmaLanguage xs) ->
55+ let f x = (cs, (Language (classifyLanguagePragma x), x))
56+ in f <$> xs
57+ (cs, PragmaOptionsGHC x) -> [(cs, (OptionsGHC, x))]
58+ (cs, PragmaOptionsHaddock x) -> [(cs, (OptionsHaddock, x))]
59+ forM_ (prepare ps) $ \(cs, (pragmaTy, x)) ->
60+ p_pragma cs pragmaTy x
61+
62+p_pragma :: [RealLocated Comment] -> PragmaTy -> String -> R ()
63+p_pragma comments ty x = do
64+ forM_ comments $ \(L l comment) -> do
65+ spitCommentNow l comment
66+ newline
3067 txt "{-# "
3168 txt $ case ty of
32− Language -> "LANGUAGE"
69+ Language _ -> "LANGUAGE"
3370 OptionsGHC -> "OPTIONS_GHC"
3471 OptionsHaddock -> "OPTIONS_HADDOCK"
3572 space
36− txt (T.pack c)
73+ txt (T.pack x)
3774 txt " #-}"
75+ newline
76+
77+-- | Classify a 'LanguagePragma'.
78+classifyLanguagePragma :: String -> LanguagePragmaClass
79+classifyLanguagePragma = \case
80+ "ImplicitPrelude" -> Final
81+ "CUSKs" -> Final
82+ str ->
83+ case splitAt 2 str of
84+ ("No", rest) ->
85+ case listToMaybe rest of
86+ Nothing -> Normal
87+ Just x ->
88+ if isUpper x
89+ then Disabling
90+ else Normal
91+ _ -> Normal
src/Ormolu/Printer/Meat/Type.hs+192−128
@@ -1,124 +1,137 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
3+{-# LANGUAGE RecordWildCards #-}
44
55-- | Rendering of types.
6−
76module Ormolu.Printer.Meat.Type
8− ( p_hsType
9− , p_hsContext
10− , p_hsTyVarBndr
11− , p_conDeclFields
12− , tyVarsToTypes
7+ ( p_hsType,
8+ p_hsTypePostDoc,
9+ hasDocStrings,
10+ p_hsContext,
11+ p_hsTyVarBndr,
12+ p_forallBndrs,
13+ p_conDeclFields,
14+ tyVarsToTypes,
1315 )
1416where
1517
16−import GHC
18+import Data.Data (Data)
19+import GHC hiding (isPromoted)
1720import Ormolu.Printer.Combinators
1821import Ormolu.Printer.Meat.Common
22+import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration.Value (p_hsSplice, p_stringLit)
23+import Ormolu.Printer.Operators
1924import Ormolu.Utils
20−import SrcLoc (combineSrcSpans)
21−import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration.Value (p_hsSplice)
2225
2326p_hsType :: HsType GhcPs -> R ()
24−p_hsType = \case
25− HsForAllTy NoExt bndrs t -> do
26− txt "forall "
27− sep space (located' p_hsTyVarBndr) bndrs
28− txt "."
29− space
30− p_hsType (unLoc t)
31− HsQualTy NoExt qs t -> do
27+p_hsType t = p_hsType' (hasDocStrings t) PipeStyle t
28+
29+p_hsTypePostDoc :: HsType GhcPs -> R ()
30+p_hsTypePostDoc t = p_hsType' (hasDocStrings t) CaretStyle t
31+
32+-- | How to render Haddocks associated with a type.
33+data TypeDocStyle
34+ = PipeStyle
35+ | CaretStyle
36+
37+p_hsType' :: Bool -> TypeDocStyle -> HsType GhcPs -> R ()
38+p_hsType' multilineArgs docStyle = \case
39+ HsForAllTy NoExtField visibility bndrs t -> do
40+ p_forallBndrs visibility p_hsTyVarBndr bndrs
41+ interArgBreak
42+ p_hsTypeR (unLoc t)
43+ HsQualTy NoExtField qs t -> do
3244 located qs p_hsContext
33− breakpoint
34− txt "=>"
3545 space
46+ txt "=>"
47+ interArgBreak
3648 case unLoc t of
37− HsQualTy {} -> p_hsType (unLoc t)
38− HsFunTy {} -> p_hsType (unLoc t)
39− _ -> located t p_hsType
40− HsTyVar NoExt p n -> do
49+ HsQualTy {} -> p_hsTypeR (unLoc t)
50+ HsFunTy {} -> p_hsTypeR (unLoc t)
51+ _ -> located t p_hsTypeR
52+ HsTyVar NoExtField p n -> do
4153 case p of
42− Promoted -> do
54+ IsPromoted -> do
4355 txt "'"
4456 case showOutputable (unLoc n) of
4557 _ : '\'' : _ -> space
4658 _ -> return ()
4759 NotPromoted -> return ()
4860 p_rdrName n
49− HsAppTy NoExt f x -> sitcc $ do
50− located f p_hsType
61+ HsAppTy NoExtField f x -> do
62+ let -- In order to format type applications with multiple parameters
63+ -- nicer, traverse the AST to gather the function and all the
64+ -- parameters together.
65+ gatherArgs f' knownArgs =
66+ case f' of
67+ L _ (HsAppTy _ l r) -> gatherArgs l (r : knownArgs)
68+ _ -> (f', knownArgs)
69+ (func, args) = gatherArgs f [x]
70+ switchLayout (getLoc f : fmap getLoc args) . sitcc $ do
71+ located func p_hsType
72+ breakpoint
73+ inci $
74+ sep breakpoint (located' p_hsType) args
75+ HsAppKindTy _ ty kd -> sitcc $ do
76+ -- The first argument is the location of the "@..." part. Not 100% sure,
77+ -- but I think we can ignore it as long as we use 'located' on both the
78+ -- type and the kind.
79+ located ty p_hsType
5180 breakpoint
52− inci (located x p_hsType)
53− HsFunTy NoExt x y@(L _ y') -> do
81+ inci $ do
82+ txt "@"
83+ located kd p_hsType
84+ HsFunTy NoExtField x y@(L _ y') -> do
5485 located x p_hsType
55− breakpoint
56− txt "->"
5786 space
87+ txt "->"
88+ interArgBreak
5889 case y' of
59− HsFunTy{} -> p_hsType y'
60− _ -> located y p_hsType
61− HsListTy NoExt t -> located t (brackets . p_hsType)
62− HsTupleTy NoExt tsort xs ->
90+ HsFunTy {} -> p_hsTypeR y'
91+ _ -> located y p_hsTypeR
92+ HsListTy NoExtField t ->
93+ located t (brackets N . p_hsType)
94+ HsTupleTy NoExtField tsort xs ->
6395 let parens' =
6496 case tsort of
65− HsUnboxedTuple -> parensHash
66− HsBoxedTuple -> parens
67− HsConstraintTuple -> parens
68− HsBoxedOrConstraintTuple -> parens
69− in parens' . sitcc $
70− sep (comma >> breakpoint) (sitcc . located' p_hsType) xs
71− HsSumTy NoExt xs ->
72− parensHash . sitcc $
97+ HsUnboxedTuple -> parensHash N
98+ HsBoxedTuple -> parens N
99+ HsConstraintTuple -> parens N
100+ HsBoxedOrConstraintTuple -> parens N
101+ in parens' $ sep commaDel (sitcc . located' p_hsType) xs
102+ HsSumTy NoExtField xs ->
103+ parensHash N $
73104 sep (txt "|" >> breakpoint) (sitcc . located' p_hsType) xs
74− HsOpTy NoExt x op y -> sitcc $ do
75− -- In the AST, type operators are right-associative instead of left-associative
76− -- like value level operators. This makes similar constructs look inconsistent.
77− -- Here, we shake the AST to convert right-associative tree to a left-associative
78− -- one.
79− case unLoc y of
80− HsOpTy NoExt x' op' y' ->
81− p_hsType $
82− HsOpTy
83− NoExt
84− (L (combineSrcSpans (getLoc x) (getLoc x')) (HsOpTy NoExt x op x'))
85− op'
86− y'
87− _ -> do
88− located x p_hsType
89− breakpoint
90− inci $ do
91− p_rdrName op
92− space
93− located y p_hsType
94− HsParTy NoExt (L _ t@HsKindSig {}) ->
95− -- NOTE Kind signatures already put parentheses around in all cases, so
96− -- skip this layer of parentheses. The reason for this behavior is that
97− -- parentheses are not always encoded with 'HsParTy', but seem to be
98− -- always necessary when we have kind signatures in place.
99− p_hsType t
100− HsParTy NoExt t ->
101− parens (located t p_hsType)
102− HsIParamTy NoExt n t -> sitcc $ do
105+ HsOpTy NoExtField x op y ->
106+ sitcc $
107+ let opTree = OpBranch (tyOpTree x) op (tyOpTree y)
108+ in p_tyOpTree (reassociateOpTree Just opTree)
109+ HsParTy NoExtField t ->
110+ parens N (located t p_hsType)
111+ HsIParamTy NoExtField n t -> sitcc $ do
103112 located n atom
113+ space
114+ txt "::"
104115 breakpoint
105− inci $ do
106− txt "::"
107− space
108− located t p_hsType
109− HsStarTy NoExt _ -> txt "*"
110− HsKindSig NoExt t k ->
111− -- NOTE Also see the comment for 'HsParTy'.
112− parens . sitcc $ do
113− located t p_hsType
114− space -- FIXME
115− inci $ do
116− txt "::"
117− space
118− located k p_hsType
119− HsSpliceTy NoExt splice -> p_hsSplice splice
120− HsDocTy NoExt _ _ -> error "HsDocTy"
121− HsBangTy NoExt (HsSrcBang _ u s) t -> do
116+ inci (located t p_hsType)
117+ HsStarTy NoExtField _ -> txt "*"
118+ HsKindSig NoExtField t k -> sitcc $ do
119+ located t p_hsType
120+ space
121+ txt "::"
122+ breakpoint
123+ inci (located k p_hsType)
124+ HsSpliceTy NoExtField splice -> p_hsSplice splice
125+ HsDocTy NoExtField t str ->
126+ case docStyle of
127+ PipeStyle -> do
128+ p_hsDocString Pipe True str
129+ located t p_hsType
130+ CaretStyle -> do
131+ located t p_hsType
132+ newline
133+ p_hsDocString Caret False str
134+ HsBangTy NoExtField (HsSrcBang _ u s) t -> do
122135 case u of
123136 SrcUnpack -> txt "{-# UNPACK #-}" >> space
124137 SrcNoUnpack -> txt "{-# NOUNPACK #-}" >> space
@@ -128,71 +141,117 @@ p_hsType = \case
128141 SrcStrict -> txt "!"
129142 NoSrcStrict -> return ()
130143 located t p_hsType
131− HsRecTy NoExt fields ->
144+ HsRecTy NoExtField fields ->
132145 p_conDeclFields fields
133− HsExplicitListTy NoExt p xs -> do
146+ HsExplicitListTy NoExtField p xs -> do
134147 case p of
135− Promoted -> txt "'"
148+ IsPromoted -> txt "'"
136149 NotPromoted -> return ()
137− brackets $ do
150+ brackets N $ do
138151 -- If both this list itself and the first element is promoted,
139152 -- we need to put a space in between or it fails to parse.
140153 case (p, xs) of
141− (Promoted, ((L _ t):_)) | isPromoted t -> space
154+ (IsPromoted, L _ t : _) | isPromoted t -> space
142155 _ -> return ()
143− sitcc $ sep (comma >> breakpoint) (sitcc . located' p_hsType) xs
144− HsExplicitTupleTy NoExt xs -> do
156+ sep commaDel (sitcc . located' p_hsType) xs
157+ HsExplicitTupleTy NoExtField xs -> do
145158 txt "'"
146− parens $ do
159+ parens N $ do
147160 case xs of
148− ((L _ t):_) | isPromoted t -> space
161+ L _ t : _ | isPromoted t -> space
149162 _ -> return ()
150− sep (comma >> breakpoint) (located' p_hsType) xs
151− HsTyLit NoExt t -> atom t
152− HsWildCardTy NoExt -> txt "_"
163+ sep commaDel (located' p_hsType) xs
164+ HsTyLit NoExtField t ->
165+ case t of
166+ HsStrTy (SourceText s) _ -> p_stringLit s
167+ a -> atom a
168+ HsWildCardTy NoExtField -> txt "_"
153169 XHsType (NHsCoreTy t) -> atom t
154170 where
155171 isPromoted = \case
156− HsTyVar _ Promoted _ -> True
157− HsExplicitListTy _ _ _ -> True
158− HsExplicitTupleTy _ _ -> True
172+ HsTyVar _ IsPromoted _ -> True
173+ HsExplicitTupleTy {} -> True
174+ HsExplicitListTy {} -> True
159175 _ -> False
176+ interArgBreak =
177+ if multilineArgs
178+ then newline
179+ else breakpoint
180+ p_hsTypeR = p_hsType' multilineArgs docStyle
181+
182+-- | Return 'True' if at least one argument in 'HsType' has a doc string
183+-- attached to it.
184+hasDocStrings :: HsType GhcPs -> Bool
185+hasDocStrings = \case
186+ HsDocTy {} -> True
187+ HsFunTy _ (L _ x) (L _ y) -> hasDocStrings x || hasDocStrings y
188+ _ -> False
160189
161190p_hsContext :: HsContext GhcPs -> R ()
162191p_hsContext = \case
163192 [] -> txt "()"
164193 [x] -> located x p_hsType
165− xs -> parens . sitcc $
166− sep (comma >> breakpoint) (sitcc . located' p_hsType) xs
194+ xs -> parens N $ sep commaDel (sitcc . located' p_hsType) xs
167195
168196p_hsTyVarBndr :: HsTyVarBndr GhcPs -> R ()
169197p_hsTyVarBndr = \case
170− UserTyVar NoExt x ->
198+ UserTyVar NoExtField x ->
171199 p_rdrName x
172− KindedTyVar NoExt l k -> parens $ do
200+ KindedTyVar NoExtField l k -> parens N $ do
173201 located l atom
202+ space
203+ txt "::"
204+ breakpoint
205+ inci (located k p_hsType)
206+ XTyVarBndr x -> noExtCon x
207+
208+-- | Render several @forall@-ed variables.
209+p_forallBndrs :: Data a => ForallVisFlag -> (a -> R ()) -> [Located a] -> R ()
210+p_forallBndrs ForallInvis _ [] = txt "forall."
211+p_forallBndrs ForallVis _ [] = txt "forall ->"
212+p_forallBndrs vis p tyvars =
213+ switchLayout (getLoc <$> tyvars) $ do
214+ txt "forall"
174215 breakpoint
175216 inci $ do
176− txt "::"
177− space
178− located k p_hsType
179− XTyVarBndr NoExt -> notImplemented "XTyVarBndr"
217+ sitcc $ sep breakpoint (sitcc . located' p) tyvars
218+ case vis of
219+ ForallInvis -> txt "."
220+ ForallVis -> space >> txt "->"
180221
181222p_conDeclFields :: [LConDeclField GhcPs] -> R ()
182−p_conDeclFields xs = braces . sitcc $
183− sep (comma >> breakpoint) (sitcc . located' p_conDeclField) xs
223+p_conDeclFields xs =
224+ braces N $ sep commaDel (sitcc . located' p_conDeclField) xs
184225
185226p_conDeclField :: ConDeclField GhcPs -> R ()
186227p_conDeclField ConDeclField {..} = do
187− sitcc $ sep (comma >> breakpoint)
188− (located' (p_rdrName . rdrNameFieldOcc))
189− cd_fld_names
228+ mapM_ (p_hsDocString Pipe True) cd_fld_doc
229+ sitcc $
230+ sep
231+ commaDel
232+ (located' (p_rdrName . rdrNameFieldOcc))
233+ cd_fld_names
234+ space
235+ txt "::"
190236 breakpoint
191− sitcc . inci $ do
192− txt "::"
237+ sitcc . inci $ p_hsType (unLoc cd_fld_type)
238+p_conDeclField (XConDeclField x) = noExtCon x
239+
240+tyOpTree :: LHsType GhcPs -> OpTree (LHsType GhcPs) (Located RdrName)
241+tyOpTree (L _ (HsOpTy NoExtField l op r)) =
242+ OpBranch (tyOpTree l) op (tyOpTree r)
243+tyOpTree n = OpNode n
244+
245+p_tyOpTree :: OpTree (LHsType GhcPs) (Located RdrName) -> R ()
246+p_tyOpTree (OpNode n) = located n p_hsType
247+p_tyOpTree (OpBranch l op r) = do
248+ switchLayout [opTreeLoc l] $
249+ p_tyOpTree l
250+ breakpoint
251+ inci . switchLayout [opTreeLoc r] $ do
252+ p_rdrName op
193253 space
194− p_hsType (unLoc cd_fld_type)
195−p_conDeclField (XConDeclField NoExt) = notImplemented "XConDeclField"
254+ p_tyOpTree r
196255
197256----------------------------------------------------------------------------
198257-- Conversion functions
@@ -200,12 +259,17 @@ p_conDeclField (XConDeclField NoExt) = notImplemented "XConDeclField"
200259tyVarsToTypes :: LHsQTyVars GhcPs -> [LHsType GhcPs]
201260tyVarsToTypes = \case
202261 HsQTvs {..} -> fmap tyVarToType <$> hsq_explicit
203− XLHsQTyVars {} -> notImplemented "XLHsQTyVars"
262+ XLHsQTyVars x -> noExtCon x
204263
205264tyVarToType :: HsTyVarBndr GhcPs -> HsType GhcPs
206265tyVarToType = \case
207− UserTyVar NoExt tvar -> HsTyVar NoExt NotPromoted tvar
208− KindedTyVar NoExt tvar kind ->
209− HsParTy NoExt $ noLoc $
210− HsKindSig NoExt (noLoc (HsTyVar NoExt NotPromoted tvar)) kind
211− XTyVarBndr {} -> notImplemented "XTyVarBndr"
266+ UserTyVar NoExtField tvar -> HsTyVar NoExtField NotPromoted tvar
267+ KindedTyVar NoExtField tvar kind ->
268+ -- Note: we always add parentheses because for whatever reason GHC does
269+ -- not use HsParTy for left-hand sides of declarations. Please see
270+ -- <https://gitlab.haskell.org/ghc/ghc/issues/17404>. This is fine as
271+ -- long as 'tyVarToType' does not get applied to right-hand sides of
272+ -- declarations.
273+ HsParTy NoExtField . noLoc $
274+ HsKindSig NoExtField (noLoc (HsTyVar NoExtField NotPromoted tvar)) kind
275+ XTyVarBndr x -> noExtCon x
src/Ormolu/Printer/Operators.hsnew file+177
@@ -0,0 +1,177 @@
1+{-# LANGUAGE LambdaCase #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+
4+-- | This module helps handle operator chains composed of different
5+-- operators that may have different precedence and fixities.
6+module Ormolu.Printer.Operators
7+ ( OpTree (..),
8+ opTreeLoc,
9+ reassociateOpTree,
10+ )
11+where
12+
13+import Data.Function (on)
14+import qualified Data.List as L
15+import Data.Map.Strict (Map)
16+import qualified Data.Map.Strict as M
17+import Data.Maybe (fromMaybe, mapMaybe)
18+import GHC
19+import OccName (occNameString)
20+import Ormolu.Utils (unSrcSpan)
21+
22+-- | Intermediate representation of operator trees. It has two type
23+-- parameters: @ty@ is the type of sub-expressions, while @op@ is the type
24+-- of operators.
25+data OpTree ty op
26+ = OpNode ty
27+ | OpBranch
28+ (OpTree ty op)
29+ op
30+ (OpTree ty op)
31+
32+-- | Return combined 'SrcSpan's of all elements in this 'OpTree'.
33+opTreeLoc :: OpTree (Located a) b -> SrcSpan
34+opTreeLoc (OpNode (L l _)) = l
35+opTreeLoc (OpBranch l _ r) = combineSrcSpans (opTreeLoc l) (opTreeLoc r)
36+
37+-- | Re-associate an 'OpTree' taking into account automagically inferred
38+-- relative precedence of operators. Users are expected to first construct
39+-- an initial 'OpTree', then re-associate it using this function before
40+-- printing.
41+reassociateOpTree ::
42+ -- | How to get name of an operator
43+ (op -> Maybe RdrName) ->
44+ -- | Original 'OpTree'
45+ OpTree (Located ty) (Located op) ->
46+ -- | Re-associated 'OpTree'
47+ OpTree (Located ty) (Located op)
48+reassociateOpTree getOpName opTree =
49+ reassociateOpTreeWith
50+ (buildFixityMap getOpName normOpTree)
51+ (getOpName . unLoc)
52+ normOpTree
53+ where
54+ normOpTree = normalizeOpTree opTree
55+
56+-- | Re-associate an 'OpTree' given the map with operator fixities.
57+reassociateOpTreeWith ::
58+ forall ty op.
59+ -- | Fixity map for operators
60+ Map String Fixity ->
61+ -- | How to get the name of an operator
62+ (op -> Maybe RdrName) ->
63+ -- | Original 'OpTree'
64+ OpTree ty op ->
65+ -- | Re-associated 'OpTree'
66+ OpTree ty op
67+reassociateOpTreeWith fixityMap getOpName = go
68+ where
69+ fixityOf :: op -> Fixity
70+ fixityOf op = fromMaybe defaultFixity $ do
71+ s <- occNameString . rdrNameOcc <$> getOpName op
72+ M.lookup s fixityMap
73+ -- Here, left branch is already associated and the root alongside with
74+ -- the right branch is right-associated. This function picks up one item
75+ -- from the right and inserts it correctly to the left.
76+ --
77+ -- Also, we are using the 'compareFixity' function which tells if the
78+ -- expression should associate to right.
79+ go :: OpTree ty op -> OpTree ty op
80+ -- base cases
81+ go t@(OpNode _) = t
82+ go t@(OpBranch (OpNode _) _ (OpNode _)) = t
83+ -- shift one operator to the left at the beginning
84+ go (OpBranch l@(OpNode _) op (OpBranch l' op' r')) =
85+ go (OpBranch (OpBranch l op l') op' r')
86+ -- at the last operator, place the operator and don't recurse
87+ go (OpBranch (OpBranch l op r) op' r'@(OpNode _)) =
88+ if snd $ compareFixity (fixityOf op) (fixityOf op')
89+ then OpBranch l op (go $ OpBranch r op' r')
90+ else OpBranch (OpBranch l op r) op' r'
91+ -- else, shift one operator to left and recurse.
92+ go (OpBranch (OpBranch l op r) op' (OpBranch l' op'' r')) =
93+ if snd $ compareFixity (fixityOf op) (fixityOf op')
94+ then go $ OpBranch (OpBranch l op (go $ OpBranch r op' l')) op'' r'
95+ else go $ OpBranch (OpBranch (OpBranch l op r) op' l') op'' r'
96+
97+-- | A score assigned to an operator.
98+data Score
99+ = -- | The operator was placed at the beginning of a line
100+ AtBeginning Int
101+ | -- | The operator was placed at the end of a line
102+ AtEnd
103+ | -- | The operator was placed in between arguments on a single line
104+ InBetween
105+ deriving (Eq, Ord)
106+
107+-- | Build a map of inferred 'Fixity's from an 'OpTree'.
108+buildFixityMap ::
109+ forall ty op.
110+ -- | How to get the name of an operator
111+ (op -> Maybe RdrName) ->
112+ -- | Operator tree
113+ OpTree (Located ty) (Located op) ->
114+ -- | Fixity map
115+ Map String Fixity
116+buildFixityMap getOpName opTree =
117+ addOverrides
118+ . M.fromList
119+ . concatMap (\(i, ns) -> map (\(n, _) -> (n, fixity i InfixL)) ns)
120+ . zip [2 ..]
121+ . L.groupBy ((==) `on` snd)
122+ . selectScores
123+ $ score opTree
124+ where
125+ addOverrides :: Map String Fixity -> Map String Fixity
126+ addOverrides m =
127+ M.fromList
128+ [ ("$", fixity 0 InfixR),
129+ (":", fixity 1 InfixR),
130+ (".", fixity 100 InfixL)
131+ ]
132+ `M.union` m
133+ fixity = Fixity NoSourceText
134+ score :: OpTree (Located ty) (Located op) -> [(String, Score)]
135+ score (OpNode _) = []
136+ score (OpBranch l o r) = fromMaybe (score r) $ do
137+ -- If we fail to get any of these, 'defaultFixity' will be used by
138+ -- 'reassociateOpTreeWith'.
139+ le <- srcSpanEndLine <$> unSrcSpan (opTreeLoc l) -- left end
140+ ob <- srcSpanStartLine <$> unSrcSpan (getLoc o) -- operator begin
141+ oe <- srcSpanEndLine <$> unSrcSpan (getLoc o) -- operator end
142+ rb <- srcSpanStartLine <$> unSrcSpan (opTreeLoc r) -- right begin
143+ oc <- srcSpanStartCol <$> unSrcSpan (getLoc o) -- operator column
144+ opName <- occNameString . rdrNameOcc <$> getOpName (unLoc o)
145+ let s
146+ | le < ob = AtBeginning oc
147+ | oe < rb = AtEnd
148+ | otherwise = InBetween
149+ return $ (opName, s) : score r
150+ selectScores :: [(String, Score)] -> [(String, Score)]
151+ selectScores =
152+ L.sortOn snd
153+ . mapMaybe
154+ ( \case
155+ [] -> Nothing
156+ xs@((n, _) : _) -> Just (n, selectScore $ map snd xs)
157+ )
158+ . L.groupBy ((==) `on` fst)
159+ . L.sort
160+ selectScore :: [Score] -> Score
161+ selectScore xs =
162+ case filter (/= InBetween) xs of
163+ [] -> InBetween
164+ xs' -> maximum xs'
165+
166+----------------------------------------------------------------------------
167+-- Helpers
168+
169+-- | Convert an 'OpTree' to with all operators having the same fixity and
170+-- associativity (left infix).
171+normalizeOpTree :: OpTree ty op -> OpTree ty op
172+normalizeOpTree (OpNode n) =
173+ OpNode n
174+normalizeOpTree (OpBranch (OpNode l) lop r) =
175+ OpBranch (OpNode l) lop (normalizeOpTree r)
176+normalizeOpTree (OpBranch (OpBranch l' lop' r') lop r) =
177+ normalizeOpTree (OpBranch l' lop' (OpBranch r' lop r))
src/Ormolu/Printer/SpanStream.hs+18−20
@@ -1,46 +1,44 @@
1−{-# LANGUAGE DeriveDataTypeable #-}
1+{-# LANGUAGE DeriveDataTypeable #-}
22{-# LANGUAGE GeneralizedNewtypeDeriving #-}
33
44-- | Build span stream from AST.
5−
65module Ormolu.Printer.SpanStream
7− ( SpanStream (..)
8− , mkSpanStream
6+ ( SpanStream (..),
7+ mkSpanStream,
98 )
109where
1110
1211import Data.DList (DList)
12+import qualified Data.DList as D
1313import Data.Data (Data)
1414import Data.Generics (everything, ext2Q)
1515import Data.List (sortOn)
1616import Data.Typeable (cast)
1717import SrcLoc
18−import qualified Data.DList as D
1918
2019-- | A stream of 'RealSrcSpan's in ascending order. This allows us to tell
2120-- e.g. whether there is another \"located\" element of AST between current
2221-- element and comment we're considering for printing.
23−
2422newtype SpanStream = SpanStream [RealSrcSpan]
2523 deriving (Eq, Show, Data, Semigroup, Monoid)
2624
2725-- | Create 'SpanStream' from a data structure containing \"located\"
2826-- elements.
29−
30−mkSpanStream
31− :: Data a
32− => a -- ^ Data structure to inspect (AST)
33− -> SpanStream
34−mkSpanStream a
35− = SpanStream
36− . sortOn realSrcSpanStart
37− . D.toList
38− $ everything mappend (const mempty `ext2Q` queryLocated) a
27+mkSpanStream ::
28+ Data a =>
29+ -- | Data structure to inspect (AST)
30+ a ->
31+ SpanStream
32+mkSpanStream a =
33+ SpanStream
34+ . sortOn realSrcSpanStart
35+ . D.toList
36+ $ everything mappend (const mempty `ext2Q` queryLocated) a
3937 where
40− queryLocated
41− :: (Data e0, Data e1)
42− => GenLocated e0 e1
43− -> DList RealSrcSpan
38+ queryLocated ::
39+ (Data e0) =>
40+ GenLocated e0 e1 ->
41+ DList RealSrcSpan
4442 queryLocated (L mspn _) =
4543 case cast mspn :: Maybe SrcSpan of
4644 Nothing -> mempty
src/Ormolu/Processing/Common.hsnew file+27
@@ -0,0 +1,27 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+
3+-- | Common definitions for pre- and post- processing.
4+module Ormolu.Processing.Common
5+ ( OrmoluState (..),
6+ startDisabling,
7+ endDisabling,
8+ )
9+where
10+
11+import Data.String (IsString (..))
12+
13+-- | Ormolu state.
14+data OrmoluState
15+ = -- | Enabled
16+ OrmoluEnabled
17+ | -- | Disabled
18+ OrmoluDisabled
19+ deriving (Eq, Show)
20+
21+-- | Marker for the beginning of the region where Ormolu should be disabled.
22+startDisabling :: IsString s => s
23+startDisabling = "{- ORMOLU_DISABLE_START"
24+
25+-- | Marker for the end of the region where Ormolu should be disabled.
26+endDisabling :: IsString s => s
27+endDisabling = "ORMOLU_DISABLE_END -}"
src/Ormolu/Processing/Cpp.hsnew file+70
@@ -0,0 +1,70 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+
3+-- | Support for CPP.
4+module Ormolu.Processing.Cpp
5+ ( State (..),
6+ processLine,
7+ unmaskLine,
8+ )
9+where
10+
11+import Control.Monad
12+import Data.Char (isSpace)
13+import qualified Data.List as L
14+import Data.Maybe (isJust)
15+import Data.String
16+import Data.Text (Text)
17+import qualified Data.Text as T
18+
19+-- | State of the CPP processor.
20+data State
21+ = -- | Outside of CPP directives
22+ Outside
23+ | -- | In a conditional expression
24+ InConditional
25+ | -- | In a continuation (after @\\@)
26+ InContinuation
27+ deriving (Eq, Show)
28+
29+-- | Automatically mask the line when needed and update the 'State'.
30+processLine :: String -> State -> (String, State)
31+processLine line state
32+ | for "define " = (masked, state')
33+ | for "include " = (masked, state')
34+ | for "undef " = (masked, state')
35+ | for "ifdef " = (masked, InConditional)
36+ | for "ifndef " = (masked, InConditional)
37+ | for "if " = (masked, InConditional)
38+ | for "else" = (masked, InConditional)
39+ | for "elif" = (masked, InConditional)
40+ | for "endif" = (masked, state')
41+ | otherwise =
42+ case state of
43+ Outside -> (line, Outside)
44+ InConditional -> (masked, InConditional)
45+ InContinuation -> (masked, state')
46+ where
47+ for directive = isJust $ do
48+ s <- dropWhile isSpace <$> L.stripPrefix "#" line
49+ void (L.stripPrefix directive s)
50+ masked = maskLine line
51+ state' =
52+ if "\\" `L.isSuffixOf` line
53+ then InContinuation
54+ else Outside
55+
56+-- | Mask the given line.
57+maskLine :: String -> String
58+maskLine x = maskPrefix ++ x
59+
60+-- | If the given line is masked, unmask it. Otherwise return the line
61+-- unchanged.
62+unmaskLine :: Text -> Text
63+unmaskLine x =
64+ case T.stripPrefix maskPrefix (T.stripStart x) of
65+ Nothing -> x
66+ Just x' -> x'
67+
68+-- | Mask prefix for CPP.
69+maskPrefix :: IsString s => s
70+maskPrefix = "-- ORMOLU_CPP_MASK"
src/Ormolu/Processing/Postprocess.hsnew file+31
@@ -0,0 +1,31 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+{-# LANGUAGE ViewPatterns #-}
3+
4+-- | Postprocessing for the results of printing.
5+module Ormolu.Processing.Postprocess
6+ ( postprocess,
7+ )
8+where
9+
10+import Data.Text (Text)
11+import qualified Data.Text as T
12+import Ormolu.Processing.Common
13+import qualified Ormolu.Processing.Cpp as Cpp
14+
15+-- | Postprocess output of the formatter.
16+postprocess ::
17+ -- | Desired indentation level
18+ Int ->
19+ -- | Input to process
20+ Text ->
21+ Text
22+postprocess indent =
23+ T.unlines
24+ . fmap indentLine
25+ . fmap Cpp.unmaskLine
26+ . filter (not . magicComment)
27+ . T.lines
28+ where
29+ magicComment (T.stripStart -> x) =
30+ x == startDisabling || x == endDisabling
31+ indentLine x = T.replicate indent " " <> x
src/Ormolu/Processing/Preprocess.hsnew file+149
@@ -0,0 +1,149 @@
1+{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE LambdaCase #-}
3+{-# LANGUAGE RecordWildCards #-}
4+
5+-- | Preprocessing for input source code.
6+module Ormolu.Processing.Preprocess
7+ ( preprocess,
8+ )
9+where
10+
11+import Control.Monad
12+import Data.Char (isSpace)
13+import qualified Data.List as L
14+import Data.Maybe (isJust, maybeToList)
15+import FastString
16+import Ormolu.Config (RegionDeltas (..))
17+import Ormolu.Parser.Shebang (isShebang)
18+import Ormolu.Processing.Common
19+import qualified Ormolu.Processing.Cpp as Cpp
20+import SrcLoc
21+
22+-- | Transform given input possibly returning comments extracted from it.
23+-- This handles LINE pragmas, CPP, shebangs, and the magic comments for
24+-- enabling\/disabling of Ormolu.
25+preprocess ::
26+ -- | File name, just to use in the spans
27+ FilePath ->
28+ -- | Input to process
29+ String ->
30+ -- | Region deltas
31+ RegionDeltas ->
32+ -- | Literal prefix, pre-processed input, literal suffix, extra comments
33+ (String, String, String, [Located String])
34+preprocess path input RegionDeltas {..} =
35+ go 1 OrmoluEnabled Cpp.Outside id id regionLines
36+ where
37+ (prefixLines, otherLines) = splitAt regionPrefixLength (lines input)
38+ (regionLines, suffixLines) =
39+ let regionLength = length otherLines - regionSuffixLength
40+ in splitAt regionLength otherLines
41+ go !n ormoluState cppState inputSoFar csSoFar = \case
42+ [] ->
43+ let input' = unlines (inputSoFar [])
44+ in ( unlines prefixLines,
45+ case ormoluState of
46+ OrmoluEnabled -> input'
47+ OrmoluDisabled -> input' ++ endDisabling,
48+ unlines suffixLines,
49+ csSoFar []
50+ )
51+ (x : xs) ->
52+ let (x', ormoluState', cppState', cs) =
53+ processLine path n ormoluState cppState x
54+ in go
55+ (n + 1)
56+ ormoluState'
57+ cppState'
58+ (inputSoFar . (x' :))
59+ (csSoFar . (maybeToList cs ++))
60+ xs
61+
62+-- | Transform a given line possibly returning a comment extracted from it.
63+processLine ::
64+ -- | File name, just to use in the spans
65+ FilePath ->
66+ -- | Line number of this line
67+ Int ->
68+ -- | Whether Ormolu is currently enabled
69+ OrmoluState ->
70+ -- | CPP state
71+ Cpp.State ->
72+ -- | The actual line
73+ String ->
74+ -- | Adjusted line and possibly a comment extracted from it
75+ (String, OrmoluState, Cpp.State, Maybe (Located String))
76+processLine path n ormoluState Cpp.Outside line
77+ | "{-# LINE" `L.isPrefixOf` line =
78+ let (pragma, res) = getPragma line
79+ size = length pragma
80+ ss = mkSrcSpan (mkSrcLoc' 1) (mkSrcLoc' (size + 1))
81+ in (res, ormoluState, Cpp.Outside, Just (L ss pragma))
82+ | isOrmoluEnable line =
83+ case ormoluState of
84+ OrmoluEnabled ->
85+ (enableMarker, OrmoluEnabled, Cpp.Outside, Nothing)
86+ OrmoluDisabled ->
87+ (endDisabling ++ enableMarker, OrmoluEnabled, Cpp.Outside, Nothing)
88+ | isOrmoluDisable line =
89+ case ormoluState of
90+ OrmoluEnabled ->
91+ (disableMarker ++ startDisabling, OrmoluDisabled, Cpp.Outside, Nothing)
92+ OrmoluDisabled ->
93+ (disableMarker, OrmoluDisabled, Cpp.Outside, Nothing)
94+ | isShebang line =
95+ let ss = mkSrcSpan (mkSrcLoc' 1) (mkSrcLoc' (length line))
96+ in ("", ormoluState, Cpp.Outside, Just (L ss line))
97+ | otherwise =
98+ let (line', cppState') = Cpp.processLine line Cpp.Outside
99+ in (line', ormoluState, cppState', Nothing)
100+ where
101+ mkSrcLoc' = mkSrcLoc (mkFastString path) n
102+processLine _ _ ormoluState cppState line =
103+ let (line', cppState') = Cpp.processLine line cppState
104+ in (line', ormoluState, cppState', Nothing)
105+
106+-- | Take a line pragma and output its replacement (where line pragma is
107+-- replaced with spaces) and the contents of the pragma itself.
108+getPragma ::
109+ -- | Pragma line to analyze
110+ String ->
111+ -- | Contents of the pragma and its replacement line
112+ (String, String)
113+getPragma [] = error "Ormolu.Preprocess.getPragma: input must not be empty"
114+getPragma s@(x : xs)
115+ | "#-}" `L.isPrefixOf` s = ("#-}", " " ++ drop 3 s)
116+ | otherwise =
117+ let (prag, remline) = getPragma xs
118+ in (x : prag, ' ' : remline)
119+
120+-- | Canonical enable marker.
121+enableMarker :: String
122+enableMarker = "{- ORMOLU_ENABLE -}"
123+
124+-- | Canonical disable marker.
125+disableMarker :: String
126+disableMarker = "{- ORMOLU_DISABLE -}"
127+
128+-- | Return 'True' if the given string is an enabling marker.
129+isOrmoluEnable :: String -> Bool
130+isOrmoluEnable = magicComment "ORMOLU_ENABLE"
131+
132+-- | Return 'True' if the given string is a disabling marker.
133+isOrmoluDisable :: String -> Bool
134+isOrmoluDisable = magicComment "ORMOLU_DISABLE"
135+
136+-- | Construct a function for whitespace-insensitive matching of string.
137+magicComment ::
138+ -- | What to expect
139+ String ->
140+ -- | String to test
141+ String ->
142+ -- | Whether or not the two strings watch
143+ Bool
144+magicComment expected s0 = isJust $ do
145+ let trim = dropWhile isSpace
146+ s1 <- trim <$> L.stripPrefix "{-" (trim s0)
147+ s2 <- trim <$> L.stripPrefix expected s1
148+ s3 <- L.stripPrefix "-}" s2
149+ guard (all isSpace s3)
src/Ormolu/Utils.hs+137−18
@@ -1,36 +1,155 @@
1−-- | Random utilities used by the code.
2−
31{-# LANGUAGE LambdaCase #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+{-# LANGUAGE ViewPatterns #-}
44
5+-- | Random utilities used by the code.
56module Ormolu.Utils
6− ( combineSrcSpans'
7− , isModule
8− , notImplemented
9− , showOutputable
7+ ( RelativePos (..),
8+ attachRelativePos,
9+ combineSrcSpans',
10+ notImplemented,
11+ showOutputable,
12+ splitDocString,
13+ typeArgToType,
14+ unSrcSpan,
15+ incSpanLine,
16+ separatedByBlank,
17+ separatedByBlankNE,
18+ onTheSameLine,
19+ removeIndentation,
1020 )
1121where
1222
13−import Data.Data (Data, showConstr, toConstr)
23+import Data.Char (isSpace)
24+import Data.List (dropWhileEnd)
1425import Data.List.NonEmpty (NonEmpty (..))
15−import SrcLoc
26+import qualified Data.List.NonEmpty as NE
27+import Data.Maybe (fromMaybe)
28+import Data.Text (Text)
29+import qualified Data.Text as T
30+import GHC
31+import GHC.DynFlags (baseDynFlags)
1632import qualified Outputable as GHC
1733
18−-- | Combine all source spans from the given list.
34+-- | Relative positions in a list.
35+data RelativePos
36+ = SinglePos
37+ | FirstPos
38+ | MiddlePos
39+ | LastPos
40+ deriving (Eq, Show)
1941
20−combineSrcSpans' :: NonEmpty SrcSpan -> SrcSpan
21−combineSrcSpans' (x:|xs) = foldr combineSrcSpans x xs
42+-- | Attach 'RelativePos'es to elements of a given list.
43+attachRelativePos :: [a] -> [(RelativePos, a)]
44+attachRelativePos = \case
45+ [] -> []
46+ [x] -> [(SinglePos, x)]
47+ (x : xs) -> (FirstPos, x) : markLast xs
48+ where
49+ markLast [] = []
50+ markLast [x] = [(LastPos, x)]
51+ markLast (x : xs) = (MiddlePos, x) : markLast xs
2252
23−-- | Return 'True' if given element of AST is module.
24−
25−isModule :: Data a => a -> Bool
26−isModule x = showConstr (toConstr x) == "HsModule"
53+-- | Combine all source spans from the given list.
54+combineSrcSpans' :: NonEmpty SrcSpan -> SrcSpan
55+combineSrcSpans' (x :| xs) = foldr combineSrcSpans x xs
2756
2857-- | Placeholder for things that are not yet implemented.
29−
3058notImplemented :: String -> a
3159notImplemented msg = error $ "not implemented yet: " ++ msg
3260
3361-- | Pretty-print an 'GHC.Outputable' thing.
34−
3562showOutputable :: GHC.Outputable o => o -> String
36−showOutputable = GHC.showSDocUnsafe . GHC.ppr
63+showOutputable = GHC.showSDoc baseDynFlags . GHC.ppr
64+
65+-- | Split and normalize a doc string. The result is a list of lines that
66+-- make up the comment.
67+splitDocString :: HsDocString -> [Text]
68+splitDocString docStr =
69+ case r of
70+ [] -> [""]
71+ _ -> r
72+ where
73+ r =
74+ fmap escapeLeadingDollar
75+ . dropPaddingSpace
76+ . dropWhileEnd T.null
77+ . fmap (T.stripEnd . T.pack)
78+ . lines
79+ $ unpackHDS docStr
80+ -- We cannot have the first character to be a dollar because in that
81+ -- case it'll be a parse error (apparently collides with named docs
82+ -- syntax @-- $name@ somehow).
83+ escapeLeadingDollar txt =
84+ case T.uncons txt of
85+ Just ('$', _) -> T.cons '\\' txt
86+ _ -> txt
87+ dropPaddingSpace xs =
88+ case dropWhile T.null xs of
89+ [] -> []
90+ (x : _) ->
91+ let leadingSpace txt = case T.uncons txt of
92+ Just (' ', _) -> True
93+ _ -> False
94+ dropSpace txt =
95+ if leadingSpace txt
96+ then T.drop 1 txt
97+ else txt
98+ in if leadingSpace x
99+ then dropSpace <$> xs
100+ else xs
101+
102+-- | Get 'LHsType' out of 'LHsTypeArg'.
103+typeArgToType :: LHsTypeArg p -> LHsType p
104+typeArgToType = \case
105+ HsValArg tm -> tm
106+ HsTypeArg _ ty -> ty
107+ HsArgPar _ -> notImplemented "HsArgPar"
108+
109+-- | Get 'RealSrcSpan' out of 'SrcSpan' if the span is “helpful”.
110+unSrcSpan :: SrcSpan -> Maybe RealSrcSpan
111+unSrcSpan = \case
112+ RealSrcSpan r -> Just r
113+ UnhelpfulSpan _ -> Nothing
114+
115+-- | Increment line number in a 'SrcSpan'.
116+incSpanLine :: Int -> SrcSpan -> SrcSpan
117+incSpanLine i = \case
118+ RealSrcSpan s ->
119+ let start = realSrcSpanStart s
120+ end = realSrcSpanEnd s
121+ incLine x =
122+ let file = srcLocFile x
123+ line = srcLocLine x
124+ col = srcLocCol x
125+ in mkRealSrcLoc file (line + i) col
126+ in RealSrcSpan (mkRealSrcSpan (incLine start) (incLine end))
127+ UnhelpfulSpan x -> UnhelpfulSpan x
128+
129+-- | Do two declarations have a blank between them?
130+separatedByBlank :: (a -> SrcSpan) -> a -> a -> Bool
131+separatedByBlank loc a b =
132+ fromMaybe False $ do
133+ endA <- srcSpanEndLine <$> unSrcSpan (loc a)
134+ startB <- srcSpanStartLine <$> unSrcSpan (loc b)
135+ pure (startB - endA >= 2)
136+
137+-- | Do two declaration groups have a blank between them?
138+separatedByBlankNE :: (a -> SrcSpan) -> NonEmpty a -> NonEmpty a -> Bool
139+separatedByBlankNE loc a b = separatedByBlank loc (NE.last a) (NE.head b)
140+
141+-- | Return 'True' if one span ends on the same line the second one starts.
142+onTheSameLine :: SrcSpan -> SrcSpan -> Bool
143+onTheSameLine a b =
144+ isOneLineSpan (mkSrcSpan (srcSpanEnd a) (srcSpanStart b))
145+
146+-- | Remove indentation from a given 'String'. Return the input with
147+-- indentation removed and the detected indentation level.
148+removeIndentation :: String -> (String, Int)
149+removeIndentation (lines -> xs) = (unlines (drop n <$> xs), n)
150+ where
151+ n = minimum (getIndent <$> xs)
152+ getIndent y =
153+ if all isSpace y
154+ then 0
155+ else length (takeWhile isSpace y)
tests/Ormolu/Parser/PragmaSpec.hs+4−3
@@ -4,7 +4,7 @@ import Ormolu.Parser.Pragma
44import Test.Hspec
55
66spec :: Spec
7−spec = do
7+spec =
88 describe "parsePragma" $ do
99 stdTest "{-# LANGUAGE Foo #-}" (Just (PragmaLanguage ["Foo"]))
1010 stdTest "{-# language Foo #-}" (Just (PragmaLanguage ["Foo"]))
@@ -21,5 +21,6 @@ spec = do
2121 stdTest "{-#OPTIONS_HADDOCK foo, bar, baz #-}" (Just $ PragmaOptionsHaddock "foo, bar, baz")
2222
2323stdTest :: String -> Maybe Pragma -> Spec
24−stdTest input result = it input $
25− parsePragma input `shouldBe` result
24+stdTest input result =
25+ it input $
26+ parsePragma input `shouldBe` result
tests/Ormolu/Printer/CombinatorsSpec.hsdeleted−112
@@ -1,112 +0,0 @@
1−{-# LANGUAGE OverloadedStrings #-}
2−
3−module Ormolu.Printer.CombinatorsSpec (spec) where
4−
5−import Ormolu.Parser.Anns
6−import Ormolu.Printer.Combinators
7−import Ormolu.Printer.Internal
8−import Test.Hspec
9−import qualified Data.Text.IO as T
10−
11−-- NOTE Testing combinators in separation is easy, but it's not very useful
12−-- either because interesting things happen only when combinators are used
13−-- together. However, there are too many combinations to test, so we test
14−-- just a few things here and expect new tests to be added on demand when
15−-- particularly tricky or problematic use cases are discovered.
16−--
17−-- The printing logic is indirectly tested in the main bulk of reformatting
18−-- tests.
19−
20−spec :: Spec
21−spec = do
22− stdTest "simple signature" rSimpleSig "ssig"
23− stdTest "list" rList0 "list0"
24− stdTest "list with annotated name in it" rList1 "list1"
25− stdTest "module header" rModuleHeader "mhdr"
26−
27−-- | Do a standard test prodedure testing both single-line and multi-line
28−-- layouts.
29−
30−stdTest
31− :: String -- ^ Test name
32− -> R () -- ^ Computation to test
33− -> FilePath -- ^ Base file name where expected result is stored
34− -> Spec
35−stdTest name m path = describe name $ do
36− let spath = "data/printer/" ++ path ++ "-single.hs"
37− mpath = "data/printer/" ++ path ++ "-multi.hs"
38− it "single-line works" $
39− singleLine m `shouldRender` spath
40− it "multi-line works" $
41− multiLine m `shouldRender` mpath
42−
43−----------------------------------------------------------------------------
44−-- Test computations
45−
46−rSimpleSig :: R ()
47−rSimpleSig = line rFn
48−
49−rList0 :: R ()
50−rList0 = line . brackets . sitcc $
51− sep (comma >> breakpoint) id
52− [ txt "foo"
53− , txt "bar"
54− , txt "baz"
55− ]
56−
57−rList1 :: R ()
58−rList1 = line . brackets . sitcc $
59− sep (comma >> breakpoint) id
60− [ txt "foo"
61− , txt "bar"
62− , rFn
63− ]
64−
65−rFn :: R ()
66−rFn = sitcc $ sep breakpoint sitcc
67− [ txt "foo"
68− , inci . sitcc $ sep breakpoint sitcc
69− [ do txt ":: "
70− parens . sitcc $ sep breakpoint sitcc
71− [ txt "Int"
72− , txt "-> " >> txt "Int"
73− ]
74− , txt "-> " >> txt "Bool"
75− ]
76− ]
77−
78−rModuleHeader :: R ()
79−rModuleHeader = do
80− line $ do
81− txt "module "
82− txt "MyModule"
83− line . inci . parens . sitcc . sep (comma >> breakpoint) sitcc $
84− [ txt "R"
85− , txt "runR"
86− , txt "txt"
87− , txt "blah"
88− ]
89− line (txt "where")
90−
91−----------------------------------------------------------------------------
92−-- Helpers
93−
94−-- | Run given computation in @'R' ()@ monad and compare result of rendering
95−-- with contents of a given file.
96−
97−shouldRender :: R () -> FilePath -> Expectation
98−shouldRender m path = do
99− let rendered = runR False m mempty mempty emptyAnns
100− -- T.writeFile path rendered
101− expected <- T.readFile path
102− rendered `shouldBe` expected
103−
104−-- | Render using single-line layout.
105−
106−singleLine :: R () -> R ()
107−singleLine = enterLayout SingleLine
108−
109−-- | Render using multi-line layout.
110−
111−multiLine :: R () -> R ()
112−multiLine = enterLayout MultiLine
tests/Ormolu/PrinterSpec.hs+31−22
@@ -2,17 +2,18 @@
22
33module Ormolu.PrinterSpec (spec) where
44
5+import Control.Exception
56import Control.Monad
67import Control.Monad.IO.Class
78import Data.List (isSuffixOf)
89import Data.Text (Text)
10+import qualified Data.Text as T
11+import qualified Data.Text.IO as T
912import Ormolu
1013import Path
1114import Path.IO
12−import System.FilePath (addExtension, dropExtensions, splitExtensions)
15+import qualified System.FilePath as F
1316import Test.Hspec
14−import qualified Data.Text as T
15−import qualified Data.Text.IO as T
1617
1718spec :: Spec
1819spec = do
@@ -20,9 +21,8 @@ spec = do
2021 forM_ es checkExample
2122
2223-- | Check a single given example.
23−
2424checkExample :: Path Rel File -> Spec
25−checkExample srcPath' = it (fromRelFile srcPath' ++ " works") $ do
25+checkExample srcPath' = it (fromRelFile srcPath' ++ " works") . withNiceExceptions $ do
2626 let srcPath = examplesDir </> srcPath'
2727 expectedOutputPath <- deriveOutput srcPath
2828 -- 1. Given input snippet of source code parse it and pretty print it.
@@ -41,42 +41,51 @@ checkExample srcPath' = it (fromRelFile srcPath' ++ " works") $ do
4141 shouldMatch True formatted1 formatted0
4242
4343-- | Build list of examples for testing.
44−
4544locateExamples :: IO [Path Rel File]
4645locateExamples =
4746 filter isInput . snd <$> listDirRecurRel examplesDir
4847
4948-- | Does given path look like input path (as opposed to expected output
5049-- path)?
51−
5250isInput :: Path Rel File -> Bool
5351isInput path =
5452 let s = fromRelFile path
55− (s', exts) = splitExtensions s
56− in exts == ".hs" && not ("-out" `isSuffixOf` s')
53+ (s', exts) = F.splitExtensions s
54+ in exts == ".hs" && not ("-out" `isSuffixOf` s')
5755
5856-- | For given path of input file return expected name of output.
59−
6057deriveOutput :: Path Rel File -> IO (Path Rel File)
61−deriveOutput path = parseRelFile $
62− addExtension (dropExtensions (fromRelFile path) ++ "-out") "hs"
58+deriveOutput path =
59+ parseRelFile $
60+ F.addExtension (F.dropExtensions (fromRelFile path) ++ "-out") "hs"
6361
6462-- | A version of 'shouldBe' that is specialized to comparing 'Text' values.
6563-- It also prints multi-line snippets in a more readable form.
66−
6764shouldMatch :: Bool -> Text -> Text -> Expectation
68−shouldMatch idempotencyTest actual expected =
69− when (actual /= expected) . expectationFailure $ unlines
70− [ ">>>>>>>>>>>>>>>>>>>>>> expected (" ++ pass ++ "):"
71− , T.unpack expected
72− , ">>>>>>>>>>>>>>>>>>>>>> but got:"
73− , T.unpack actual
74− ]
65+shouldMatch idempotenceTest actual expected =
66+ when (actual /= expected) . expectationFailure $
67+ unlines
68+ [ ">>>>>>>>>>>>>>>>>>>>>> expected (" ++ pass ++ "):",
69+ T.unpack expected,
70+ ">>>>>>>>>>>>>>>>>>>>>> but got:",
71+ T.unpack actual
72+ ]
7573 where
7674 pass =
77− if idempotencyTest
78− then "idempotency pass"
75+ if idempotenceTest
76+ then "idempotence pass"
7977 else "first pass"
8078
8179examplesDir :: Path Rel Dir
8280examplesDir = $(mkRelDir "data/examples")
81+
82+-- | Inside this wrapper 'OrmoluException' will be caught and displayed
83+-- nicely using 'displayException'.
84+withNiceExceptions ::
85+ -- | Action that may throw the exception
86+ Expectation ->
87+ Expectation
88+withNiceExceptions m = m `catch` h
89+ where
90+ h :: OrmoluException -> IO ()
91+ h = expectationFailure . displayException