Skip to content

Commit d618e4c

Browse files
committed
Example: rename Object.res to avoid conflicts with Core.
1 parent 13fc652 commit d618e4c

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

analysis/tests/src/Completion.res

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ let nestedObj = {"x": {"y": {"name": "a", "age": 32}}}
9696
// nestedObj["x"]["y"]["
9797
// ^com
9898

99-
let o: Object.objT = assert false
99+
let o: Objects.objT = assert false
100100
// o["a
101101
// ^com
102102

103-
type nestedObjT = {"x": Object.nestedObjT}
103+
type nestedObjT = {"x": Objects.nestedObjT}
104104
let no: nestedObjT = assert false
105105
// no["x"]["y"]["
106106
// ^com
@@ -111,8 +111,8 @@ let r: rAlias = assert false
111111
// r.
112112
// ^com
113113

114-
// Object.Rec.recordVal.
115-
// ^com
114+
// Objects.Rec.recordVal.
115+
// ^com
116116

117117
let myAmazingFunction = (x, y) => x + y
118118

@@ -123,8 +123,8 @@ let make = () => {
123123
<> </>
124124
}
125125

126-
// Object.object["
127-
// ^com
126+
// Objects.object["
127+
// ^com
128128

129129
let foo = {
130130
let x = {
File renamed without changes.

analysis/tests/src/expected/Completion.res.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ Path o
651651
}]
652652

653653
Complete src/Completion.res 104:17
654-
posCursor:[104:17] posNoWhite:[104:16] Found expr:[104:3->125:18]
654+
posCursor:[104:17] posNoWhite:[104:16] Found expr:[104:3->125:19]
655655
Pexp_send [104:17->104:17] e:[104:3->104:15]
656656
Completable: Cpath Value[no]["x"]["y"][""]
657657
ContextPath Value[no]["x"]["y"][""]
@@ -694,13 +694,13 @@ Path r
694694
"documentation": null
695695
}]
696696

697-
Complete src/Completion.res 113:24
698-
posCursor:[113:24] posNoWhite:[113:23] Found expr:[113:3->113:24]
699-
Pexp_field [113:3->113:23] _:[116:0->113:24]
700-
Completable: Cpath Value[Object, Rec, recordVal].""
701-
ContextPath Value[Object, Rec, recordVal].""
702-
ContextPath Value[Object, Rec, recordVal]
703-
Path Object.Rec.recordVal
697+
Complete src/Completion.res 113:25
698+
posCursor:[113:25] posNoWhite:[113:24] Found expr:[113:3->113:25]
699+
Pexp_field [113:3->113:24] _:[116:0->113:25]
700+
Completable: Cpath Value[Objects, Rec, recordVal].""
701+
ContextPath Value[Objects, Rec, recordVal].""
702+
ContextPath Value[Objects, Rec, recordVal]
703+
Path Objects.Rec.recordVal
704704
[{
705705
"label": "xx",
706706
"kind": 5,
@@ -731,13 +731,13 @@ Path my
731731
"documentation": null
732732
}]
733733

734-
Complete src/Completion.res 125:18
735-
posCursor:[125:18] posNoWhite:[125:17] Found expr:[125:3->145:32]
736-
Pexp_send [125:18->125:18] e:[125:3->125:16]
737-
Completable: Cpath Value[Object, object][""]
738-
ContextPath Value[Object, object][""]
739-
ContextPath Value[Object, object]
740-
Path Object.object
734+
Complete src/Completion.res 125:19
735+
posCursor:[125:19] posNoWhite:[125:18] Found expr:[125:3->145:32]
736+
Pexp_send [125:19->125:19] e:[125:3->125:17]
737+
Completable: Cpath Value[Objects, object][""]
738+
ContextPath Value[Objects, object][""]
739+
ContextPath Value[Objects, object]
740+
Path Objects.object
741741
[{
742742
"label": "name",
743743
"kind": 4,

analysis/tests/src/expected/CompletionExpressions.res.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ Path fnTakingRecord
286286
"detail": "file module",
287287
"documentation": null
288288
}, {
289-
"label": "Object",
289+
"label": "Objects",
290290
"kind": 9,
291291
"tags": [],
292292
"detail": "file module",

analysis/tests/src/expected/CompletionFunctionArguments.res.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ Path someFnTakingVariant
164164
"detail": "file module",
165165
"documentation": null
166166
}, {
167-
"label": "Object",
167+
"label": "Objects",
168168
"kind": 9,
169169
"tags": [],
170170
"detail": "file module",
@@ -224,7 +224,7 @@ Path someFnTakingVariant
224224
"detail": "file module",
225225
"documentation": null
226226
}, {
227-
"label": "Object",
227+
"label": "Objects",
228228
"kind": 9,
229229
"tags": [],
230230
"detail": "file module",

analysis/tests/src/expected/CompletionTypeAnnotation.res.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Path someVariant
7777
"detail": "file module",
7878
"documentation": null
7979
}, {
80-
"label": "Object",
80+
"label": "Objects",
8181
"kind": 9,
8282
"tags": [],
8383
"detail": "file module",

0 commit comments

Comments
 (0)