Extend incoming/outgoing call signatures to carry more information.

Author: toinehartman

rascal-lsp/src/main/rascal/library/demo/lang/pico/LanguageServer.rsc

@@ -65,10 +65,7 @@ set[LanguageService] picoLanguageServer(bool allowRecovery) = {
     execution(picoExecutionService),
     inlayHint(picoInlayHintService),
     definition(picoDefinitionService),
-    codeAction(picoCodeActionService),
-    callHierarchy(picoCallHierarchyService),
-    incomingCalls(picoIncomingCallsService),
-    outgoingCalls(picoOutgoingCallsService)
+    codeAction(picoCodeActionService)
 };
 
 set[LanguageService] picoLanguageServer() = picoLanguageServer(false);
@@ -199,18 +196,6 @@ value picoExecutionService(removeDecl(start[Program] program, IdType toBeRemoved
     return ("result": true);
 }
 
-set[CallHierarchyItem] picoCallHierarchyService(Focus _:[*_, call:(Expression) `<Id id>(<{Expression ","}* _>)`, *_])
-    = {item("<id>", function(), call@\loc)};
-
-default set[CallHierarchyItem] picoCallHierarchyService(Focus _)
-    = {};
-
-set[loc] picoIncomingCallsService(Focus focus:[(Expression) `<Id defId>(<{Expression ","}* _>)`, *_], value _)
-    = {call@\loc | /call:(Expression) `<Id callId>(<{Expression ","}* _>)` := focus[-1], "<defId>" == "<callId>"};
-
-set[loc] picoOutgoingCallsService(Focus focus:[(Expression) `<Id defId>(<{Expression ","}* _>)`, *_], value _)
-    = {call@\loc | /call:(Expression) `<Id callId>(<{Expression ","}* _>)` := focus[-1], "<defId>" == "<callId>"};
-
 @synopsis{The main function registers the Pico language with the IDE}
 @description{
 Register the Pico language and the contributions that supply the IDE with features.

rascal-lsp/src/main/rascal/library/util/LanguageServer.rsc

@@ -269,8 +269,8 @@ data LanguageService
     | implementation(set[loc] (Focus _focus) implementationService)
     | codeAction    (list[CodeAction] (Focus _focus) codeActionService)
     | callHierarchy (set[CallHierarchyItem] (Focus _focus) callHierarchyService)
-    | incomingCalls (set[loc] (Focus focus, value _data) incomingCallsService)
-    | outgoingCalls (set[loc] (Focus focus, value _data) outgoingCallsService)
+    | incomingCalls (rel[CallHierarchyItem, loc] (CallHierarchyItem f, Focus focus) incomingCallsService)
+    | outgoingCalls (rel[CallHierarchyItem, loc] (CallHierarchyItem f, Focus focus) outgoingCallsService)
     ;
 
 data CallHierarchyItem