From 4392e67eac9369e1e8888dccf827cc427c398ec9 Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Sat, 24 Sep 2022 05:21:21 +0200 Subject: [PATCH 1/2] Begin using rescript 10.1 to test the extension. --- .../reanalyze/examples/deadcode/package-lock.json | 14 +++++++------- analysis/reanalyze/examples/deadcode/package.json | 2 +- .../examples/termination/package-lock.json | 14 +++++++------- .../reanalyze/examples/termination/package.json | 2 +- analysis/tests/package-lock.json | 14 +++++++------- analysis/tests/package.json | 2 +- analysis/tests/src/expected/JsxV4.res.txt | 3 --- 7 files changed, 24 insertions(+), 27 deletions(-) diff --git a/analysis/reanalyze/examples/deadcode/package-lock.json b/analysis/reanalyze/examples/deadcode/package-lock.json index f0e393450..038f3fdf1 100644 --- a/analysis/reanalyze/examples/deadcode/package-lock.json +++ b/analysis/reanalyze/examples/deadcode/package-lock.json @@ -14,7 +14,7 @@ "devDependencies": { "react": "^16.13.1", "react-dom": "^16.8.6", - "rescript": "^10.0.1" + "rescript": "^10.1.0-alpha.2" } }, "../../../../../rescript-compiler": { @@ -106,9 +106,9 @@ "license": "MIT" }, "node_modules/rescript": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.0.1.tgz", - "integrity": "sha512-XwO1GPDtoEU4H03xQE5bp0/qtSVR6YLaJRPxWKrfFgKc+LI36ODOCie7o9UJfgzQdoMYkkZyiTGZ4N9OQEaiUw==", + "version": "10.1.0-alpha.2", + "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.1.0-alpha.2.tgz", + "integrity": "sha512-uaWt6+Br7rxV339mE2ir80fjihq3XtQ88uPYt4otd1VgFXQRA+x/kof1xAUQULMEJKxBz0ifDDoL+3K6JiNG7Q==", "dev": true, "hasInstallScript": true, "bin": { @@ -176,9 +176,9 @@ "version": "16.13.1" }, "rescript": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.0.1.tgz", - "integrity": "sha512-XwO1GPDtoEU4H03xQE5bp0/qtSVR6YLaJRPxWKrfFgKc+LI36ODOCie7o9UJfgzQdoMYkkZyiTGZ4N9OQEaiUw==", + "version": "10.1.0-alpha.2", + "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.1.0-alpha.2.tgz", + "integrity": "sha512-uaWt6+Br7rxV339mE2ir80fjihq3XtQ88uPYt4otd1VgFXQRA+x/kof1xAUQULMEJKxBz0ifDDoL+3K6JiNG7Q==", "dev": true }, "scheduler": { diff --git a/analysis/reanalyze/examples/deadcode/package.json b/analysis/reanalyze/examples/deadcode/package.json index 546d5b6ce..176f6dff8 100644 --- a/analysis/reanalyze/examples/deadcode/package.json +++ b/analysis/reanalyze/examples/deadcode/package.json @@ -5,7 +5,7 @@ "devDependencies": { "react": "^16.13.1", "react-dom": "^16.8.6", - "rescript": "^10.0.1" + "rescript": "^10.1.0-alpha.2" }, "dependencies": { "@glennsl/bs-json": "^5.0.4", diff --git a/analysis/reanalyze/examples/termination/package-lock.json b/analysis/reanalyze/examples/termination/package-lock.json index 359f25aa7..6ec076cf1 100644 --- a/analysis/reanalyze/examples/termination/package-lock.json +++ b/analysis/reanalyze/examples/termination/package-lock.json @@ -8,13 +8,13 @@ "name": "termination", "version": "0.1.0", "devDependencies": { - "rescript": "^10.0.1" + "rescript": "^10.1.0-alpha.2" } }, "node_modules/rescript": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.0.1.tgz", - "integrity": "sha512-XwO1GPDtoEU4H03xQE5bp0/qtSVR6YLaJRPxWKrfFgKc+LI36ODOCie7o9UJfgzQdoMYkkZyiTGZ4N9OQEaiUw==", + "version": "10.1.0-alpha.2", + "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.1.0-alpha.2.tgz", + "integrity": "sha512-uaWt6+Br7rxV339mE2ir80fjihq3XtQ88uPYt4otd1VgFXQRA+x/kof1xAUQULMEJKxBz0ifDDoL+3K6JiNG7Q==", "dev": true, "hasInstallScript": true, "bin": { @@ -27,9 +27,9 @@ }, "dependencies": { "rescript": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.0.1.tgz", - "integrity": "sha512-XwO1GPDtoEU4H03xQE5bp0/qtSVR6YLaJRPxWKrfFgKc+LI36ODOCie7o9UJfgzQdoMYkkZyiTGZ4N9OQEaiUw==", + "version": "10.1.0-alpha.2", + "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.1.0-alpha.2.tgz", + "integrity": "sha512-uaWt6+Br7rxV339mE2ir80fjihq3XtQ88uPYt4otd1VgFXQRA+x/kof1xAUQULMEJKxBz0ifDDoL+3K6JiNG7Q==", "dev": true } } diff --git a/analysis/reanalyze/examples/termination/package.json b/analysis/reanalyze/examples/termination/package.json index 2264e6d24..47e93aa17 100644 --- a/analysis/reanalyze/examples/termination/package.json +++ b/analysis/reanalyze/examples/termination/package.json @@ -3,6 +3,6 @@ "version": "0.1.0", "private": true, "devDependencies": { - "rescript": "^10.0.1" + "rescript": "^10.1.0-alpha.2" } } diff --git a/analysis/tests/package-lock.json b/analysis/tests/package-lock.json index 32657510d..0922c5665 100644 --- a/analysis/tests/package-lock.json +++ b/analysis/tests/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "rescript": "^10.0.1" + "rescript": "^10.1.0-alpha.2" }, "devDependencies": { "@rescript/react": "^0.10.3" @@ -18,9 +18,9 @@ "dev": true }, "node_modules/rescript": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.0.1.tgz", - "integrity": "sha512-XwO1GPDtoEU4H03xQE5bp0/qtSVR6YLaJRPxWKrfFgKc+LI36ODOCie7o9UJfgzQdoMYkkZyiTGZ4N9OQEaiUw==", + "version": "10.1.0-alpha.2", + "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.1.0-alpha.2.tgz", + "integrity": "sha512-uaWt6+Br7rxV339mE2ir80fjihq3XtQ88uPYt4otd1VgFXQRA+x/kof1xAUQULMEJKxBz0ifDDoL+3K6JiNG7Q==", "hasInstallScript": true, "bin": { "bsc": "bsc", @@ -38,9 +38,9 @@ "dev": true }, "rescript": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.0.1.tgz", - "integrity": "sha512-XwO1GPDtoEU4H03xQE5bp0/qtSVR6YLaJRPxWKrfFgKc+LI36ODOCie7o9UJfgzQdoMYkkZyiTGZ4N9OQEaiUw==" + "version": "10.1.0-alpha.2", + "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.1.0-alpha.2.tgz", + "integrity": "sha512-uaWt6+Br7rxV339mE2ir80fjihq3XtQ88uPYt4otd1VgFXQRA+x/kof1xAUQULMEJKxBz0ifDDoL+3K6JiNG7Q==" } } } diff --git a/analysis/tests/package.json b/analysis/tests/package.json index aa09e5772..340963da9 100644 --- a/analysis/tests/package.json +++ b/analysis/tests/package.json @@ -8,6 +8,6 @@ "@rescript/react": "^0.10.3" }, "dependencies": { - "rescript": "^10.0.1" + "rescript": "^10.1.0-alpha.2" } } diff --git a/analysis/tests/src/expected/JsxV4.res.txt b/analysis/tests/src/expected/JsxV4.res.txt index 3b9a0fbac..b791e9ecf 100644 --- a/analysis/tests/src/expected/JsxV4.res.txt +++ b/analysis/tests/src/expected/JsxV4.res.txt @@ -1,7 +1,4 @@ Definition src/JsxV4.res 7:9 -getLocItem #9: heuristic for JSX variadic, e.g. {x} {y} -heuristic for: [React.null, makeProps, make, createElementVariadic], give the loc of `make` -n1:() n2:makeProps n3:make n4:createElement {"uri": "JsxV4.res", "range": {"start": {"line": 4, "character": 6}, "end": {"line": 4, "character": 10}}} Complete src/JsxV4.res 10:20 From d7cce0632389e5faa9af9065184f152879b3d678 Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Sat, 24 Sep 2022 05:31:04 +0200 Subject: [PATCH 2/2] Remove warnings from tests. --- analysis/tests/src/InlayHint.res | 2 +- analysis/tests/src/Jsx2.res | 4 ++++ analysis/tests/src/expected/InlayHint.res.txt | 14 +------------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/analysis/tests/src/InlayHint.res b/analysis/tests/src/InlayHint.res index 7b72342df..07f1f08e0 100644 --- a/analysis/tests/src/InlayHint.res +++ b/analysis/tests/src/InlayHint.res @@ -24,7 +24,7 @@ type foo = { } let bar = () => ({name: "ReScript", age: 2}, tuple) -let ({name, age}, t) = bar() +let ({name:_, age:_}, t) = bar() let alice = { name: "Alice", diff --git a/analysis/tests/src/Jsx2.res b/analysis/tests/src/Jsx2.res index 6ee94d39d..5e3878abb 100644 --- a/analysis/tests/src/Jsx2.res +++ b/analysis/tests/src/Jsx2.res @@ -168,3 +168,7 @@ let _ = { <> {<> } // ^hov } + +module type ExtT = module type of Ext + +let _ = module(Ext: ExtT) diff --git a/analysis/tests/src/expected/InlayHint.res.txt b/analysis/tests/src/expected/InlayHint.res.txt index b9bef15fa..151d7f228 100644 --- a/analysis/tests/src/expected/InlayHint.res.txt +++ b/analysis/tests/src/expected/InlayHint.res.txt @@ -18,23 +18,11 @@ Inlay Hint src/InlayHint.res 1:34 "paddingLeft": true, "paddingRight": false }, { - "position": {"line": 26, "character": 19}, + "position": {"line": 26, "character": 23}, "label": ": (string, string)", "kind": 1, "paddingLeft": true, "paddingRight": false -}, { - "position": {"line": 26, "character": 15}, - "label": ": int", - "kind": 1, - "paddingLeft": true, - "paddingRight": false -}, { - "position": {"line": 26, "character": 10}, - "label": ": string", - "kind": 1, - "paddingLeft": true, - "paddingRight": false }, { "position": {"line": 18, "character": 9}, "label": ": string",