From c62a23867b83143a07cb53e5a1ef483c71496030 Mon Sep 17 00:00:00 2001 From: Ivan Iablochkin Date: Fri, 8 Aug 2025 13:57:54 +0000 Subject: [PATCH 1/3] remove constructor ticks --- .vscode/settings.json | 24 +++++++++++++++++-- .../Data/Morpheus/Server/Types/TypeName.hs | 6 ++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 0aa349b229..1d33d7d52b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,5 +3,25 @@ "[graphql]": { "editor.formatOnSave": false }, - "editor.renderWhitespace": "all" -} + "editor.renderWhitespace": "all", + "workbench.colorCustomizations": { + "activityBar.activeBackground": "#3f75e8", + "activityBar.background": "#3f75e8", + "activityBar.foreground": "#e7e7e7", + "activityBar.inactiveForeground": "#e7e7e799", + "activityBarBadge.background": "#8e1139", + "activityBarBadge.foreground": "#e7e7e7", + "commandCenter.border": "#e7e7e799", + "sash.hoverBorder": "#3f75e8", + "statusBar.background": "#1a57da", + "statusBar.foreground": "#e7e7e7", + "statusBarItem.hoverBackground": "#3f75e8", + "statusBarItem.remoteBackground": "#1a57da", + "statusBarItem.remoteForeground": "#e7e7e7", + "titleBar.activeBackground": "#1a57da", + "titleBar.activeForeground": "#e7e7e7", + "titleBar.inactiveBackground": "#1a57da99", + "titleBar.inactiveForeground": "#e7e7e799" + }, + "peacock.remoteColor": "#1a57da" +} \ No newline at end of file diff --git a/morpheus-graphql-server/src/Data/Morpheus/Server/Types/TypeName.hs b/morpheus-graphql-server/src/Data/Morpheus/Server/Types/TypeName.hs index 933d4b6d2f..0bb9261b32 100644 --- a/morpheus-graphql-server/src/Data/Morpheus/Server/Types/TypeName.hs +++ b/morpheus-graphql-server/src/Data/Morpheus/Server/Types/TypeName.hs @@ -76,7 +76,7 @@ instance Hashable TypeFingerprint where hashWithSalt s (CustomFingerprint x) = hashWithSalt s (3 :: Int, x) typeableTypename :: (Typeable a) => f a -> TypeName -typeableTypename = packName . intercalate "" . fmap (pack . tyConName . replacePairCon) . getTypeConstructors +typeableTypename = packName . intercalate "" . fmap (pack . dropLeadingTick . tyConName . replacePairCon) . getTypeConstructors toCategory :: CatType c a -> TypeCategory toCategory InputType = IN @@ -92,6 +92,10 @@ typeableFingerprint p = getTypeConstructors :: (Typeable a) => f a -> [TyCon] getTypeConstructors = ignoreResolver . splitTyConApp . typeRep +-- Filter out ticks from promoted constructors +dropLeadingTick :: String -> String +dropLeadingTick = Prelude.dropWhile (== '\'') + rep :: forall k (a :: k) f. (Typeable a) => f a -> TyCon rep = typeRepTyCon . typeRep From 9240ce48d4d3371aad5cfd0df934f261e1b21ff4 Mon Sep 17 00:00:00 2001 From: Ivan Iablochkin Date: Fri, 8 Aug 2025 14:18:17 +0000 Subject: [PATCH 2/3] settings json --- .vscode/settings.json | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 1d33d7d52b..d044a55738 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,25 +3,5 @@ "[graphql]": { "editor.formatOnSave": false }, - "editor.renderWhitespace": "all", - "workbench.colorCustomizations": { - "activityBar.activeBackground": "#3f75e8", - "activityBar.background": "#3f75e8", - "activityBar.foreground": "#e7e7e7", - "activityBar.inactiveForeground": "#e7e7e799", - "activityBarBadge.background": "#8e1139", - "activityBarBadge.foreground": "#e7e7e7", - "commandCenter.border": "#e7e7e799", - "sash.hoverBorder": "#3f75e8", - "statusBar.background": "#1a57da", - "statusBar.foreground": "#e7e7e7", - "statusBarItem.hoverBackground": "#3f75e8", - "statusBarItem.remoteBackground": "#1a57da", - "statusBarItem.remoteForeground": "#e7e7e7", - "titleBar.activeBackground": "#1a57da", - "titleBar.activeForeground": "#e7e7e7", - "titleBar.inactiveBackground": "#1a57da99", - "titleBar.inactiveForeground": "#e7e7e799" - }, - "peacock.remoteColor": "#1a57da" + "editor.renderWhitespace": "all" } \ No newline at end of file From 7fe25dbd20df01d408a8a2f02011e925f1b46cd9 Mon Sep 17 00:00:00 2001 From: Ivan Iablochkin Date: Fri, 8 Aug 2025 14:18:42 +0000 Subject: [PATCH 3/3] newline --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index d044a55738..0aa349b229 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,4 +4,4 @@ "editor.formatOnSave": false }, "editor.renderWhitespace": "all" -} \ No newline at end of file +}