Skip to content

Example: rename Object.res to avoid conflicts with Core. #750

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 1 commit into from
Mar 13, 2023
Merged

Example: rename Object.res to avoid conflicts with Core. #750

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
12 changes: 6 additions & 6 deletions analysis/tests/src/Completion.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ let nestedObj = {"x": {"y": {"name": "a", "age": 32}}}
// nestedObj["x"]["y"]["
// ^com

let o: Object.objT = assert false
let o: Objects.objT = assert false
// o["a
// ^com

type nestedObjT = {"x": Object.nestedObjT}
type nestedObjT = {"x": Objects.nestedObjT}
let no: nestedObjT = assert false
// no["x"]["y"]["
// ^com
Expand All @@ -111,8 +111,8 @@ let r: rAlias = assert false
// r.
// ^com

// Object.Rec.recordVal.
// ^com
// Objects.Rec.recordVal.
// ^com

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

Expand All @@ -123,8 +123,8 @@ let make = () => {
<> </>
}

// Object.object["
// ^com
// Objects.object["
// ^com

let foo = {
let x = {
Expand Down
0 analysis/tests/src/Object.res → analysis/tests/src/Objects.res
View file
Open in desktop
File renamed without changes.
30 changes: 15 additions & 15 deletions analysis/tests/src/expected/Completion.res.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ Path o
}]

Complete src/Completion.res 104:17
posCursor:[104:17] posNoWhite:[104:16] Found expr:[104:3->125:18]
posCursor:[104:17] posNoWhite:[104:16] Found expr:[104:3->125:19]
Pexp_send [104:17->104:17] e:[104:3->104:15]
Completable: Cpath Value[no]["x"]["y"][""]
ContextPath Value[no]["x"]["y"][""]
Expand Down Expand Up @@ -694,13 +694,13 @@ Path r
"documentation": null
}]

Complete src/Completion.res 113:24
posCursor:[113:24] posNoWhite:[113:23] Found expr:[113:3->113:24]
Pexp_field [113:3->113:23] _:[116:0->113:24]
Completable: Cpath Value[Object, Rec, recordVal].""
ContextPath Value[Object, Rec, recordVal].""
ContextPath Value[Object, Rec, recordVal]
Path Object.Rec.recordVal
Complete src/Completion.res 113:25
posCursor:[113:25] posNoWhite:[113:24] Found expr:[113:3->113:25]
Pexp_field [113:3->113:24] _:[116:0->113:25]
Completable: Cpath Value[Objects, Rec, recordVal].""
ContextPath Value[Objects, Rec, recordVal].""
ContextPath Value[Objects, Rec, recordVal]
Path Objects.Rec.recordVal
[{
"label": "xx",
"kind": 5,
Expand Down Expand Up @@ -731,13 +731,13 @@ Path my
"documentation": null
}]

Complete src/Completion.res 125:18
posCursor:[125:18] posNoWhite:[125:17] Found expr:[125:3->145:32]
Pexp_send [125:18->125:18] e:[125:3->125:16]
Completable: Cpath Value[Object, object][""]
ContextPath Value[Object, object][""]
ContextPath Value[Object, object]
Path Object.object
Complete src/Completion.res 125:19
posCursor:[125:19] posNoWhite:[125:18] Found expr:[125:3->145:32]
Pexp_send [125:19->125:19] e:[125:3->125:17]
Completable: Cpath Value[Objects, object][""]
ContextPath Value[Objects, object][""]
ContextPath Value[Objects, object]
Path Objects.object
[{
"label": "name",
"kind": 4,
Expand Down
2 changes: 1 addition & 1 deletion analysis/tests/src/expected/CompletionExpressions.res.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ Path fnTakingRecord
"detail": "file module",
"documentation": null
}, {
"label": "Object",
"label": "Objects",
"kind": 9,
"tags": [],
"detail": "file module",
Expand Down
4 changes: 2 additions & 2 deletions analysis/tests/src/expected/CompletionFunctionArguments.res.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ Path someFnTakingVariant
"detail": "file module",
"documentation": null
}, {
"label": "Object",
"label": "Objects",
"kind": 9,
"tags": [],
"detail": "file module",
Expand Down Expand Up @@ -224,7 +224,7 @@ Path someFnTakingVariant
"detail": "file module",
"documentation": null
}, {
"label": "Object",
"label": "Objects",
"kind": 9,
"tags": [],
"detail": "file module",
Expand Down
2 changes: 1 addition & 1 deletion analysis/tests/src/expected/CompletionTypeAnnotation.res.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Path someVariant
"detail": "file module",
"documentation": null
}, {
"label": "Object",
"label": "Objects",
"kind": 9,
"tags": [],
"detail": "file module",
Expand Down
0 analysis/tests/src/expected/Object.res.txt → analysis/tests/src/expected/Objects.res.txt
View file
Open in desktop
File renamed without changes.