6cffe09 · gogol · git.iko.soy

gen/src/Gen/AST/Solve.hs+2−2

compare with develop

unifiedsplit

@@ -196,8 +196,8 @@ overlap :: (Eq a, Hashable a) => Set a -> Set a -> Bool

196overlap xs ys = not . Set.null $ Set.intersection xs ys

197

198acronymPrefixes :: Global -> [CI Text]

199−acronymPrefixes (global -> g) = filter (/= full) $

199+acronymPrefixes (global -> renameSpecial -> g) =

200− map CI.mk (xs ++ map suffix ys ++ zs)

200+ filter (/= full) $ map CI.mk (xs ++ map suffix ys ++ zs)

201 where

202 -- Take the next char

203 suffix x = Text.snoc x c

gen/src/Gen/Text.hs+8

@@ -88,6 +88,14 @@ renameBranch t

88 , (">=", "GreaterEqual")

89 ]

90

91+renameSpecial :: Text -> Text

92+renameSpecial t =

93+ case Text.uncons t of

94+ Nothing -> t

95+ Just (x, xs)

96+ | separator x -> renameSpecial xs

97+ | otherwise -> t

98+

91separator :: Char -> Bool

99separator :: Char -> Bool

92separator x =

100separator x =

93 x == '\\'

101 x == '\\'

gen/src/Gen/Types/Schema.hs+1−4

@@ -31,7 +31,6 @@ import Data.Aeson hiding (Array, Bool, Object, String)

31import qualified Data.Aeson as A

32import Data.Aeson.TH

33import Data.Aeson.Types (Parser)

34−import Data.Foldable (foldMap)

35import Data.Function (on)

34import Data.Function (on)

36import qualified Data.HashMap.Strict as Map

35import qualified Data.HashMap.Strict as Map

37import Data.Maybe

36import Data.Maybe

@@ -439,12 +438,10 @@ serviceName = Text.unpack . (<> "Service") . toCamel . _sCanonicalName

439

438

440scopeName :: Service a -> Text -> String

439scopeName :: Service a -> Text -> String

441scopeName s k = Text.unpack . toCamel $

440scopeName s k = Text.unpack . toCamel $

442− case parts of

441+ case filter (not . url) (Text.split (== '/') k) of

443 [] -> _sCanonicalName s <> "AllScope"

442 [] -> _sCanonicalName s <> "AllScope"

444 xs -> foldMap upperHead xs <> "Scope"

443 xs -> foldMap upperHead xs <> "Scope"

445 where

444 where

446− parts = filter (not . url) (Text.split (== '/') k)

447−

448 url x = Text.null x

445 url x = Text.null x

449 || Text.isPrefixOf "http" x

446 || Text.isPrefixOf "http" x

450 || Text.isPrefixOf "www" x

447 || Text.isPrefixOf "www" x