diff --git a/changelog/2544 b/changelog/2544 new file mode 100644 index 0000000000000000000000000000000000000000..789e726cf425b3ec09a0b717f5006e99784fede8 --- /dev/null +++ b/changelog/2544 @@ -0,0 +1,7 @@ + +author: er433 +description: "\\n" +merge_request: '2544' +title: "Resolve \"Typo in warning message\"" +type: fixed + \ No newline at end of file diff --git a/src/bin/expect_tests/contract_tests.ml b/src/bin/expect_tests/contract_tests.ml index 256a0333ea409a2dc492111675a77e4c0a42ac0f..c4f31adf9659e7844da2fff892eede7ce9bcf339 100644 --- a/src/bin/expect_tests/contract_tests.ml +++ b/src/bin/expect_tests/contract_tests.ml @@ -961,7 +961,7 @@ let%expect_test _ = 15 | }; ^ - Toplevel let declaration are silently change to const declaration. + Toplevel let declaration is silently changed to const declaration. { parameter (or (never %extend) (int %increment)) ; storage int ; @@ -1172,14 +1172,14 @@ let%expect_test _ = ^^^^^^^^^^^ 3 | } - Toplevel let declaration are silently change to const declaration. + Toplevel let declaration is silently changed to const declaration. File "../../test/contracts/negative/modules_export_const.jsligo", line 5, characters 0-15: 4 | 5 | let a = Bar.foo; ^^^^^^^^^^^^^^^ - Toplevel let declaration are silently change to const declaration. + Toplevel let declaration is silently changed to const declaration. Internal error: Entrypoint main does not exist |}]; run_ligo_bad [ "compile"; "contract"; bad_contract "modules_export_namespace.jsligo" ]; @@ -1191,7 +1191,7 @@ let%expect_test _ = ^^^^^^^^^ 4 | } - Toplevel let declaration are silently change to const declaration. + Toplevel let declaration is silently changed to const declaration. Internal error: Entrypoint main does not exist |}] @@ -2623,7 +2623,7 @@ File "../../test/contracts/extend_builtin.jsligo", line 2, characters 9-19: ^^^^^^^^^^ 3 | export let f = (x : int) : int => x + 2; -Toplevel let declaration are silently change to const declaration. +Toplevel let declaration is silently changed to const declaration. File "../../test/contracts/extend_builtin.jsligo", line 3, characters 9-42: 2 | export let x = 42; @@ -2631,14 +2631,14 @@ File "../../test/contracts/extend_builtin.jsligo", line 3, characters 9-42: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 | } -Toplevel let declaration are silently change to const declaration. +Toplevel let declaration is silently changed to const declaration. File "../../test/contracts/extend_builtin.jsligo", line 6, characters 0-24: 5 | 6 | let y = Tezos.f(Tezos.x); ^^^^^^^^^^^^^^^^^^^^^^^^ -Toplevel let declaration are silently change to const declaration. +Toplevel let declaration is silently changed to const declaration. 44 |}] diff --git a/src/bin/expect_tests/get_scope_regressions.ml b/src/bin/expect_tests/get_scope_regressions.ml index 0b8a259d008671c8b84c165969d77841ddcf3853..9e4c8d08e9dd87c64e2c11777ad21bb04d03161a 100644 --- a/src/bin/expect_tests/get_scope_regressions.ml +++ b/src/bin/expect_tests/get_scope_regressions.ml @@ -143,7 +143,7 @@ let%expect_test _ = 13 | let alice_admin : bool = alice.i ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - Toplevel let declaration are silently change to const declaration. |}] + Toplevel let declaration is silently changed to const declaration. |}] let%expect_test _ = run_ligo_good diff --git a/src/bin/expect_tests/michelson_pair_test.ml b/src/bin/expect_tests/michelson_pair_test.ml index 52b87b01a1cb93766d28b35119f3eb3d0c18cbfd..1325ef8b842bf068c1ae71acafce5063eb54602c 100644 --- a/src/bin/expect_tests/michelson_pair_test.ml +++ b/src/bin/expect_tests/michelson_pair_test.ml @@ -50,7 +50,7 @@ let%expect_test _ = 11 | }; ^ - Toplevel let declaration are silently change to const declaration. + Toplevel let declaration is silently changed to const declaration. File "../../test/contracts/michelson_pair_tree.jsligo", line 8, characters 27-32: 7 | diff --git a/src/bin/expect_tests/tail_rec_warning.ml b/src/bin/expect_tests/tail_rec_warning.ml index f930487aff7bf4ea4417e8e201d65538e062e67d..e0bb6030663b94d1e4fe699407152fb259da2e1b 100644 --- a/src/bin/expect_tests/tail_rec_warning.ml +++ b/src/bin/expect_tests/tail_rec_warning.ml @@ -124,7 +124,7 @@ let%expect_test _ = ^ 30 | - Toplevel let declaration are silently change to const declaration. + Toplevel let declaration is silently changed to const declaration. File "../../test/contracts/unused_recursion.jsligo", line 31, character 0 to line 36, character 1: 30 | @@ -141,7 +141,7 @@ let%expect_test _ = 36 | } ^ - Toplevel let declaration are silently change to const declaration. + Toplevel let declaration is silently changed to const declaration. { parameter unit ; storage (pair (int %bar) (int %foo)) ; @@ -218,7 +218,7 @@ let%expect_test _ = ^ 30 | - Toplevel let declaration are silently change to const declaration. + Toplevel let declaration is silently changed to const declaration. File "../../test/contracts/unused_recursion.jsligo", line 31, character 0 to line 36, character 1: 30 | @@ -235,7 +235,7 @@ let%expect_test _ = 36 | } ^ - Toplevel let declaration are silently change to const declaration. + Toplevel let declaration is silently changed to const declaration. { parameter unit ; storage (pair (int %bar) (int %foo)) ; diff --git a/src/bin/expect_tests/typer_error_tests.ml b/src/bin/expect_tests/typer_error_tests.ml index 877f6ed7c980328591fbae0c7a184dcc1122cfc4..6237dd4ba3cf2ad3abc48336b03ed79a5493fd2e 100644 --- a/src/bin/expect_tests/typer_error_tests.ml +++ b/src/bin/expect_tests/typer_error_tests.ml @@ -224,7 +224,7 @@ let%expect_test _ = ^ 8 | - Toplevel let declaration are silently change to const declaration. + Toplevel let declaration is silently changed to const declaration. File "../../test/contracts/negative/error_typer_1.jsligo", line 9, character 0 to line 12, character 1: 8 | @@ -237,7 +237,7 @@ let%expect_test _ = 12 | } ^ - Toplevel let declaration are silently change to const declaration. + Toplevel let declaration is silently changed to const declaration. File "../../test/contracts/negative/error_typer_1.jsligo", line 10, characters 31-60: 9 | let main = (param : action, oldStorage : storage) : [list<operation>, storage] => { diff --git a/src/main/main_warnings/main_warnings.ml b/src/main/main_warnings/main_warnings.ml index 9680eef7787cc9e156a9b9d7bdca792d86452b66..97c227f59b93d49c49862986a07a4a713fd30c5f 100644 --- a/src/main/main_warnings/main_warnings.ml +++ b/src/main/main_warnings/main_warnings.ml @@ -159,7 +159,7 @@ let pp | `Jsligo_deprecated_toplevel_let loc -> Format.fprintf f - "@[<hv>%a@.Toplevel let declaration are silently change to const declaration.@.@]" + "@[<hv>%a@.Toplevel let declaration is silently changed to const declaration.@.@]" snippet_pp loc | `Jsligo_unreachable_code loc -> @@ -307,7 +307,7 @@ let to_warning : all -> Simple_utils.Warning.t = make ~stage:"abstractor" ~content | `Jsligo_deprecated_toplevel_let location -> let message = - Format.sprintf "Toplevel let declaration are silently change to const declaration.@" + Format.sprintf "Toplevel let declaration is silently changed to const declaration." in let content = make_content ~message ~location () in make ~stage:"abstractor" ~content diff --git a/src/test/lsp_test/diagnostics.ml b/src/test/lsp_test/diagnostics.ml index c66020187986ef8dd09100d826934ebc2224a47d..dea277dd14fd8732dad1162df72d988606220699 100644 --- a/src/test/lsp_test/diagnostics.ml +++ b/src/test/lsp_test/diagnostics.ml @@ -73,7 +73,7 @@ let test_cases = ; diagnostics = [ { severity = DiagnosticSeverity.Warning ; message = - "Toplevel let declaration are silently change to const declaration.@" + "Toplevel let declaration is silently changed to const declaration." ; range = Some (Utils.interval 0 0 10) } ; { severity = DiagnosticSeverity.Warning