bdc9ea0 · elk · git.iko.soy

git.iko.soy/elk

Track region on module exposing (..) for docs error message

commitbdc9ea0bfe90e5a356a8c2c4276c95287cd5c8f4 authorEvan Czaplicki <evancz@users.noreply.github.com> dateThu 1 Feb 2018, 23:34 (9 years ago) parent42e0884

8 files changed+14−14

compare with master

unifiedsplit

src/AST/Canonical.hs+1−1 src/AST/Source.hs+1−1 src/AST/Valid.hs+2−2 src/Canonicalize/Module.hs+3−3 src/Elm/Docs.hs+2−2 src/Elm/Interface.hs+1−1 src/Parse/Module.hs+1−1 src/Reporting/Error/Docs.hs+3−3

src/AST/Canonical.hs+1−1

@@ -254,7 +254,7 @@ data Docs

254254

255255

256256data Exports

257− = ExportEverything

257+ = ExportEverything R.Region

258258 | Export (Map.Map N.Name (A.Located Export))

259259

260260

src/AST/Source.hs+1−1

@@ -143,7 +143,7 @@ data Header

143143 = Header

144144 { _name :: N.Name

145145 , _effects :: Effects

146− , _exports :: Exposing

146+ , _exports :: A.Located Exposing

147147 , _docs :: Docs

148148 }

149149

src/AST/Valid.hs+2−2

@@ -77,7 +77,7 @@ data Module =

7777 { _name :: N.Name

7878 , _overview :: Src.Docs

7979 , _docs :: Map.Map N.Name Text

80− , _exports :: Src.Exposing

80+ , _exports :: A.Located Src.Exposing

8181 , _imports :: [Src.Import]

8282 , _decls :: [A.Located Decl]

8383 , _unions :: [Union]

@@ -114,7 +114,7 @@ defaultModule docs imports decls unions aliases binop =

114114 { _name = "Main"

115115 , _overview = Src.NoDocs zero zero

116116 , _docs = docs

117− , _exports = Src.Open

117+ , _exports = A.at zero zero Src.Open

118118 , _imports = imports

119119 , _decls = decls

120120 , _unions = unions

src/Canonicalize/Module.hs+3−3

@@ -221,12 +221,12 @@ canonicalizeExports

221221 -> Map.Map N.Name alias

222222 -> Map.Map N.Name binop

223223 -> Can.Effects

224− -> Src.Exposing

224+ -> A.Located Src.Exposing

225225 -> Result i w Can.Exports

226−canonicalizeExports decls unions aliases binops effects exposing =

226+canonicalizeExports decls unions aliases binops effects (A.At region exposing) =

227227 case exposing of

228228 Src.Open ->

229− Result.ok Can.ExportEverything

229+ Result.ok (Can.ExportEverything region)

230230

231231 Src.Explicit exposeds ->

232232 do let names = Map.fromList (map declToName decls)

src/Elm/Docs.hs+2−2

@@ -289,8 +289,8 @@ precDecoder =

289289fromModule :: Can.Module -> Result.Result i w Error.Error Module

290290fromModule (Can.Module name docs exports decls unions aliases binops effects) =

291291 case exports of

292− Can.ExportEverything ->

293− Result.throw $ Error.Docs $ E.ImplicitExposing

292+ Can.ExportEverything region ->

293+ Result.throw $ Error.Docs $ E.ImplicitExposing region

294294

295295 Can.Export exportDict ->

296296 case docs of

src/Elm/Interface.hs+1−1

@@ -67,7 +67,7 @@ fromModule types (Can.Module _ _ exports _ unions aliases binops _) =

6767privatize :: Can.Exports -> (a -> A.Located Can.Export -> a) -> Map.Map N.Name a -> Map.Map N.Name a

6868privatize exports func dict =

6969 case exports of

70− Can.ExportEverything ->

70+ Can.ExportEverything _ ->

7171 dict

7272

7373 Can.Export explicitExports ->

src/Parse/Module.hs+1−1

@@ -43,7 +43,7 @@ chompHeader =

4343 (name, effects) <- chompNameAndEffects

4444 P.hint E.Exposing $ Keyword.exposing_

4545 P.spaces

46− exports <- exposing

46+ exports <- P.addLocation exposing

4747 P.popContext ()

4848 docs <- chompDocComment

4949 return (Src.Header name effects exports docs)

src/Reporting/Error/Docs.hs+3−3

@@ -18,7 +18,7 @@ import qualified Reporting.Report as Report

1818

1919data Error

2020 = NoDocs R.Region

21− | ImplicitExposing

21+ | ImplicitExposing R.Region

2222 | Duplicate N.Name R.Region R.Region

2323 | OnlyInDocs N.Name R.Region

2424 | OnlyInExports N.Name R.Region

@@ -45,8 +45,8 @@ toReport source err =

4545 "Learn more at <http://package.elm-lang.org/help/documentation-format>"

4646 ]

4747

48− ImplicitExposing ->

49− Report.Report "IMPLICIT EXPOSING" (error "TODO") [] $

48+ ImplicitExposing region ->

49+ Report.Report "IMPLICIT EXPOSING" region [] $

5050 H.stack

5151 [

5252 H.reflow $