Skip to content
This repository was archived by the owner on Apr 24, 2021. It is now read-only.

Remove RResult #117

Merged
merged 1 commit into from
Apr 13, 2021
Merged

Remove RResult #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/RResult.ml
View file
Open in desktop

This file was deleted.

64 changes: 37 additions & 27 deletions src/References.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,27 +64,33 @@ let definedForLoc ~file ~getModule locKind =
| NotFound -> None
| LocalReference (stamp, tip) | Definition (stamp, tip) ->
inner ~file stamp tip
| GlobalReference (moduleName, path, tip) ->
(maybeLog ("Getting global " ^ moduleName);
match getModule moduleName with
| None -> Error ("Cannot get module " ^ moduleName)
| Some file -> (
let env = Query.fileEnv file in
match Query.resolvePath ~env ~path ~getModule with
| None -> Error ("Cannot resolve path " ^ pathToString path)
| Some (env, name) -> (
match Query.exportedForTip ~env name tip with
| None ->
Error ("Exported not found for tip " ^ name ^ " > " ^ tipToString tip)
| Some stamp -> (
maybeLog ("Getting for " ^ string_of_int stamp ^ " in " ^ name);

match inner ~file:env.file stamp tip with
| None -> Error "could not get defined"
| Some res ->
maybeLog "Yes!! got it";
Ok res))))
|> RResult.toOptionAndLog
| GlobalReference (moduleName, path, tip) -> (
maybeLog ("Getting global " ^ moduleName);
match getModule moduleName with
| None ->
Log.log ("Cannot get module " ^ moduleName);
None
| Some file -> (
let env = Query.fileEnv file in
match Query.resolvePath ~env ~path ~getModule with
| None ->
Log.log ("Cannot resolve path " ^ pathToString path);
None
| Some (env, name) -> (
match Query.exportedForTip ~env name tip with
| None ->
Log.log
("Exported not found for tip " ^ name ^ " > " ^ tipToString tip);
None
| Some stamp -> (
maybeLog ("Getting for " ^ string_of_int stamp ^ " in " ^ name);
match inner ~file:env.file stamp tip with
| None ->
Log.log "could not get defined";
None
| Some res ->
maybeLog "Yes!! got it";
Some res))))

let alternateDeclared ~file ~pathsForModule ~getUri declared tip =
match Hashtbl.find_opt pathsForModule file.moduleName with
Expand All @@ -97,19 +103,23 @@ let alternateDeclared ~file ~pathsForModule ~getUri declared tip =
let intfUri = Uri2.fromPath intf in
let implUri = Uri2.fromPath impl in
if intfUri = file.uri then
match getUri implUri |> RResult.toOptionAndLog with
| None -> None
| Some (file, extra) -> (
match getUri implUri with
| Error e ->
Log.log e;
None
| Ok (file, extra) -> (
match
Query.declaredForExportedTip ~stamps:file.stamps
~exported:file.contents.exported declared.name.txt tip
with
| None -> None
| Some declared -> Some (file, extra, declared))
else
match getUri intfUri |> RResult.toOptionAndLog with
| None -> None
| Some (file, extra) -> (
match getUri intfUri with
| Error e ->
Log.log e;
None
| Ok (file, extra) -> (
match
Query.declaredForExportedTip ~stamps:file.stamps
~exported:file.contents.exported declared.name.txt tip
Expand Down
11 changes: 5 additions & 6 deletions src/State.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ let converter src =

let newDocsForCmt ~moduleName cmtCache changed cmt src =
let uri = Uri2.fromPath (src |? cmt) in
match
Process_406.fileForCmt ~moduleName ~uri cmt (converter src)
|> RResult.toOptionAndLog
with
| None -> None
| Some file ->
match Process_406.fileForCmt ~moduleName ~uri cmt (converter src) with
| Error e ->
Log.log e;
None
| Ok file ->
Hashtbl.replace cmtCache cmt (changed, file);
Some file

Expand Down