Fix summaries/go-to-def for modules inside JAR (#668)

* Only resolve project URIs.
* Don't stat TPL in UI test.

Author: toinehartman

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/LSPIDEServices.java

@@ -91,19 +91,15 @@ public void browse(URI uri, String title, int viewColumn) {
 
     @Override
     public void edit(ISourceLocation path) {
-        try {
-            ISourceLocation physical = Locations.toClientLocation(path);
-            ShowDocumentParams params = new ShowDocumentParams(physical.getURI().toASCIIString());
-            params.setTakeFocus(true);
-
-            if (physical.hasOffsetLength()) {
-                params.setSelection(Locations.toRange(physical, docService.getColumnMap(physical)));
-            }
+        ISourceLocation physical = Locations.toClientLocation(path);
+        ShowDocumentParams params = new ShowDocumentParams(physical.getURI().toASCIIString());
+        params.setTakeFocus(true);
 
-            languageClient.showDocument(params);
-        } catch (IOException e) {
-            logger.info("ignored edit of {}, because {}", path, e);
+        if (physical.hasOffsetLength()) {
+            params.setSelection(Locations.toRange(physical, docService.getColumnMap(physical)));
         }
+
+        languageClient.showDocument(params);
     }
 
     @Override

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalLanguageServices.java

@@ -174,13 +174,7 @@ IFunction makePathConfigGetter(Evaluator e) {
 
     IFunction makeParseTreeGetter(Evaluator e) {
         return e.getFunctionValueFactory().function(getParseTreeType, (t, u) -> {
-            ISourceLocation resolvedLocation;
-            try {
-                resolvedLocation = Locations.toClientLocation((ISourceLocation) t[0]);
-            } catch (IOException e1) {
-                throw RuntimeExceptionFactory.io("Error resolving " + t[0]);
-            }
-            // First, check whether the file is open and a parse tree is available
+            ISourceLocation resolvedLocation = Locations.toClientLocation((ISourceLocation) t[0]);
             try {
                 var tree = rascalTextDocumentService.getFile(resolvedLocation).getLastTreeWithoutErrors();
                 if (tree != null) {

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/model/FileFacts.java

@@ -87,13 +87,8 @@ public void reportParseErrors(ISourceLocation file, List<Diagnostic> msgs) {
 
     private FileFact getFile(ISourceLocation l) {
         l = l.top();
-        ISourceLocation resolved = null;
-        try {
-            resolved = Locations.toClientLocation(l);
-            if (resolved == null) {
-                resolved = l;
-            }
-        } catch (IOException e) {
+        ISourceLocation resolved = Locations.toClientLocation(l);
+        if (resolved == null) {
             resolved = l;
         }
         return files.computeIfAbsent(resolved, l1 -> new FileFact(l1, exec));

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/terminal/TerminalIDEClient.java

@@ -101,19 +101,15 @@ public void browse(URI uri, String title, int viewColumn) {
 
     @Override
     public void edit(ISourceLocation path) {
-        try {
-            ISourceLocation physical = Locations.toClientLocation(path);
-            ShowDocumentParams params = new ShowDocumentParams(physical.getURI().toASCIIString());
-            params.setTakeFocus(true);
-
-            if (physical.hasOffsetLength()) {
-                params.setSelection(Locations.toRange(physical, columns));
-            }
+        ISourceLocation physical = Locations.toClientLocation(path);
+        ShowDocumentParams params = new ShowDocumentParams(physical.getURI().toASCIIString());
+        params.setTakeFocus(true);
 
-            server.edit(params);
-        } catch (IOException e) {
-            logger.info("ignored edit of {} because {}", path, e);
+        if (physical.hasOffsetLength()) {
+            params.setSelection(Locations.toRange(physical, columns));
         }
+
+        server.edit(params);
     }
 
     private String getContents(ISourceLocation file) {

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/util/Diagnostics.java

@@ -245,7 +245,7 @@ public static Map<ISourceLocation, List<Diagnostic>> translateMessages(IList mes
     }
 
     private static ISourceLocation getMessageLocation(IConstructor message) {
-        return Locations.toClientLocationIfPossible(((ISourceLocation) message.get("at")));
+        return Locations.toClientLocation(((ISourceLocation) message.get("at")));
     }
 
     private static boolean hasValidLocation(IConstructor d, ISourceLocation file) {

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/util/locations/Locations.java

@@ -48,21 +48,14 @@
  * strip source locations of their "lsp+" prefix.
  */
 public class Locations {
-    public static ISourceLocation toClientLocation(ISourceLocation loc) throws IOException {
-        return LSPOpenFileResolver.stripLspPrefix(URIResolverRegistry.getInstance().logicalToPhysical(loc));
-    }
-
-    public static ISourceLocation toClientLocationIfPossible(ISourceLocation loc) {
-        var result = toPhysicalIfPossible(loc);
-        if (result.getScheme().startsWith("lsp+")) {
-            try {
-                return URIUtil.changeScheme(result, result.getScheme().substring("lsp+".length()));
-            } catch (URISyntaxException e) {
-                // fall through
-            }
+    public static ISourceLocation toClientLocation(ISourceLocation loc) {
+        loc = LSPOpenFileResolver.stripLspPrefix(loc);
+        if (loc.getScheme().equals("project")) {
+            return toPhysicalIfPossible(loc);
         }
-        return result;
+        return loc;
     }
+
     public static ISourceLocation toPhysicalIfPossible(ISourceLocation loc) {
         ISourceLocation physical;
         try {

rascal-vscode-extension/src/test/vscode-suite/ide.test.ts

@@ -146,12 +146,21 @@ describe('IDE', function () {
         await editor.selectText("println");
         await bench.executeCommand("Go to Definition");
         await waitForActiveEditor("IO.rsc", Delays.extremelySlow, "IO.rsc should be opened for println");
+
+        await editor.selectText("&T", 0);
+        const defLoc = await editor.getCoordinates();
+
+        await editor.selectText("&T", 1);
+        await bench.executeCommand("Go to Definition");
+        const jumpLoc = await editor.getCoordinates();
+
+        expect(jumpLoc).to.deep.equal(defLoc);
     });
 
     it("go to definition works across projects", async () => {
         // due to a current bug, we have to make sure that the lib in the other project is correctly resolved
         const libEditor = await ide.openModule(TestWorkspace.libFile);
-        await triggerTypeChecker(libEditor, TestWorkspace.libFileTpl, true);
+        await triggerTypeChecker(libEditor, "", true);
         await bench.getEditorView().closeAllEditors();
 
         const editor = await ide.openModule(TestWorkspace.libCallFile);