2353a39 · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

Merge pull request #2470 from kRITZCREEK/psc-ide-cleanup

Cleanup

commit2353a3965d9cf5c5db02ace20efd41eecae55f65 authorPhil Freeman <paf31@cantab.net> dateThu 8 Dec 2016, 21:32 (10 years ago) parent4960ef0 22616a1

32 files changed+40−111

compare with golang

unifiedsplit

psc-ide-client/Main.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module Main where

43import Prelude ()

src/Language/PureScript/AST/Operators.hs−2

@@ -1,5 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

2−

31-- |

42-- Operators fixity and associativity

53--

src/Language/PureScript/AST/SourcePos.hs−2

@@ -1,5 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

2−

31-- |

42-- Source position information

53--

src/Language/PureScript/Docs/Convert.hs−2

@@ -1,5 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

2−

31-- | Functions for converting PureScript ASTs into values of the data types

42-- from Language.PureScript.Docs.

src/Language/PureScript/Docs/Types.hs−2

@@ -1,5 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

2−

31module Language.PureScript.Docs.Types

42 ( module Language.PureScript.Docs.Types

53 , module ReExports

src/Language/PureScript/Ide.hs+4−5

@@ -12,7 +12,6 @@

1212-- Interface for the psc-ide-server

1313-----------------------------------------------------------------------------

1414

15−{-# LANGUAGE OverloadedStrings #-}

1615{-# LANGUAGE PackageImports #-}

1716{-# LANGUAGE TemplateHaskell #-}

1817

@@ -110,7 +109,7 @@ findPursuitPackages (PursuitQuery q) =

110109 PursuitResult <$> liftIO (findPackagesForModuleIdent q)

111110

112111printModules :: Ide m => m Success

113−printModules = ModuleList . map runModuleNameT <$> getLoadedModulenames

112+printModules = ModuleList . map P.runModuleName <$> getLoadedModulenames

114113

115114outputDirectory :: Ide m => m FilePath

116115outputDirectory = do

@@ -175,12 +174,12 @@ loadModules moduleNames = do

175174 efiles <- traverse readExternFile efPaths

176175 traverse_ insertExterns efiles

177176

178− -- We parse all source files, log eventual parse failures if the debug flag

179− -- was set and insert the succesful parses into the state.

177+ -- We parse all source files, log eventual parse failures and insert the

178+ -- successful parses into the state.

180179 (failures, allModules) <-

181180 partitionEithers <$> (traverse parseModule =<< findAllSourceFiles)

182181 unless (null failures) $

183− $(logDebug) ("Failed to parse: " <> show failures)

182+ $(logWarn) ("Failed to parse: " <> show failures)

184183 traverse_ insertModule allModules

185184

186185 -- Finally we kick off the worker with @async@ and return the number of

src/Language/PureScript/Ide/CaseSplit.hs+4−6

@@ -12,8 +12,6 @@

1212-- Casesplitting and adding function clauses

1313-----------------------------------------------------------------------------

1414

15−{-# LANGUAGE OverloadedStrings #-}

16−

1715module Language.PureScript.Ide.CaseSplit

1816 ( WildcardAnnotations()

1917 , explicitAnnotations

@@ -84,9 +82,9 @@ splitTypeConstructor = go []

8482 go _ _ = throwError (GeneralError "Failed to read TypeConstructor")

8583

8684prettyCtor :: WildcardAnnotations -> Constructor -> Text

87−prettyCtor _ (ctorName, []) = runProperNameT ctorName

85+prettyCtor _ (ctorName, []) = P.runProperName ctorName

8886prettyCtor wsa (ctorName, ctorArgs) =

89− "("<> runProperNameT ctorName <> " "

87+ "("<> P.runProperName ctorName <> " "

9088 <> T.unwords (map (prettyPrintWildcard wsa) ctorArgs) <>")"

9189

9290prettyPrintWildcard :: WildcardAnnotations -> P.Type -> Text

@@ -111,9 +109,9 @@ addClause :: (MonadError PscIdeError m) => Text -> WildcardAnnotations -> m [Tex

111109addClause s wca = do

112110 (fName, fType) <- parseTypeDeclaration' s

113111 let args = splitFunctionType fType

114− template = runIdentT fName <> " " <>

112+ template = P.runIdent fName <> " " <>

115113 T.unwords (map (prettyPrintWildcard wca) args) <>

116− " = ?" <> (T.strip . runIdentT $ fName)

114+ " = ?" <> (T.strip . P.runIdent $ fName)

117115 pure [s, template]

118116

119117parseType' :: (MonadError PscIdeError m) =>

src/Language/PureScript/Ide/Command.hs−3

@@ -12,9 +12,6 @@

1212-- Datatypes for the commands psc-ide accepts

1313-----------------------------------------------------------------------------

1414

15−{-# LANGUAGE OverloadedStrings #-}

16−

17−

1815module Language.PureScript.Ide.Command where

1916

2017import Protolude

src/Language/PureScript/Ide/Completion.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module Language.PureScript.Ide.Completion

32 ( getCompletions

43 , getExactMatches

src/Language/PureScript/Ide/Conversions.hs+4−16

@@ -15,27 +15,15 @@

1515module Language.PureScript.Ide.Conversions where

1616

1717import Control.Lens.Iso

18−import Data.Text (lines, strip, unwords)

18+import Data.Text (lines, strip, unwords, pack)

1919import qualified Language.PureScript as P

2020import Protolude

2121

22−runProperNameT :: P.ProperName a -> Text

23−runProperNameT = toS . P.runProperName

24−

2522properNameT :: Iso' (P.ProperName a) Text

26−properNameT = iso (toS . P.runProperName) (P.ProperName . toS)

27−

28−runIdentT :: P.Ident -> Text

29−runIdentT = toS . P.runIdent

23+properNameT = iso P.runProperName P.ProperName

3024

3125identT :: Iso' P.Ident Text

32−identT = iso (toS . P.runIdent) (P.Ident . toS)

33−

34−runOpNameT :: P.OpName a -> Text

35−runOpNameT = toS . P.runOpName

36−

37−runModuleNameT :: P.ModuleName -> Text

38−runModuleNameT = toS . P.runModuleName

26+identT = iso P.runIdent P.Ident

3927

4028prettyTypeT :: P.Type -> Text

41−prettyTypeT = unwords . map strip . lines . toS . P.prettyPrintType

29+prettyTypeT = unwords . map strip . lines . pack . P.prettyPrintType

src/Language/PureScript/Ide/Error.hs−1

@@ -12,7 +12,6 @@

1212-- Error types for psc-ide

1313-----------------------------------------------------------------------------

1414

15−{-# LANGUAGE OverloadedStrings #-}

1615module Language.PureScript.Ide.Error

1716 ( PscIdeError(..)

1817 ) where

src/Language/PureScript/Ide/Externs.hs+2−3

@@ -12,7 +12,6 @@

1212-- Handles externs files for psc-ide

1313-----------------------------------------------------------------------------

1414

15−{-# LANGUAGE RecordWildCards #-}

1615{-# LANGUAGE PackageImports #-}

1716

1817module Language.PureScript.Ide.Externs

@@ -133,13 +132,13 @@ annotateModule (defs, types) (moduleName, decls) =

133132 IdeDeclDataConstructor dtor ->

134133 annotateValue (dtor ^. ideDtorName . properNameT) (IdeDeclDataConstructor dtor)

135134 IdeDeclTypeClass i ->

136− annotateType (runProperNameT i) (IdeDeclTypeClass i)

135+ annotateType (i ^. properNameT) (IdeDeclTypeClass i)

137136 IdeDeclValueOperator op ->

138137 annotateValue (op ^. ideValueOpAlias & valueOperatorAliasT) (IdeDeclValueOperator op)

139138 IdeDeclTypeOperator op ->

140139 annotateType (op ^. ideTypeOpAlias & typeOperatorAliasT) (IdeDeclTypeOperator op)

141140 where

142− annotateFunction x = IdeDeclarationAnn (ann { annLocation = Map.lookup (Left (runIdentT x)) defs

141+ annotateFunction x = IdeDeclarationAnn (ann { annLocation = Map.lookup (Left (P.runIdent x)) defs

143142 , annTypeAnnotation = Map.lookup x types

144143 })

145144 annotateValue x = IdeDeclarationAnn (ann {annLocation = Map.lookup (Left x) defs})

src/Language/PureScript/Ide/Filter.hs−1

@@ -13,7 +13,6 @@

1313-----------------------------------------------------------------------------

1414

1515{-# LANGUAGE GeneralizedNewtypeDeriving #-}

16−{-# LANGUAGE OverloadedStrings #-}

1716

1817module Language.PureScript.Ide.Filter

1918 ( Filter

src/Language/PureScript/Ide/Imports.hs−2

@@ -12,8 +12,6 @@

1212-- Provides functionality to manage imports

1313-----------------------------------------------------------------------------

1414

15−{-# LANGUAGE OverloadedStrings #-}

16−

1715module Language.PureScript.Ide.Imports

1816 ( addImplicitImport

1917 , addImportForIdentifier

src/Language/PureScript/Ide/Matcher.hs−1

@@ -14,7 +14,6 @@

1414

1515{-# LANGUAGE FlexibleInstances #-}

1616{-# LANGUAGE GeneralizedNewtypeDeriving #-}

17−{-# LANGUAGE OverloadedStrings #-}

1817

1918module Language.PureScript.Ide.Matcher

2019 ( Matcher

src/Language/PureScript/Ide/Pursuit.hs−2

@@ -12,8 +12,6 @@

1212-- Pursuit client for psc-ide

1313-----------------------------------------------------------------------------

1414

15−{-# LANGUAGE OverloadedStrings #-}

16−

1715module Language.PureScript.Ide.Pursuit

1816 ( searchPursuitForDeclarations

1917 , findPackagesForModuleIdent

src/Language/PureScript/Ide/Rebuild.hs+1−5

@@ -1,8 +1,5 @@

1−{-# LANGUAGE OverloadedStrings #-}

21{-# LANGUAGE PackageImports #-}

3−{-# LANGUAGE RecordWildCards #-}

42{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TupleSections #-}

74module Language.PureScript.Ide.Rebuild

85 ( rebuildFile

@@ -20,7 +17,6 @@ import Language.PureScript.Errors.JSON

2017import Language.PureScript.Ide.Error

2118import Language.PureScript.Ide.State

2219import Language.PureScript.Ide.Types

23−import Language.PureScript.Ide.Util

2420import System.IO.UTF8 (readUTF8FileT)

2521

2622-- | Given a filepath performs the following steps:

@@ -96,7 +92,7 @@ rebuildModuleOpen makeEnv externs m = do

9692 throwError (GeneralError "Failed when rebuilding with open exports")

9793 Right result -> do

9894 $(logDebug)

99− ("Setting Rebuild cache: " <> runModuleNameT (P.efModuleName result))

95+ ("Setting Rebuild cache: " <> P.runModuleName (P.efModuleName result))

10096 cacheRebuild result

10197

10298-- | Parameters we can access while building our @MakeActions@

src/Language/PureScript/Ide/Reexports.hs+1−4

@@ -13,9 +13,6 @@

1313-- Resolves reexports for psc-ide

1414-----------------------------------------------------------------------------

1515

16−{-# LANGUAGE OverloadedStrings #-}

17−{-# LANGUAGE RecordWildCards #-}

18−

1916module Language.PureScript.Ide.Reexports

2017 ( resolveReexports

2118 , prettyPrintReexportResult

@@ -53,7 +50,7 @@ prettyPrintReexportResult f ReexportResult{..}

5350 | otherwise =

5451 "Failed to resolve reexports for "

5552 <> f reResolved

56− <> foldMap (\(mn, ref) -> runModuleNameT mn <> show ref) reFailed

53+ <> foldMap (\(mn, ref) -> P.runModuleName mn <> show ref) reFailed

5754

5855-- | Whether any Refs couldn't be resolved

5956reexportHasFailures :: ReexportResult a -> Bool

src/Language/PureScript/Ide/SourceFile.hs+10−12

@@ -12,8 +12,6 @@

1212-- Getting declarations from PureScript sourcefiles

1313-----------------------------------------------------------------------------

1414

15−{-# LANGUAGE OverloadedStrings #-}

16−

1715module Language.PureScript.Ide.SourceFile

1816 ( parseModule

1917 , getImportsForFile

@@ -60,9 +58,9 @@ getImportsForFile fp = do

6058 where

6159 mkModuleImport (mn, importType', qualifier) =

6260 ModuleImport

63− (runModuleNameT mn)

61+ (P.runModuleName mn)

6462 importType'

65− (runModuleNameT <$> qualifier)

63+ (P.runModuleName <$> qualifier)

6664 unwrapPositionedImport (mn, it, q) = (mn, unwrapImportType it, q)

6765 unwrapImportType (P.Explicit decls) = P.Explicit (map unwrapPositionedRef decls)

6866 unwrapImportType (P.Hiding decls) = P.Hiding (map unwrapPositionedRef decls)

@@ -101,18 +99,18 @@ extractSpans ss d = case d of

10199 P.PositionedDeclaration ss' _ d' ->

102100 extractSpans ss' d'

103101 P.ValueDeclaration i _ _ _ ->

104− [(Left (runIdentT i), ss)]

102+ [(Left (P.runIdent i), ss)]

105103 P.TypeSynonymDeclaration name _ _ ->

106− [(Right (runProperNameT name), ss)]

104+ [(Right (P.runProperName name), ss)]

107105 P.TypeClassDeclaration name _ _ _ members ->

108− (Right (runProperNameT name), ss) : concatMap (extractSpans' ss) members

106+ (Right (P.runProperName name), ss) : concatMap (extractSpans' ss) members

109107 P.DataDeclaration _ name _ ctors ->

110− (Right (runProperNameT name), ss)

111− : map (\(cname, _) -> (Left (runProperNameT cname), ss)) ctors

108+ (Right (P.runProperName name), ss)

109+ : map (\(cname, _) -> (Left (P.runProperName cname), ss)) ctors

112110 P.ExternDeclaration ident _ ->

113− [(Left (runIdentT ident), ss)]

111+ [(Left (P.runIdent ident), ss)]

114112 P.ExternDataDeclaration name _ ->

115− [(Right (runProperNameT name), ss)]

113+ [(Right (P.runProperName name), ss)]

116114 _ -> []

117115 where

118116 -- We need this special case to be able to also get the position info for

@@ -123,5 +121,5 @@ extractSpans ss d = case d of

123121 P.PositionedDeclaration ssP' _ dP' ->

124122 extractSpans' ssP' dP'

125123 P.TypeDeclaration ident _ ->

126− [(Left (runIdentT ident), ssP)]

124+ [(Left (P.runIdent ident), ssP)]

127125 _ -> []

src/Language/PureScript/Ide/State.hs+1−2

@@ -12,7 +12,6 @@

1212-- Functions to access psc-ide's state

1313-----------------------------------------------------------------------------

1414

15−{-# LANGUAGE OverloadedStrings #-}

1615{-# LANGUAGE PackageImports #-}

1716{-# LANGUAGE TemplateHaskell #-}

1817

@@ -194,7 +193,7 @@ populateStage3 = do

194193 let message duration = "Finished populating Stage3 in " <> displayTimeSpec duration

195194 results <- logPerf message (liftIO (atomically (populateStage3STM st)))

196195 traverse_

197− (logWarnN . prettyPrintReexportResult (runModuleNameT . fst))

196+ (logWarnN . prettyPrintReexportResult (P.runModuleName . fst))

198197 (filter reexportHasFailures results)

199198

200199-- | STM version of populateStage3

src/Language/PureScript/Ide/Types.hs+3−4

@@ -25,7 +25,6 @@ import Data.Aeson

2525import qualified Data.Map.Lazy as M

2626import qualified Language.PureScript as P

2727import qualified Language.PureScript.Errors.JSON as P

28−import Language.PureScript.Ide.Conversions

2928

3029type ModuleIdent = Text

3130

@@ -212,9 +211,9 @@ instance ToJSON ModuleImport where

212211 ] ++ map (\x -> "qualifier" .= x) (maybeToList qualifier)

213212

214213identifierFromDeclarationRef :: P.DeclarationRef -> Text

215−identifierFromDeclarationRef (P.TypeRef name _) = runProperNameT name

216−identifierFromDeclarationRef (P.ValueRef ident) = runIdentT ident

217−identifierFromDeclarationRef (P.TypeClassRef name) = runProperNameT name

214+identifierFromDeclarationRef (P.TypeRef name _) = P.runProperName name

215+identifierFromDeclarationRef (P.ValueRef ident) = P.runIdent ident

216+identifierFromDeclarationRef (P.TypeClassRef name) = P.runProperName name

218217identifierFromDeclarationRef _ = ""

219218

220219data Success =

src/Language/PureScript/Ide/Util.hs+10−12

@@ -12,8 +12,6 @@

1212-- Generally useful functions

1313-----------------------------------------------------------------------------

1414

15−{-# LANGUAGE OverloadedStrings #-}

16−

1715module Language.PureScript.Ide.Util

1816 ( identifierFromIdeDeclaration

1917 , unwrapMatch

@@ -48,9 +46,9 @@ identifierFromIdeDeclaration d = case d of

4846 IdeDeclType t -> t ^. ideTypeName . properNameT

4947 IdeDeclTypeSynonym s -> s ^. ideSynonymName . properNameT

5048 IdeDeclDataConstructor dtor -> dtor ^. ideDtorName . properNameT

51− IdeDeclTypeClass name -> runProperNameT name

52− IdeDeclValueOperator op -> op ^. ideValueOpName & runOpNameT

53− IdeDeclTypeOperator op -> op ^. ideTypeOpName & runOpNameT

49+ IdeDeclTypeClass name -> P.runProperName name

50+ IdeDeclValueOperator op -> op ^. ideValueOpName & P.runOpName

51+ IdeDeclTypeOperator op -> op ^. ideTypeOpName & P.runOpName

5452

5553discardAnn :: IdeDeclarationAnn -> IdeDeclaration

5654discardAnn (IdeDeclarationAnn _ d) = d

@@ -70,13 +68,13 @@ completionFromMatch (Match (m, IdeDeclarationAnn ann decl)) =

7068 IdeDeclType t -> (t ^. ideTypeName . properNameT, t ^. ideTypeKind & P.prettyPrintKind & toS )

7169 IdeDeclTypeSynonym s -> (s ^. ideSynonymName . properNameT, s ^. ideSynonymType & prettyTypeT)

7270 IdeDeclDataConstructor d -> (d ^. ideDtorName . properNameT, d ^. ideDtorType & prettyTypeT)

73− IdeDeclTypeClass name -> (runProperNameT name, "class")

71+ IdeDeclTypeClass name -> (P.runProperName name, "class")

7472 IdeDeclValueOperator (IdeValueOperator op ref precedence associativity typeP) ->

75− (runOpNameT op, maybe (showFixity precedence associativity (valueOperatorAliasT ref) op) prettyTypeT typeP)

73+ (P.runOpName op, maybe (showFixity precedence associativity (valueOperatorAliasT ref) op) prettyTypeT typeP)

7674 IdeDeclTypeOperator (IdeTypeOperator op ref precedence associativity kind) ->

77− (runOpNameT op, maybe (showFixity precedence associativity (typeOperatorAliasT ref) op) (toS . P.prettyPrintKind) kind)

75+ (P.runOpName op, maybe (showFixity precedence associativity (typeOperatorAliasT ref) op) (toS . P.prettyPrintKind) kind)

7876

79− complModule = runModuleNameT m

77+ complModule = P.runModuleName m

8078

8179 complType = maybe complExpandedType prettyTypeT (annTypeAnnotation ann)

8280

@@ -89,17 +87,17 @@ completionFromMatch (Match (m, IdeDeclarationAnn ann decl)) =

8987 P.Infix -> "infix"

9088 P.Infixl -> "infixl"

9189 P.Infixr -> "infixr"

92− in T.unwords [asso, show p, r, "as", runOpNameT o]

90+ in T.unwords [asso, show p, r, "as", P.runOpName o]

9391

9492valueOperatorAliasT

9593 :: P.Qualified (Either P.Ident (P.ProperName 'P.ConstructorName)) -> Text

9694valueOperatorAliasT i =

97− toS (P.showQualified (either P.runIdent P.runProperName) i)

95+ P.showQualified (either P.runIdent P.runProperName) i

9896

9997typeOperatorAliasT

10098 :: P.Qualified (P.ProperName 'P.TypeName) -> Text

10199typeOperatorAliasT i =

102− toS (P.showQualified P.runProperName i)

100+ P.showQualified P.runProperName i

103101

104102encodeT :: (ToJSON a) => a -> Text

105103encodeT = toS . decodeUtf8 . encode

src/Language/PureScript/Interactive.hs−4

@@ -1,8 +1,4 @@

11{-# LANGUAGE DoAndIfThenElse #-}

2−{-# LANGUAGE FlexibleContexts #-}

3−{-# LANGUAGE MultiParamTypeClasses #-}

4−{-# LANGUAGE TupleSections #-}

5−{-# LANGUAGE DataKinds #-}

73module Language.PureScript.Interactive

84 ( handleCommand

src/Language/PureScript/Interactive/Completion.hs−2

@@ -1,5 +1,3 @@

1−{-# LANGUAGE DataKinds #-}

2−

31module Language.PureScript.Interactive.Completion

42 ( CompletionM

53 , liftCompletionM

src/Language/PureScript/Interactive/Printer.hs−3

@@ -1,6 +1,3 @@

1−{-# LANGUAGE RecordWildCards #-}

2−{-# LANGUAGE DataKinds #-}

3−

41module Language.PureScript.Interactive.Printer where

63import Prelude.Compat

src/Language/PureScript/Make.hs−1

@@ -1,6 +1,5 @@

11{-# LANGUAGE GeneralizedNewtypeDeriving #-}

22{-# LANGUAGE TypeFamilies #-}

3−{-# LANGUAGE OverloadedStrings #-}

54module Language.PureScript.Make

65 (

src/Language/PureScript/Publish.hs−1

@@ -1,5 +1,4 @@

11{-# LANGUAGE GeneralizedNewtypeDeriving #-}

2−{-# LANGUAGE OverloadedStrings #-}

43module Language.PureScript.Publish

54 ( preparePackage

src/Language/PureScript/Publish/ErrorsWarnings.hs−2

@@ -1,5 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

2−

31module Language.PureScript.Publish.ErrorsWarnings

42 ( PackageError(..)

53 , PackageWarning(..)

src/Language/PureScript/Sugar/TypeClasses/Deriving.hs−3

@@ -1,6 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

2−{-# LANGUAGE PatternGuards #-}

3−

41-- |

52-- This module implements the generic deriving elaboration that takes place during desugaring.

63--

src/Language/PureScript/TypeChecker/Subsumption.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE DataKinds #-}

21{-# LANGUAGE GADTs #-}

32{-# LANGUAGE TypeFamilies #-}

src/Language/PureScript/TypeChecker/TypeSearch.hs−4

@@ -1,7 +1,3 @@

1−{-# LANGUAGE NoImplicitPrelude #-}

2−{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE RecordWildCards #-}

4−

51module Language.PureScript.TypeChecker.TypeSearch

62 ( typeSearch

73 ) where

src/Language/PureScript/TypeChecker/Types.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE LambdaCase #-}

21{-# LANGUAGE NamedFieldPuns #-}

43-- |