resolve support works on VSCode (tests need to be redone)

Author: joyfulmantis

cabal.project

@@ -95,8 +95,8 @@ source-repository-package
 -- This is needed till lsp makes a release
 source-repository-package
   type:git
-  location: https://github.com/haskell/lsp
-  tag: 98ba7cc91436e93578e9882c7ef18660b5fd4dd4
+  location: https://github.com/joyfulmantis/lsp
+  tag: 5919f15f38e06a075590fc03bfe8e329566f691e
   subdir: lsp lsp-types lsp-test
 
 

plugins/hls-overloaded-record-dot-plugin/src/Ide/Plugin/OverloadedRecordDot.hs

@@ -18,8 +18,8 @@ import           Control.Monad                        (replicateM)
 import           Control.Monad.IO.Class               (MonadIO, liftIO)
 import           Control.Monad.Trans.Class            (lift)
 import           Control.Monad.Trans.Except           (ExceptT)
-import           Data.Aeson                           (FromJSON, ToJSON, decode,
-                                                       encode, fromJSON, toJSON)
+import           Data.Aeson                           (FromJSON, Result (..),
+                                                       ToJSON, fromJSON, toJSON)
 import           Data.Generics                        (GenericQ, everything,
                                                        everythingBut, mkQ)
 import qualified Data.IntMap.Strict                   as IntMap
@@ -148,30 +148,28 @@ instance NFData RecordSelectorExpr where
   rnf = rwhnf
 
 data ORDResolveData = ORDRD {
-  uri      :: NormalizedFilePath
+  uri      :: Uri
 , uniqueID :: Int
 } deriving (Generic, Show)
 instance ToJSON ORDResolveData
 instance FromJSON ORDResolveData
 
--- TODO: move the orphans to their packages
-instance ToJSON NormalizedFilePath
-instance FromJSON NormalizedFilePath
-instance ToJSON NormalizedUri
-instance FromJSON NormalizedUri
 descriptor :: Recorder (WithPriority Log) -> PluginId
                 -> PluginDescriptor IdeState
 descriptor recorder plId = (defaultPluginDescriptor plId)
     { pluginHandlers =
-      mkPluginHandler SMethod_TextDocumentCodeAction codeActionProvider <> mkPluginHandler SMethod_CodeActionResolve resolveProvider
+      mkPluginHandler SMethod_TextDocumentCodeAction codeActionProvider
+      <> mkPluginHandler SMethod_CodeActionResolve resolveProvider
+
     , pluginRules = collectRecSelsRule recorder
     }
 
 resolveProvider :: PluginMethodHandler IdeState 'Method_CodeActionResolve
 resolveProvider ideState pId ca@(CodeAction _ _ _ _ _ _ _ (Just resData)) =
     pluginResponse $ do
-        case decode . encode $ resData of
-            Just (ORDRD nfp int) -> do
+        case fromJSON $ resData of
+            Success (ORDRD uri int) -> do
+                nfp <- getNormalizedFilePath uri
                 CRSR _ crsDetails exts <- collectRecSelResult ideState nfp
                 pragma <- getFirstPragma pId ideState nfp
                 let pragmaEdit =
@@ -205,15 +203,15 @@ codeActionProvider ideState pId (CodeActionParams _ _ caDocId caRange _) =
             edits _ = []
             changes crsM crsD =
                 case supportsResolve of
-                    Just True -> Just $ WorkspaceEdit
+                    Just False -> Just $ WorkspaceEdit
                                     (Just (Map.singleton (fromNormalizedUri
                                             (normalizedFilePathToUri nfp))
                                             (edits (IntMap.lookup crsM crsD))))
                                     Nothing Nothing
                     _ -> Nothing
             resolveData crsM =
                 case supportsResolve of
-                    Just True -> Just $ toJSON $ ORDRD nfp crsM
+                    Just True -> Just $ toJSON $ ORDRD (caDocId ^. L.uri) crsM
                     _         -> Nothing
             mkCodeAction crsD crsM  = InR CodeAction
                 { -- We pass the record selector to the title function, so that