diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f89cb7f2..6e076a4cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ # Unreleased +## 1.23.0 + - Add `ocaml.jump` to jump to a specific target. (#1654) ## 1.22.0 diff --git a/flake.lock b/flake.lock index 031cf6db5..36d22ed04 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -36,11 +36,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "lastModified": 1731533336, + "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", "owner": "numtide", "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726081393, - "narHash": "sha256-/19+6HHpE/avehgy78HsYdKUZeZoI6RNOOCIPI+NCtk=", + "lastModified": 1733154452, + "narHash": "sha256-K5OnAkDvKNaITaaO5B+mHFjXh2avQrmMlEEOZeVFrMI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "291575d934cadf66e7464e4fb34d526e9d01f3d5", + "rev": "23a7a7d8b4306f622c18c539f155c80654cc53e5", "type": "github" }, "original": { diff --git a/package.json b/package.json index 98cf4ffb3..f813c186b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ocaml-platform", "displayName": "OCaml Platform", - "version": "1.22.0", + "version": "1.23.0", "private": true, "description": "Official OCaml language extension for VSCode", "categories": [ @@ -34,13 +34,13 @@ "astexplorer" ], "scripts": { - "test": "vscode-test", - "package": "vsce package --out ocaml-platform.vsix --no-dependencies --allow-unused-files-pattern", - "deploy:vsce": "vsce publish --packagePath ocaml-platform.vsix --no-dependencies", - "deploy:ovsx": "ovsx publish --packagePath ocaml-platform.vsix --no-dependencies", "check": "biome check", + "deploy:ovsx": "ovsx publish --packagePath ocaml-platform.vsix --no-dependencies", + "deploy:vsce": "vsce publish --packagePath ocaml-platform.vsix --no-dependencies", + "fix": "biome check --fix", "lint": "biome check", - "fix": "biome check --fix" + "package": "vsce package --out ocaml-platform.vsix --no-dependencies --allow-unused-files-pattern", + "test": "vscode-test" }, "contributes": { "breakpoints": [ diff --git a/src/ocaml_lsp.ml b/src/ocaml_lsp.ml index 38ebc5766..5cec0c208 100644 --- a/src/ocaml_lsp.ml +++ b/src/ocaml_lsp.ml @@ -163,6 +163,8 @@ let lsp_versions = ; "1.16.2" ; "1.17.0" ; "1.18.0" + ; "1.20.0-4.14" + ; "1.20.1-4.14" |] ) ; ( (5, 0) , [| "1.13.2~5.0preview" @@ -174,7 +176,7 @@ let lsp_versions = ; "1.17.0" |] ) ; ((5, 1), [| "1.16.1"; "1.16.2"; "1.17.0"; "1.18.0" |]) - ; ((5, 2), [| "1.19.0" |]) + ; ((5, 2), [| "1.19.0"; "1.20.0"; "1.20.1" |]) ; ((5, 3), [| "1.20.0~5.3preview" |]) ] in diff --git a/tests/suite/basic/problems.test.js b/tests/suite/basic/problems.test.js index dd58dde24..251080187 100644 --- a/tests/suite/basic/problems.test.js +++ b/tests/suite/basic/problems.test.js @@ -1,4 +1,4 @@ -const assert = require("node:assert"); +const assert = require("node:assert/strict"); const problemLocations = { 'File "file.ml", line 4, characters 6-7:': [ @@ -49,7 +49,7 @@ const problemMessages = { }; suite("basic", () => { - test("problem matcher", async () => { + test("problem matcher", () => { const locationRegex = /^\s*\bFile\b\s*"(.*)",\s*\blines?\b\s*(\d+)(?:-(\d+))?(?:,\s*\bcharacters\b\s*(\d+)-(\d+)\s*)?:\s*$/; diff --git a/tests/suite/opam/languageId.test.js b/tests/suite/opam/languageId.test.js index eba19960b..320c20230 100644 --- a/tests/suite/opam/languageId.test.js +++ b/tests/suite/opam/languageId.test.js @@ -1,4 +1,4 @@ -const assert = require("node:assert"); +const assert = require("node:assert/strict"); const path = require("node:path"); const vscode = require("vscode"); diff --git a/yarn.lock b/yarn.lock index 1a0856d4b..523c4da8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -41,8 +41,8 @@ __metadata: linkType: hard "@azure/core-rest-pipeline@npm:^1.17.0, @azure/core-rest-pipeline@npm:^1.9.1": - version: 1.18.0 - resolution: "@azure/core-rest-pipeline@npm:1.18.0" + version: 1.18.1 + resolution: "@azure/core-rest-pipeline@npm:1.18.1" dependencies: "@azure/abort-controller": "npm:^2.0.0" "@azure/core-auth": "npm:^1.8.0" @@ -52,7 +52,7 @@ __metadata: http-proxy-agent: "npm:^7.0.0" https-proxy-agent: "npm:^7.0.0" tslib: "npm:^2.6.2" - checksum: 10c0/2a23ba10a53d81c82a0b74594ce32f86fc5d15a7762c6f174cfcfd4702542277f48994f252a3a00b3e7ff397fb0c8b5c4fd7d3374bd5dab946df863b461c80b9 + checksum: 10c0/e63d110f799a74ed20925e59ee70eced355f76130a2283393ce109b49365c97a436e8ddde29badee138c17cf0ecf33c26b9ce3cfbf64cf98b904ab50e6bdedff languageName: node linkType: hard @@ -2163,9 +2163,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001669": - version: 1.0.30001684 - resolution: "caniuse-lite@npm:1.0.30001684" - checksum: 10c0/446485ca3d9caf408a339a44636a86a2b119ec247492393ae661cd93dccd6668401dd2dfec1e149be4e44563cd1e23351b44453a52fa2c2f19e2bf3287c865f6 + version: 1.0.30001685 + resolution: "caniuse-lite@npm:1.0.30001685" + checksum: 10c0/cd0dcc5080dd0f3502d68938fbbe15383ae9176cc9b87016587f4abd1099298df04324818c126cda16cd7082bc3b8f91d15fa1918f8484fb964147f4c69efa28 languageName: node linkType: hard @@ -2645,9 +2645,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.5.41": - version: 1.5.65 - resolution: "electron-to-chromium@npm:1.5.65" - checksum: 10c0/4d2db76ca63d34aad9d5392d850a89fecb4d740a3f0e3ab945f23850ed99789df4e09dd36a28cedcf3b4757dd7c82d5d159bfdf1d29f815d172a9132b4ba3bb9 + version: 1.5.67 + resolution: "electron-to-chromium@npm:1.5.67" + checksum: 10c0/bcd21c3961267fd733973586045a38d41f697e6821e7624cdd39d48fd744d9bd93ec7db59abbafeb464861218b959a920892cfaa719bff4441d1d49f8dcdff94 languageName: node linkType: hard @@ -3035,7 +3035,7 @@ __metadata: languageName: node linkType: hard -"get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.4": +"get-intrinsic@npm:^1.2.4": version: 1.2.4 resolution: "get-intrinsic@npm:1.2.4" dependencies: @@ -3140,11 +3140,11 @@ __metadata: linkType: hard "gopd@npm:^1.0.1": - version: 1.0.1 - resolution: "gopd@npm:1.0.1" + version: 1.1.0 + resolution: "gopd@npm:1.1.0" dependencies: - get-intrinsic: "npm:^1.1.3" - checksum: 10c0/505c05487f7944c552cee72087bf1567debb470d4355b1335f2c262d218ebbff805cd3715448fe29b4b380bae6912561d0467233e4165830efd28da241418c63 + get-intrinsic: "npm:^1.2.4" + checksum: 10c0/acfa9914889700cf42eaf676e1dc2d5a277217580e36119a9a6f5b77197700fd8294b8994f257963845820e7b414c8f06e1b9f8dff6456b0f71f61d175fecf3c languageName: node linkType: hard @@ -3179,9 +3179,11 @@ __metadata: linkType: hard "has-proto@npm:^1.0.1": - version: 1.0.3 - resolution: "has-proto@npm:1.0.3" - checksum: 10c0/35a6989f81e9f8022c2f4027f8b48a552de714938765d019dbea6bb547bd49ce5010a3c7c32ec6ddac6e48fc546166a3583b128f5a7add8b058a6d8b4afec205 + version: 1.1.0 + resolution: "has-proto@npm:1.1.0" + dependencies: + call-bind: "npm:^1.0.7" + checksum: 10c0/d0aeb83ca76aa265a7629bf973d6338c310b8307cb7fa8b85f8f01a7d95fc3d6ede54eaedeb538a6c1ee4fc8961abfbe89ea88d9a78244fa03097fe5b506c10d languageName: node linkType: hard