Skip to content

Commit a9b9545

Browse files
zthzth
committed
migrate away from Js namespace in analysis tests
1 parent b77973b commit a9b9545

20 files changed

+221
-312
lines changed

‎tests/analysis_tests/tests/src/Completion.res

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module MyList = Belt.List
1+
module MyList = List
22
// MyList.m
33
// ^com
44
// Array.
@@ -45,7 +45,7 @@ let fa: ForAuto.t = 34
4545
// fa->
4646
// ^com
4747

48-
// "hello"->Js.Dict.u
48+
// "hello"->String.in
4949
// ^com
5050

5151
module O = {
@@ -142,7 +142,7 @@ let foo = {
142142
type z = int
143143
let v = 44
144144
}
145-
exception MyException(int, string, float, array<Js.Json.t>)
145+
exception MyException(int, string, float, array<JSON.t>)
146146
let _ = raise(MyException(2, "", 1.0, []))
147147
add((x: Inner.z), Inner.v + y)
148148
}
@@ -170,8 +170,8 @@ module WithChildren = {
170170
// <WithChildren
171171
// ^com
172172

173-
// type t = Js.n
174-
// ^com
173+
// type t = n
174+
// ^com
175175
// type t = ForAuto.
176176
// ^com
177177

@@ -414,7 +414,7 @@ let onClick = evt => {
414414
evt->ReactEvent.Synthetic.preventDefault
415415
// SomeLocalModule.
416416
// ^com
417-
Js.log("Hello")
417+
Console.log("Hello")
418418
}
419419

420420
// let _ = 123->t

‎tests/analysis_tests/tests/src/CompletionDicts.res

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
// let dict = Js.Dict.fromArray([])
2-
// ^com
1+
// let dict = Dict.fromArray([])
2+
// ^com
33

4-
// let dict = Js.Dict.fromArray([()])
5-
// ^com
4+
// let dict = Dict.fromArray([()])
5+
// ^com
66

7-
// let dict = Js.Dict.fromArray([("key", )])
8-
// ^com
7+
// let dict = Dict.fromArray([("key", )])
8+
// ^com
99

1010
// ^in+
11-
let dict = Js.Dict.fromArray([
11+
let dict = Dict.fromArray([
1212
("key", true),
1313
// ("key2", )
1414
// ^com

‎tests/analysis_tests/tests/src/CompletionExpressions.res

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ let something = {
183183
let second2 = 1
184184
ignore(second)
185185
ignore(second2)
186-
Js.log(s)
187-
// ^com
186+
Console.log(s)
187+
// ^com
188188
}
189189

190190
let fff: recordWithOptionalField = {
@@ -314,7 +314,7 @@ open CompletionSupport
314314
// CompletionSupport.makeTestHidden()
315315
// ^com
316316

317-
let mkStuff = (r: Js.Re.t) => {
317+
let mkStuff = (r: RegExp.t) => {
318318
ignore(r)
319319
"hello"
320320
}
@@ -343,7 +343,7 @@ module Money: {
343343

344344
let make = (): t => zero
345345

346-
let fromInt = (int): t => int->Js.Int.toString
346+
let fromInt = (int): t => int->Int.toString
347347

348348
let plus = (m1, _) => m1
349349
}

‎tests/analysis_tests/tests/src/CompletionInferValues.res

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ module Div = {
4848
// let _ = <div onMouseEnter={event => { let btn = event->JsxEvent.Mouse.button; btn->t }} />
4949
// ^com
5050

51-
// let _ = <div onMouseEnter={event => { let btn = event->JsxEvent.Mouse.button->Belt.Int.toString; btn->spl }} />
52-
// ^com
51+
// let _ = <div onMouseEnter={event => { let btn = event->JsxEvent.Mouse.button->Int.toString; btn->spl }} />
52+
// ^com
5353

54-
// let _ = <div onMouseEnter={event => { let btn = event->JsxEvent.Mouse.button->Belt.Int.toString->Js.String2.split("/"); btn->ma }} />
55-
// ^com
54+
// let _ = <div onMouseEnter={event => { let btn = event->JsxEvent.Mouse.button->Int.toString->String.split("/"); btn->ma }} />
55+
// ^com
5656

5757
type someVariant = One | Two | Three(int, string)
5858
type somePolyVariant = [#one | #two | #three(int, string)]
@@ -145,8 +145,8 @@ let fn3 = (~cb: sameFileRecord => unit) => {
145145
// ^com
146146

147147
// Handles pipe chains as input for switch
148-
// let x = 123; switch x->Belt.Int.toString->Js.String2.split("/") { | }
149-
// ^com
148+
// let x = 123; switch x->Belt.Int.toString->String.split("/") { | }
149+
// ^com
150150

151151
// Regular completion works
152152
// let renderer = CompletionSupport2.makeRenderer(~prepare=() => "hello",~render=({support}) => {support.},())

‎tests/analysis_tests/tests/src/CompletionJsx.res

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ module SomeComponent = {
2020
// ^com
2121
// {"Some string"->st}
2222
// ^com
23-
// {"Some string"->Js.String2.trim->st}
24-
// ^com
23+
// {"Some string"->String.trim->st}
24+
// ^com
2525
// {someInt->}
2626
// ^com
2727
// {12->}

‎tests/analysis_tests/tests/src/CompletionJsxProps.res

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ let tsomeVar = #two
3838
@@jsxConfig({version: 4, mode: "automatic"})
3939

4040
module CompletableComponentLazy = {
41-
let loadComponent = () => Js.import(CompletableComponent.make)
41+
let loadComponent = () => import(CompletableComponent.make)
4242
let make = React.lazy_(loadComponent)
4343
}
4444

‎tests/analysis_tests/tests/src/CompletionPipeChain.res

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ let f = int->Integer.increment(2)
5555
// let _ = CompletionSupport.Test.make(1)->CompletionSupport.Test.addSelf(2)->
5656
// ^com
5757

58-
let _ = [123]->Js.Array2.forEach(v => Js.log(v))
58+
let _ = [123]->Array.forEach(v => Console.log(v))
5959
// ->
6060
// ^com
6161

@@ -99,7 +99,7 @@ let renderer = CompletionSupport2.makeRenderer(
9999
// Console.log(int->t)
100100
// ^com
101101

102-
let r = %re("/t/g")
102+
let r = /t/g
103103

104104
// r->la
105105
// ^com

‎tests/analysis_tests/tests/src/CompletionTypeT.res

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
let date = Some(Js.Date.make())
1+
let date = Some(Date.make())
22

3-
type withDate = {date: Js.Date.t}
3+
type withDate = {date: Date.t}
44

55
// let x = switch date { | }
66
// ^com

‎tests/analysis_tests/tests/src/DotPipeCompletionSpec.res

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,19 @@ let nnn: typeOutsideModule = {nname: "hello"}
8484
// Continuous completion
8585
let xxxx = [1, 2]
8686

87-
// xxxx->Js.Array2.filter(v => v > 10).filt
88-
// ^com
87+
// xxxx->Array.filter(v => v > 10).filt
88+
// ^com
8989

90-
// xxxx->Js.Array2.filter(v => v > 10)->Js.Array2.joinWith(",").includ
91-
// ^com
90+
// xxxx->Array.filter(v => v > 10)->Array.joinWith(",").includ
91+
// ^com
9292

9393
let str = "hello"
9494

95-
// str->Js.String2.toLowerCase.toUpperCa
96-
// ^com
95+
// str->String.toLowerCase.toUpperCa
96+
// ^com
9797

98-
// str->Js.String2.toLowerCase->Js.String2.toUpperCase.toLowerC
99-
// ^com
98+
// str->String.toLowerCase->String.toUpperCase.toLowerC
99+
// ^com
100100

101101
let cc = (t: typeOutsideModule) => {
102102
// t.

‎tests/analysis_tests/tests/src/Hover.res

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ module type Logger = {
5454

5555
module JsLogger: Logger = {
5656
// ^hov
57-
let log = (msg: string) => Js.log(msg)
57+
let log = (msg: string) => Console.log(msg)
5858
let _oneMore = 3
5959
}
6060

@@ -123,19 +123,19 @@ let typeDuplicate = AA.fnnxx
123123
@live let dd = 34
124124
// ^hov
125125

126-
let arity0a = (. ()) => {
126+
let arity0a = () => {
127127
//^hov
128128
let f = () => 3
129129
f
130130
}
131131

132-
let arity0b = (. (), . ()) => 3
132+
let arity0b = ((), ()) => 3
133133
// ^hov
134134

135-
let arity0c = (. (), ()) => 3
135+
let arity0c = ((), ()) => 3
136136
// ^hov
137137

138-
let arity0d = (. ()) => {
138+
let arity0d = () => {
139139
// ^hov
140140
let f = () => 3
141141
f

‎tests/analysis_tests/tests/src/PolyRec.res

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ let myTree = #Node(
1010
#Node(3, #Node(5, #Leaf, #Leaf), #Node(7, #Leaf, #Leaf)),
1111
)
1212

13-
let () = myTree->sum->Js.log
13+
let () = myTree->sum->Console.log
1414
// ^hov

‎tests/analysis_tests/tests/src/SignatureHelp.res

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ let three = Three("", [])
101101
let three2 = Three("", [])
102102
// ^she
103103

104-
let _deepestTakesPrecedence = [12]->Js.Array2.map(v =>
104+
let _deepestTakesPrecedence = [12]->Array.map(v =>
105105
if v > 0 {
106106
One({})
107107
// ^she

0 commit comments

Comments
 (0)