Skip to content

Switch tests onto v11 alpha. #756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 11, 2023
Merged

Switch tests onto v11 alpha. #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95172ef
Switch tests onto v11 alpha.
cristianoc Apr 11, 2023
b54e0b4
No pervasives extension in debug.
cristianoc Apr 11, 2023
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
7 changes: 6 additions & 1 deletion analysis/src/CompletionBackEnd.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,12 @@ let getOpens ~debug ~rawOpens ~package ~env =
^ " "
^ String.concat " "
(resolvedOpens
|> List.map (fun (e : QueryEnv.t) -> Uri.toString e.file.uri)));
|> List.map (fun (e : QueryEnv.t) ->
let name = Uri.toString e.file.uri in

if Utils.startsWith name "pervasives." then
Filename.chop_extension name
else name)));
(* Last open takes priority *)
List.rev resolvedOpens

Expand Down
15 changes: 7 additions & 8 deletions analysis/tests/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion analysis/tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"@rescript/react": "^0.11.0-rc.3"
},
"dependencies": {
"rescript": "^10.1.4"
"rescript": "^11.0.0-alpha.1"
}
}
3 changes: 3 additions & 0 deletions analysis/tests/src/expected/BrokenParserCases.res.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ posCursor:[2:24] posNoWhite:[2:23] Found expr:[2:11->2:30]
Pexp_apply ...[2:11->2:17] (~isOff2:19->2:24=...[2:27->2:29])
Completable: CnamedArg(Value[someFn], isOff, [isOff])
Package opens Pervasives.JsxModules.place holder
Resolved opens 1 pervasives
ContextPath Value[someFn]
Path someFn
[]
Expand All @@ -11,6 +12,7 @@ Complete src/BrokenParserCases.res 6:17
posCursor:[6:17] posNoWhite:[6:16] Found pattern:[6:16->6:19]
Completable: Cpattern Value[s]=t
Package opens Pervasives.JsxModules.place holder
Resolved opens 1 pervasives
ContextPath Value[s]
Path s
[]
Expand All @@ -21,6 +23,7 @@ posCursor:[10:29] posNoWhite:[10:27] Found pattern:[10:24->10:28]
Ppat_construct None:[10:24->10:28]
Completable: Cpath Value[None]
Package opens Pervasives.JsxModules.place holder
Resolved opens 1 pervasives
ContextPath Value[None]
Path None
[]
Expand Down
1 change: 1 addition & 0 deletions analysis/tests/src/expected/CompletePrioritize1.res.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Complete src/CompletePrioritize1.res 5:6
posCursor:[5:6] posNoWhite:[5:5] Found expr:[5:3->0:-1]
Completable: Cpath Value[a]->
Package opens Pervasives.JsxModules.place holder
Resolved opens 1 pervasives
ContextPath Value[a]->
ContextPath Value[a]
Path a
Expand Down
2 changes: 2 additions & 0 deletions analysis/tests/src/expected/CompletePrioritize2.res.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Complete src/CompletePrioritize2.res 9:7
posCursor:[9:7] posNoWhite:[9:6] Found expr:[9:3->0:-1]
Completable: Cpath Value[ax]->
Package opens Pervasives.JsxModules.place holder
Resolved opens 1 pervasives
ContextPath Value[ax]->
ContextPath Value[ax]
Path ax
Expand All @@ -22,6 +23,7 @@ posCursor:[12:5] posNoWhite:[12:4] Found expr:[12:3->12:5]
Pexp_ident ax:[12:3->12:5]
Completable: Cpath Value[ax]
Package opens Pervasives.JsxModules.place holder
Resolved opens 1 pervasives
ContextPath Value[ax]
Path ax
[{
Expand Down
Loading