From d5b56fbb51628b5093c8170723727741353ec43d Mon Sep 17 00:00:00 2001
From: MMesch <MMesch@users.noreply.github.com>
Date: Sat, 14 Jul 2018 10:47:29 +0200
Subject: [PATCH] remove 'source' property from displayData message

---
 ipython-kernel/src/IHaskell/IPython/EasyKernel.hs     | 5 +----
 ipython-kernel/src/IHaskell/IPython/Message/Parser.hs | 3 +--
 ipython-kernel/src/IHaskell/IPython/Message/Writer.hs | 4 ++--
 ipython-kernel/src/IHaskell/IPython/Types.hs          | 1 -
 src/IHaskell/Eval/Widgets.hs                          | 8 ++++----
 src/IHaskell/Publish.hs                               | 2 +-
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/ipython-kernel/src/IHaskell/IPython/EasyKernel.hs b/ipython-kernel/src/IHaskell/IPython/EasyKernel.hs
index 093ed4c2..c0080647 100644
--- a/ipython-kernel/src/IHaskell/IPython/EasyKernel.hs
+++ b/ipython-kernel/src/IHaskell/IPython/EasyKernel.hs
@@ -203,12 +203,9 @@ replyTo config execCount interface req@ExecuteRequest { getCode = code } replyHe
                                       sendOutput x =
                                                       send $ PublishDisplayData
                                                                outputHeader
-                                                               (languageName $ kernelLanguageInfo
-                                                                                 config)
                                                                (displayOutput config x)
                                   in run config code clearOutput sendOutput
-  liftIO . send $ PublishDisplayData outputHeader (languageName $ kernelLanguageInfo config)
-                    (displayResult config res)
+  liftIO . send $ PublishDisplayData outputHeader (displayResult config res)
 
 
   idleHeader <- dupHeader replyHeader StatusMessage
diff --git a/ipython-kernel/src/IHaskell/IPython/Message/Parser.hs b/ipython-kernel/src/IHaskell/IPython/Message/Parser.hs
index 1f26ebb0..69f27d79 100644
--- a/ipython-kernel/src/IHaskell/IPython/Message/Parser.hs
+++ b/ipython-kernel/src/IHaskell/IPython/Message/Parser.hs
@@ -178,8 +178,7 @@ displayDataParser :: LByteString -> Message
 displayDataParser = requestParser $ \obj -> do
   dataDict :: Object <- obj .: "data"
   let displayDatas = makeDisplayDatas dataDict
-  maybeSource <- obj .:? "source"
-  return $ PublishDisplayData noHeader (fromMaybe "" maybeSource) displayDatas
+  return $ PublishDisplayData noHeader displayDatas
 
 requestParser parser content =
   case parseEither parser decoded of
diff --git a/ipython-kernel/src/IHaskell/IPython/Message/Writer.hs b/ipython-kernel/src/IHaskell/IPython/Message/Writer.hs
index d3ffcb88..2d202d52 100644
--- a/ipython-kernel/src/IHaskell/IPython/Message/Writer.hs
+++ b/ipython-kernel/src/IHaskell/IPython/Message/Writer.hs
@@ -76,9 +76,9 @@ instance ToJSON Message where
     object ["execution_state" .= executionState]
   toJSON PublishStream { streamType = streamType, streamContent = content } =
     object ["data" .= content, "name" .= streamType]
-  toJSON PublishDisplayData { source = src, displayData = datas } =
+  toJSON PublishDisplayData { displayData = datas } =
     object
-      ["source" .= src, "metadata" .= object [], "data" .= object (map displayDataToJson datas)]
+      ["metadata" .= object [], "data" .= object (map displayDataToJson datas)]
 
   toJSON PublishOutput { executionCount = execCount, reprText = reprText } =
     object
diff --git a/ipython-kernel/src/IHaskell/IPython/Types.hs b/ipython-kernel/src/IHaskell/IPython/Types.hs
index c40fe9bb..2eb2ca5e 100644
--- a/ipython-kernel/src/IHaskell/IPython/Types.hs
+++ b/ipython-kernel/src/IHaskell/IPython/Types.hs
@@ -366,7 +366,6 @@ data Message =
              |
                PublishDisplayData
                  { header :: MessageHeader
-                 , source :: String                      -- ^ The name of the data source.
                  , displayData :: [DisplayData]          -- ^ A list of data representations.
                  }
              |
diff --git a/src/IHaskell/Eval/Widgets.hs b/src/IHaskell/Eval/Widgets.hs
index 6eb97e71..aec8bec5 100644
--- a/src/IHaskell/Eval/Widgets.hs
+++ b/src/IHaskell/Eval/Widgets.hs
@@ -145,7 +145,7 @@ handleMessage send replyHeader state msg = do
 
     DispMsg widget disp -> do
       dispHeader <- dupHeader replyHeader DisplayDataMessage
-      let dmsg = WidgetDisplay dispHeader "haskell" $ unwrap disp
+      let dmsg = WidgetDisplay dispHeader $ unwrap disp
       sendMessage widget (toJSON $ CustomContent $ toJSON dmsg)
 
     ClrOutput widget wait -> do
@@ -170,11 +170,11 @@ handleMessage send replyHeader state msg = do
     unwrap (Display ddatas) = ddatas
 
 -- Override toJSON for PublishDisplayData for sending Display messages through [method .= custom]
-data WidgetDisplay = WidgetDisplay MessageHeader String [DisplayData]
+data WidgetDisplay = WidgetDisplay MessageHeader [DisplayData]
 
 instance ToJSON WidgetDisplay where
-  toJSON (WidgetDisplay replyHeader source ddata) =
-    let pbval = toJSON $ PublishDisplayData replyHeader source ddata
+  toJSON (WidgetDisplay replyHeader ddata) =
+    let pbval = toJSON $ PublishDisplayData replyHeader ddata
     in toJSON $ IPythonMessage replyHeader pbval DisplayDataMessage
 
 -- Override toJSON for ClearOutput
diff --git a/src/IHaskell/Publish.hs b/src/IHaskell/Publish.hs
index 0291b7bf..957dfdef 100644
--- a/src/IHaskell/Publish.hs
+++ b/src/IHaskell/Publish.hs
@@ -63,7 +63,7 @@ publishResult send replyHeader displayed updateNeeded pagerOutput usePager resul
     sendOutput (ManyDisplay manyOuts) = mapM_ sendOutput manyOuts
     sendOutput (Display outs) = do
       header <- dupHeader replyHeader DisplayDataMessage
-      send $ PublishDisplayData header "haskell" $ map (convertSvgToHtml . prependCss) outs
+      send $ PublishDisplayData header $ map (convertSvgToHtml . prependCss) outs
 
     convertSvgToHtml (DisplayData MimeSvg svg) = html $ makeSvgImg $ base64 $ E.encodeUtf8 svg
     convertSvgToHtml x = x