Skip to content

Commit 81111d1

Browse files
tsmaedertsmaeder
authoredFeb 19, 2024··
Upgrade msgpackr to 1.10.1. Fixes #13363 (#13365)
Contributed on behalf of STMicroelectronics Signed-off-by: Thomas Mäder <t.s.maeder@gmail.com>
·
v1.59.0v1.47.0
1 parent f442b7d commit 81111d1

File tree

6 files changed

+52
-50
lines changed

6 files changed

+52
-50
lines changed
 

‎examples/api-tests/src/saveable.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
// @ts-check
1818
describe('Saveable', function () {
19-
this.timeout(5000);
19+
this.timeout(30000);
2020

2121
const { assert } = chai;
2222

‎examples/api-tests/src/typescript.spec.js

-1
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,6 @@ SPAN {
776776
assert.equal(editor.getControl().getModel().getLineLength(lineNumber), originalLength);
777777
});
778778

779-
780779
it('Can execute code actions', async function () {
781780
const editor = await openEditor(demoFileUri);
782781
/** @type {import('@theia/monaco-editor-core/src/vs/editor/contrib/codeAction/browser/codeActionController').CodeActionController} */

‎packages/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"lodash.debounce": "^4.0.8",
5656
"lodash.throttle": "^4.1.1",
5757
"markdown-it": "^12.3.2",
58-
"msgpackr": "1.6.1",
58+
"msgpackr": "^1.10.1",
5959
"nsfw": "^2.2.4",
6060
"p-debounce": "^2.1.0",
6161
"perfect-scrollbar": "^1.3.0",

‎packages/plugin-ext/src/plugin/languages/link-provider.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ export class LinkProviderAdapter {
3333
provideLinks(resource: URI, token: theia.CancellationToken): Promise<DocumentLink[] | undefined> {
3434
const document = this.documents.getDocumentData(resource);
3535
if (!document) {
36-
return Promise.reject(new Error(`There is no document for ${resource}`));
36+
// not all documents are replicated to the plugin host (e.g. breakpoint input)
37+
console.warn(`There is no document for ${resource}`);
38+
return Promise.resolve(undefined);
3739
}
3840

3941
const doc = document.document;

‎packages/plugin-ext/src/plugin/type-converters.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -748,9 +748,10 @@ export function isModelRange(arg: unknown): arg is model.Range {
748748
export function isUriComponents(arg: unknown): arg is UriComponents {
749749
return isObject<UriComponents>(arg) &&
750750
typeof arg.scheme === 'string' &&
751+
(arg['$mid'] === 1 || (
751752
typeof arg.path === 'string' &&
752753
typeof arg.query === 'string' &&
753-
typeof arg.fragment === 'string';
754+
typeof arg.fragment === 'string'));
754755
}
755756

756757
export function isModelCallHierarchyItem(arg: unknown): arg is model.CallHierarchyItem {

‎yarn.lock

+45-45
Original file line numberDiff line numberDiff line change
@@ -1174,35 +1174,35 @@
11741174
dependencies:
11751175
cross-spawn "^7.0.1"
11761176

1177-
"@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0":
1178-
version "2.2.0"
1179-
resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz#901c5937e1441572ea23e631fe6deca68482fe76"
1180-
integrity sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==
1177+
"@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.2":
1178+
version "3.0.2"
1179+
resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz#44d752c1a2dc113f15f781b7cc4f53a307e3fa38"
1180+
integrity sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==
11811181

1182-
"@msgpackr-extract/msgpackr-extract-darwin-x64@2.2.0":
1183-
version "2.2.0"
1184-
resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.2.0.tgz#fb877fe6bae3c4d3cea29786737840e2ae689066"
1185-
integrity sha512-vq0tT8sjZsy4JdSqmadWVw6f66UXqUCabLmUVHZwUFzMgtgoIIQjT4VVRHKvlof3P/dMCkbMJ5hB1oJ9OWHaaw==
1182+
"@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.2":
1183+
version "3.0.2"
1184+
resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz#f954f34355712212a8e06c465bc06c40852c6bb3"
1185+
integrity sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==
11861186

1187-
"@msgpackr-extract/msgpackr-extract-linux-arm64@2.2.0":
1188-
version "2.2.0"
1189-
resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.2.0.tgz#986179c38b10ac41fbdaf7d036c825cbc72855d9"
1190-
integrity sha512-hlxxLdRmPyq16QCutUtP8Tm6RDWcyaLsRssaHROatgnkOxdleMTgetf9JsdncL8vLh7FVy/RN9i3XR5dnb9cRA==
1187+
"@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.2":
1188+
version "3.0.2"
1189+
resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz#45c63037f045c2b15c44f80f0393fa24f9655367"
1190+
integrity sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==
11911191

1192-
"@msgpackr-extract/msgpackr-extract-linux-arm@2.2.0":
1193-
version "2.2.0"
1194-
resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.2.0.tgz#15f2c6fe9e0adc06c21af7e95f484ff4880d79ce"
1195-
integrity sha512-SaJ3Qq4lX9Syd2xEo9u3qPxi/OB+5JO/ngJKK97XDpa1C587H9EWYO6KD8995DAjSinWvdHKRrCOXVUC5fvGOg==
1192+
"@msgpackr-extract/msgpackr-extract-linux-arm@3.0.2":
1193+
version "3.0.2"
1194+
resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz#35707efeafe6d22b3f373caf9e8775e8920d1399"
1195+
integrity sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==
11961196

1197-
"@msgpackr-extract/msgpackr-extract-linux-x64@2.2.0":
1198-
version "2.2.0"
1199-
resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.2.0.tgz#30cae5c9a202f3e1fa1deb3191b18ffcb2f239a2"
1200-
integrity sha512-94y5PJrSOqUNcFKmOl7z319FelCLAE0rz/jPCWS+UtdMZvpa4jrQd+cJPQCLp2Fes1yAW/YUQj/Di6YVT3c3Iw==
1197+
"@msgpackr-extract/msgpackr-extract-linux-x64@3.0.2":
1198+
version "3.0.2"
1199+
resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz#091b1218b66c341f532611477ef89e83f25fae4f"
1200+
integrity sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==
12011201

1202-
"@msgpackr-extract/msgpackr-extract-win32-x64@2.2.0":
1203-
version "2.2.0"
1204-
resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.2.0.tgz#016d855b6bc459fd908095811f6826e45dd4ba64"
1205-
integrity sha512-XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA==
1202+
"@msgpackr-extract/msgpackr-extract-win32-x64@3.0.2":
1203+
version "3.0.2"
1204+
resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz#0f164b726869f71da3c594171df5ebc1c4b0a407"
1205+
integrity sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==
12061206

12071207
"@nodelib/fs.scandir@2.1.5":
12081208
version "2.1.5"
@@ -8178,26 +8178,26 @@ ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
81788178
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
81798179
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
81808180

8181-
msgpackr-extract@^2.0.2:
8182-
version "2.2.0"
8183-
resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-2.2.0.tgz#4bb749b58d9764cfdc0d91c7977a007b08e8f262"
8184-
integrity sha512-0YcvWSv7ZOGl9Od6Y5iJ3XnPww8O7WLcpYMDwX+PAA/uXLDtyw94PJv9GLQV/nnp3cWlDhMoyKZIQLrx33sWog==
8181+
msgpackr-extract@^3.0.2:
8182+
version "3.0.2"
8183+
resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz#e05ec1bb4453ddf020551bcd5daaf0092a2c279d"
8184+
integrity sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==
81858185
dependencies:
8186-
node-gyp-build-optional-packages "5.0.3"
8186+
node-gyp-build-optional-packages "5.0.7"
81878187
optionalDependencies:
8188-
"@msgpackr-extract/msgpackr-extract-darwin-arm64" "2.2.0"
8189-
"@msgpackr-extract/msgpackr-extract-darwin-x64" "2.2.0"
8190-
"@msgpackr-extract/msgpackr-extract-linux-arm" "2.2.0"
8191-
"@msgpackr-extract/msgpackr-extract-linux-arm64" "2.2.0"
8192-
"@msgpackr-extract/msgpackr-extract-linux-x64" "2.2.0"
8193-
"@msgpackr-extract/msgpackr-extract-win32-x64" "2.2.0"
8194-
8195-
msgpackr@1.6.1:
8196-
version "1.6.1"
8197-
resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.6.1.tgz#4f3c94d6a5b819b838ffc736eddaf60eba436d20"
8198-
integrity sha512-Je+xBEfdjtvA4bKaOv8iRhjC8qX2oJwpYH4f7JrG4uMVJVmnmkAT4pjKdbztKprGj3iwjcxPzb5umVZ02Qq3tA==
8188+
"@msgpackr-extract/msgpackr-extract-darwin-arm64" "3.0.2"
8189+
"@msgpackr-extract/msgpackr-extract-darwin-x64" "3.0.2"
8190+
"@msgpackr-extract/msgpackr-extract-linux-arm" "3.0.2"
8191+
"@msgpackr-extract/msgpackr-extract-linux-arm64" "3.0.2"
8192+
"@msgpackr-extract/msgpackr-extract-linux-x64" "3.0.2"
8193+
"@msgpackr-extract/msgpackr-extract-win32-x64" "3.0.2"
8194+
8195+
msgpackr@^1.10.1:
8196+
version "1.10.1"
8197+
resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.10.1.tgz#51953bb4ce4f3494f0c4af3f484f01cfbb306555"
8198+
integrity sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ==
81998199
optionalDependencies:
8200-
msgpackr-extract "^2.0.2"
8200+
msgpackr-extract "^3.0.2"
82018201

82028202
multer@1.4.4-lts.1:
82038203
version "1.4.4-lts.1"
@@ -8360,10 +8360,10 @@ node-fetch@^2.6.7:
83608360
dependencies:
83618361
whatwg-url "^5.0.0"
83628362

8363-
node-gyp-build-optional-packages@5.0.3:
8364-
version "5.0.3"
8365-
resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz#92a89d400352c44ad3975010368072b41ad66c17"
8366-
integrity sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==
8363+
node-gyp-build-optional-packages@5.0.7:
8364+
version "5.0.7"
8365+
resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz#5d2632bbde0ab2f6e22f1bbac2199b07244ae0b3"
8366+
integrity sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==
83678367

83688368
node-gyp-build@^4.2.1, node-gyp-build@^4.3.0:
83698369
version "4.6.1"

0 commit comments

Comments
 (0)
Please sign in to comment.