f9c58af · ormolu · git.iko.soy

git.iko.soy/ormolu

Implement rendering of ‘HsTypedSplice’ and ‘HsUntypedSplice’

commitf9c58af5940639a8ff95a949b83ef723d5a17ccc authorwaddlaw <ingronze@gmail.com> dateSun 16 Jun 2019, 16:11 (7 years ago) parent2c6a982

17 files changed+59−2

compare with master

unifiedsplit

data/examples/declaration/value/function/n-plus-k-pattern-out.hs → data/examples/declaration/value/function/pattern/n-plus-k-pattern-out.hsrenamed

The content is the same.

data/examples/declaration/value/function/n-plus-k-pattern.hs → data/examples/declaration/value/function/pattern/n-plus-k-pattern.hsrenamed

The content is the same.

data/examples/declaration/value/function/pattern-bind-out.hs → data/examples/declaration/value/function/pattern/pattern-bind-out.hsrenamed

The content is the same.

data/examples/declaration/value/function/pattern-bind.hs → data/examples/declaration/value/function/pattern/pattern-bind.hsrenamed

The content is the same.

data/examples/declaration/value/function/quasi-quotes-pattern-out.hs → data/examples/declaration/value/function/pattern/quasi-quotes-pattern-out.hsrenamed

The content is the same.

data/examples/declaration/value/function/quasi-quotes-pattern.hs → data/examples/declaration/value/function/pattern/quasi-quotes-pattern.hsrenamed

The content is the same.

data/examples/declaration/value/function/record-patterns-out.hs → data/examples/declaration/value/function/pattern/record-patterns-out.hsrenamed

The content is the same.

data/examples/declaration/value/function/record-patterns.hs → data/examples/declaration/value/function/pattern/record-patterns.hsrenamed

The content is the same.

data/examples/declaration/value/function/sig-pattern-out.hs → data/examples/declaration/value/function/pattern/sig-pattern-out.hsrenamed

The content is the same.

data/examples/declaration/value/function/sig-pattern.hs → data/examples/declaration/value/function/pattern/sig-pattern.hsrenamed

The content is the same.

data/examples/declaration/value/function/pattern/splice-pattern-out.hsnew file+12

@@ -0,0 +1,12 @@

1+{-# LANGUAGE TemplateHaskell #-}

2+singleLine = case () of

3+ $x -> ()

4+ $(y "something") -> ()

6+multiline = case () of

7+ $( x +

8+ y

9+ ) -> ()

10+ $( y

11+ "something'"

12+ ) -> ()

data/examples/declaration/value/function/pattern/splice-pattern.hsnew file+11

@@ -0,0 +1,11 @@

1+{-# LANGUAGE TemplateHaskell #-}

3+singleLine = case () of

4+ $x -> ()

5+ $(y "something") -> ()

7+multiline = case () of

8+ $(x

9+ + y) -> ()

10+ $(y

11+ "something'") -> ()

data/examples/declaration/value/function/view-pattern-out.hs → data/examples/declaration/value/function/pattern/view-pattern-out.hsrenamed

The content is the same.

data/examples/declaration/value/function/view-pattern.hs → data/examples/declaration/value/function/pattern/view-pattern.hsrenamed

The content is the same.

data/examples/declaration/value/function/splice-out.hsnew file+8

@@ -0,0 +1,8 @@

1+{-# LANGUAGE TemplateHaskell #-}

2+bar = $bar

4+bar' = $(bar "something")

6+baz = $$baz

8+baz' = $$(baz "something")

data/examples/declaration/value/function/splice.hsnew file+9

@@ -0,0 +1,9 @@

1+{-# LANGUAGE TemplateHaskell #-}

3+bar = $bar

5+bar' = $(bar "something")

7+baz = $$baz

9+baz' = $$(baz "something")

src/Ormolu/Printer/Meat/Declaration/Value.hs+19−2

@@ -541,8 +541,8 @@ p_pat_hsRecField HsRecField {..} = do

541541

542542p_hsSplice :: HsSplice GhcPs -> R ()

543543p_hsSplice = \case

544− HsTypedSplice {} -> notImplemented "HsTypedSplice"

545− HsUntypedSplice {} -> notImplemented "HsUntypedSplice"

544+ HsTypedSplice NoExt deco _ expr -> p_hsSpliceTH True expr deco

545+ HsUntypedSplice NoExt deco _ expr -> p_hsSpliceTH False expr deco

546546 HsQuasiQuote NoExt _ quoterName srcSpan str -> do

547547 let locatedQuoterName = L srcSpan quoterName

548548 p_quasiQuote locatedQuoterName $ do

@@ -551,6 +551,23 @@ p_hsSplice = \case

551551 HsSpliced {} -> notImplemented "HsSpliced"

552552 XSplice {} -> notImplemented "XSplice"

553553

554+p_hsSpliceTH

555+ :: Bool -- ^ Typed splice?

556+ -> LHsExpr GhcPs -- ^ Splice expression

557+ -> SpliceDecoration -- ^ Splice decoration

558+ -> R ()

559+p_hsSpliceTH isTyped expr = \case

560+ HasParens -> do

561+ txt decoSymbol

562+ parens (located expr p_hsExpr)

563+ HasDollar -> do

564+ txt decoSymbol

565+ located expr p_hsExpr

566+ NoParens -> do

567+ located expr p_hsExpr

568+ where

569+ decoSymbol = if isTyped then "$$" else "$"

570+

554571p_quasiQuote :: Located RdrName -> R () -> R ()

555572p_quasiQuote quoter m = do

556573 txt "["