Kill these two orphan instances and fix the tests.

semantic-python/test/Instances.hs

@@ -1,4 +1,12 @@
-{-# LANGUAGE DerivingStrategies, GeneralizedNewtypeDeriving, StandaloneDeriving, FlexibleInstances, NamedFieldPuns, OverloadedStrings, QuantifiedConstraints, TypeOperators, UndecidableInstances #-}
+{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuantifiedConstraints #-}
+{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Instances () where
@@ -8,14 +16,10 @@ module Instances () where
 -- we should keep track of them in a dedicated file.
 
 import           Analysis.File
-import           Core.Name (Name (..))
 import           Data.Aeson
 import           Data.Text (pack)
 import qualified System.Path as Path
 
-deriving newtype instance ToJSON Name
-deriving newtype instance ToJSONKey Name
-
 instance ToJSON a => ToJSON (File a) where
   toJSON File{filePath, fileSpan, fileBody} = object
     [ "path" .= filePath

semantic-python/test/Test.hs

@@ -1,4 +1,7 @@
-{-# LANGUAGE OverloadedStrings, ScopedTypeVariables, TypeApplications, TypeOperators #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeApplications #-}
+{-# LANGUAGE TypeOperators #-}
 {-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
 module Main (main) where
 
@@ -69,7 +72,7 @@ assertEvaluatesTo core k val = do
     (_, files) ->
       HUnit.assertFailure ("Unexpected number of files: " <> show (length files))
 
-  let found = Map.lookup (Name k) env >>= flip IntMap.lookup heap
+  let found = Map.lookup (name k) env >>= flip IntMap.lookup heap
   found HUnit.@?= Just val
 {-# HLINT ignore assertEvaluatesTo #-}