From bc9e0a9c6b7e72fc42ab68e986d66f1cdb28ad78 Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Mon, 13 Mar 2023 13:20:43 +0100 Subject: [PATCH] Example: rename Object.res to avoid conflicts with Core. --- analysis/tests/src/Completion.res | 12 ++++---- .../tests/src/{Object.res => Objects.res} | 0 .../tests/src/expected/Completion.res.txt | 30 +++++++++---------- .../expected/CompletionExpressions.res.txt | 2 +- .../CompletionFunctionArguments.res.txt | 4 +-- .../expected/CompletionTypeAnnotation.res.txt | 2 +- .../{Object.res.txt => Objects.res.txt} | 0 7 files changed, 25 insertions(+), 25 deletions(-) rename analysis/tests/src/{Object.res => Objects.res} (100%) rename analysis/tests/src/expected/{Object.res.txt => Objects.res.txt} (100%) diff --git a/analysis/tests/src/Completion.res b/analysis/tests/src/Completion.res index 9246c2bdd..7b796546c 100644 --- a/analysis/tests/src/Completion.res +++ b/analysis/tests/src/Completion.res @@ -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 @@ -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 @@ -123,8 +123,8 @@ let make = () => { <> } -// Object.object[" -// ^com +// Objects.object[" +// ^com let foo = { let x = { diff --git a/analysis/tests/src/Object.res b/analysis/tests/src/Objects.res similarity index 100% rename from analysis/tests/src/Object.res rename to analysis/tests/src/Objects.res diff --git a/analysis/tests/src/expected/Completion.res.txt b/analysis/tests/src/expected/Completion.res.txt index 409d7b7b8..c9af48cd6 100644 --- a/analysis/tests/src/expected/Completion.res.txt +++ b/analysis/tests/src/expected/Completion.res.txt @@ -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"][""] @@ -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, @@ -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, diff --git a/analysis/tests/src/expected/CompletionExpressions.res.txt b/analysis/tests/src/expected/CompletionExpressions.res.txt index 64dddf545..5f8eeadb0 100644 --- a/analysis/tests/src/expected/CompletionExpressions.res.txt +++ b/analysis/tests/src/expected/CompletionExpressions.res.txt @@ -286,7 +286,7 @@ Path fnTakingRecord "detail": "file module", "documentation": null }, { - "label": "Object", + "label": "Objects", "kind": 9, "tags": [], "detail": "file module", diff --git a/analysis/tests/src/expected/CompletionFunctionArguments.res.txt b/analysis/tests/src/expected/CompletionFunctionArguments.res.txt index e15baa7a3..1e44949a7 100644 --- a/analysis/tests/src/expected/CompletionFunctionArguments.res.txt +++ b/analysis/tests/src/expected/CompletionFunctionArguments.res.txt @@ -164,7 +164,7 @@ Path someFnTakingVariant "detail": "file module", "documentation": null }, { - "label": "Object", + "label": "Objects", "kind": 9, "tags": [], "detail": "file module", @@ -224,7 +224,7 @@ Path someFnTakingVariant "detail": "file module", "documentation": null }, { - "label": "Object", + "label": "Objects", "kind": 9, "tags": [], "detail": "file module", diff --git a/analysis/tests/src/expected/CompletionTypeAnnotation.res.txt b/analysis/tests/src/expected/CompletionTypeAnnotation.res.txt index 88468602c..db1bb1a65 100644 --- a/analysis/tests/src/expected/CompletionTypeAnnotation.res.txt +++ b/analysis/tests/src/expected/CompletionTypeAnnotation.res.txt @@ -77,7 +77,7 @@ Path someVariant "detail": "file module", "documentation": null }, { - "label": "Object", + "label": "Objects", "kind": 9, "tags": [], "detail": "file module", diff --git a/analysis/tests/src/expected/Object.res.txt b/analysis/tests/src/expected/Objects.res.txt similarity index 100% rename from analysis/tests/src/expected/Object.res.txt rename to analysis/tests/src/expected/Objects.res.txt