Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions analysis/src/shared_types.ml
Original file line number Diff line number Diff line change
Expand Up @@ -430,9 +430,7 @@ let get_cmt_path ~uri p =
match p with
| Impl {cmt} -> cmt
| Namespace {cmt} -> cmt
| IntfAndImpl {cmti; cmt} ->
let interface = String.ends_with ~suffix:"i" (Uri.to_path uri) in
if interface then cmti else cmt
| IntfAndImpl {cmti; cmt} -> if Uri.is_interface uri then cmti else cmt

module Tip = struct
type t = Value | Type | Field of string | Constructor of string | Module
Expand Down
3 changes: 2 additions & 1 deletion analysis/src/uri.ml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ let strip_path = ref false (* for use in tests *)

let from_path path = Lsp.Uri.of_path path
let from_string str = Lsp.Uri.of_string str
let is_interface uri = uri |> Lsp.Uri.to_string |> Filename.check_suffix "i"
let is_interface uri =
Lsp.Uri.to_path uri |> String.ends_with ~suffix:Literals.suffix_resi
let to_path uri =
(* Lsp.Uri.to_path remove the schema file:// but keep the `/` on start of path. *)
let p = Lsp.Uri.to_path uri in
Expand Down
1 change: 1 addition & 0 deletions changes/editor-interface-file-check.fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Find References and Rename no longer list a value of a `.resi` file twice and miss its `.res` side, and go to definition from a `.resi` declaration opens the implementation again.
22 changes: 15 additions & 7 deletions tests/analysis_tests/tests/src/expected/Cross.res.txt
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,15 @@ Rename src/Cross.res 21:28 xPrime
"end": { "character": 5, "line": 0 },
"start": { "character": 4, "line": 0 }
}
},
}
],
"textDocument": {
"uri": "file:///RenameWithInterface.resi",
"version": 0
}
},
{
"edits": [
{
"newText": "xPrime",
"range": {
Expand All @@ -136,7 +144,7 @@ Rename src/Cross.res 21:28 xPrime
}
],
"textDocument": {
"uri": "file:///RenameWithInterface.resi",
"uri": "file:///RenameWithInterface.res",
"version": 0
}
},
Expand Down Expand Up @@ -176,7 +184,7 @@ Definition src/Cross.res 27:32
"end": { "character": 5, "line": 0 },
"start": { "character": 4, "line": 0 }
},
"uri": "file:///DefinitionWithInterface.resi"
"uri": "file:///DefinitionWithInterface.res"
}

Definition src/Cross.res 30:36
Expand All @@ -185,7 +193,7 @@ Definition src/Cross.res 30:36
"end": { "character": 6, "line": 3 },
"start": { "character": 5, "line": 3 }
},
"uri": "file:///DefinitionWithInterface.resi"
"uri": "file:///DefinitionWithInterface.res"
}

TypeDefinition src/Cross.res 33:37
Expand All @@ -210,9 +218,9 @@ Path DefinitionWithInterface.a
Definition src/Cross.res 39:39
{
"range": {
"end": { "character": 12, "line": 6 },
"start": { "character": 2, "line": 6 }
"end": { "character": 7, "line": 9 },
"start": { "character": 6, "line": 9 }
},
"uri": "file:///DefinitionWithInterface.resi"
"uri": "file:///DefinitionWithInterface.res"
}

Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ Definition src/DefinitionWithInterface.resi 0:4
"end": { "character": 5, "line": 0 },
"start": { "character": 4, "line": 0 }
},
"uri": "file:///DefinitionWithInterface.resi"
"uri": "file:///DefinitionWithInterface.res"
}

Definition src/DefinitionWithInterface.resi 6:6
{
"range": {
"end": { "character": 12, "line": 6 },
"start": { "character": 2, "line": 6 }
"end": { "character": 7, "line": 9 },
"start": { "character": 6, "line": 9 }
},
"uri": "file:///DefinitionWithInterface.resi"
"uri": "file:///DefinitionWithInterface.res"
}

2 changes: 1 addition & 1 deletion tests/analysis_tests/tests/src/expected/Jsx2.res.txt
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ Definition src/Jsx2.res 58:11
"end": { "character": 8, "line": 1 },
"start": { "character": 4, "line": 1 }
},
"uri": "file:///Component.resi"
"uri": "file:///Component.res"
}

Complete src/Jsx2.res 68:10
Expand Down
2 changes: 1 addition & 1 deletion tests/analysis_tests/tests/src/expected/References.res.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ References src/References.res 23:15
"end": { "character": 8, "line": 1 },
"start": { "character": 4, "line": 1 }
},
"uri": "file:///ComponentInner.resi"
"uri": "file:///ComponentInner.res"
},
{
"range": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ References src/ReferencesWithInterface.resi 0:4
"end": { "character": 5, "line": 0 },
"start": { "character": 4, "line": 0 }
},
"uri": "file:///ReferencesWithInterface.resi"
"uri": "file:///ReferencesWithInterface.res"
},
{
"range": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,15 @@ Rename src/RenameWithInterface.resi 0:4 y
"end": { "character": 5, "line": 0 },
"start": { "character": 4, "line": 0 }
}
},
}
],
"textDocument": {
"uri": "file:///RenameWithInterface.resi",
"version": 0
}
},
{
"edits": [
{
"newText": "y",
"range": {
Expand All @@ -18,7 +26,7 @@ Rename src/RenameWithInterface.resi 0:4 y
}
],
"textDocument": {
"uri": "file:///RenameWithInterface.resi",
"uri": "file:///RenameWithInterface.res",
"version": 0
}
},
Expand Down
Loading