Skip to content

Commit 4f3ffa4

Browse files
committed
Use a list for expressions
1 parent fd697e7 commit 4f3ffa4

File tree

1 file changed

+9
-19
lines changed

1 file changed

+9
-19
lines changed

src/Simplify.elm

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2005,7 +2005,6 @@ All of these also apply for `Sub`.
20052005

20062006
-}
20072007

2008-
import Array exposing (Array)
20092008
import Dict exposing (Dict)
20102009
import Elm.Docs
20112010
import Elm.Syntax.Declaration as Declaration exposing (Declaration)
@@ -18007,7 +18006,7 @@ reversedCompositionChecks checkInfo fixesFromParent node =
1800718006
}
1800818007
node
1800918008
{ operators = []
18010-
, expressions = Array.empty
18009+
, expressions = []
1801118010
, parens = []
1801218011
}
1801318012
in
@@ -18035,18 +18034,9 @@ reversedCompositionChecks checkInfo fixesFromParent node =
1803518034
firstOperator
1803618035
(List.concat
1803718036
[ List.concatMap (\range -> removeRangeBoundariesFix range) parens
18038-
, expressions
18039-
|> Array.toIndexedList
18040-
|> List.filterMap
18041-
(\( index, range ) ->
18042-
case Array.get (Array.length expressions - index - 1) expressions of
18043-
Just oppositeExpressionRange ->
18044-
Fix.replaceRangeBy range (checkInfo.extractSourceCode oppositeExpressionRange)
18045-
|> Just
18046-
18047-
Nothing ->
18048-
Nothing
18049-
)
18037+
, List.map2 (\selfRange oppositeRange -> Fix.replaceRangeBy selfRange (checkInfo.extractSourceCode oppositeRange))
18038+
(List.reverse expressions)
18039+
expressions
1805018040
, List.map (\range -> Fix.replaceRangeBy range replacement) operators
1805118041
, fixesFromParent ()
1805218042
]
@@ -18062,8 +18052,8 @@ findCompositionElements :
1806218052
, replacement : String
1806318053
}
1806418054
-> Node Expression
18065-
-> { operators : List Range, expressions : Array Range, parens : List Range }
18066-
-> { operators : List Range, expressions : Array Range, parens : List Range }
18055+
-> { operators : List Range, expressions : List Range, parens : List Range }
18056+
-> { operators : List Range, expressions : List Range, parens : List Range }
1806718057
findCompositionElements context baseNode acc =
1806818058
let
1806918059
( Node nodeRange expr, parens ) =
@@ -18092,7 +18082,7 @@ findCompositionElements context baseNode acc =
1809218082
CallStyle.LeftToRight ->
1809318083
{ first = right, last = left }
1809418084

18095-
composition : { operators : List Range, expressions : Array Range, parens : List Range }
18085+
composition : { operators : List Range, expressions : List Range, parens : List Range }
1809618086
composition =
1809718087
findCompositionElements
1809818088
context
@@ -18112,13 +18102,13 @@ findCompositionElements context baseNode acc =
1811218102

1811318103
else
1811418104
{ operators = acc.operators
18115-
, expressions = Array.push nodeRange acc.expressions
18105+
, expressions = nodeRange :: acc.expressions
1811618106
, parens = parens
1811718107
}
1811818108

1811918109
_ ->
1812018110
{ operators = acc.operators
18121-
, expressions = Array.push nodeRange acc.expressions
18111+
, expressions = nodeRange :: acc.expressions
1812218112
, parens = parens
1812318113
}
1812418114

0 commit comments

Comments
 (0)