Hopefully fix VFS loading (by falling back to loadByURI)

tools/lsp/squirrel/app/Main.hs

@@ -232,22 +232,27 @@ loadFromVFS
   -> J.Uri
   -> IO (LIGO Info')
 loadFromVFS funs uri = do
-  Just vf <- Core.getVirtualFileFunc funs $ J.toNormalizedUri uri
+  Core.getVirtualFileFunc funs
-  let txt = virtualFileText vf
+    (J.toNormalizedUri uri)
-  let Just fin = J.uriToFilePath uri
+    >>= \case
-  (tree, _) <- parse (Text fin txt)
+      Just vf -> do
-  return $ addLocalScopes tree
+        let txt = virtualFileText vf
+        let Just fin = J.uriToFilePath uri
+        (tree, _) <- parse (Text fin txt)
+        return $ addLocalScopes tree
+      Nothing -> do
+        loadByURI uri
 
--- loadByURI
+loadByURI
---   :: J.Uri
+  :: J.Uri
---   -> IO (LIGO Info')
+  -> IO (LIGO Info')
--- loadByURI uri = do
+loadByURI uri = do
---   case J.uriToFilePath uri of
+  case J.uriToFilePath uri of
---     Just fin -> do
+    Just fin -> do
---       (tree, _) <- runParserM . recognise =<< toParseTree (Path fin)
+      (tree, _) <- parse (Path fin)
---       return $ addLocalScopes tree
+      return $ addLocalScopes tree
---     Nothing -> do
+    Nothing -> do
---       error $ "uriToFilePath " ++ show uri ++ " has failed. We all are doomed."
+      error $ "uriToFilePath " ++ show uri ++ " has failed. We all are doomed."
 
 collectErrors
   :: Core.LspFuncs ()

tools/lsp/squirrel/src/AST/Camligo/Parser.hs

@@ -15,7 +15,7 @@ import ParseTree
 
 -- import Debug.Trace
 
-example :: FilePath
+-- example :: FilePath
 -- example = "../../../src/test/contracts/address.mligo"
 -- example = "../../../src/test/contracts/amount_lambda.mligo"
 -- example = "../../../src/test/contracts/attributes.mligo"