diff --git a/CHANGES_CURRENT.md b/CHANGES_CURRENT.md index 4478fa9e47..36cf3ceb38 100644 --- a/CHANGES_CURRENT.md +++ b/CHANGES_CURRENT.md @@ -43,3 +43,4 @@ - #3101 - Dependency: reason-fzy -> 485cae1 - #3096 - OS: Add logging for `readdir` path (related #3092) - #3097 - Configuration: Remove unused `workbench.tree.indent` setting +- #3115 - Dependency: vscode-exthost -> 1.53.0 diff --git a/node/package.json b/node/package.json index 124d107862..09e30aa820 100644 --- a/node/package.json +++ b/node/package.json @@ -8,7 +8,7 @@ "test": "jest" }, "dependencies": { - "@onivim/vscode-exthost": "1.52.1001", + "@onivim/vscode-exthost": "1.53.0", "follow-redirects": "1.13.0", "fs-extra": "^8.1.0", "sudo-prompt": "^9.0.0", diff --git a/node/yarn.lock b/node/yarn.lock index 800805c004..b4d7c95008 100644 --- a/node/yarn.lock +++ b/node/yarn.lock @@ -2,16 +2,16 @@ # yarn lockfile v1 -"@onivim/vscode-exthost@1.52.1001": - version "1.52.1001" - resolved "https://registry.yarnpkg.com/@onivim/vscode-exthost/-/vscode-exthost-1.52.1001.tgz#22139888543b604a2babb94c200693290fca4220" - integrity sha512-SbvMucGhnAnz7pwkcuv8sjgOLB8bdldYMm9d/c8Vhgm3yNwtDefsRcvmXyiXidCHRBoKk/ZRvO+9Ua7OiAMV/Q== +"@onivim/vscode-exthost@1.53.0": + version "1.53.0" + resolved "https://registry.yarnpkg.com/@onivim/vscode-exthost/-/vscode-exthost-1.53.0.tgz#86fff6a92163c40c37e5934719992f6d3b6fc26b" + integrity sha512-eg9Cprn6MyueU56kAZZ6/ovN8BK1Lq8rZuGXsSh4O/vRTXJc3RJACsHtYsHzJOPAXwnlWKYx9rvKtaJc0tTFzg== dependencies: graceful-fs "4.2.3" iconv-lite-umd "0.6.8" minimist "^1.2.5" native-watchdog "1.3.0" - node-pty "^0.10.0-beta17" + node-pty "^0.10.0-beta19" semver-umd "^5.5.5" spdlog "^0.11.1" vscode-proxy-agent "^0.5.2" @@ -146,10 +146,10 @@ native-watchdog@1.3.0: resolved "https://registry.yarnpkg.com/native-watchdog/-/native-watchdog-1.3.0.tgz#88cee94c9dc766b85c8506eda14c8bd8c9618e27" integrity sha512-WOjGRNGkYZ5MXsntcvCYrKtSYMaewlbCFplbcUVo9bE80LPVt8TAVFHYWB8+a6fWCGYheq21+Wtt6CJrUaCJhw== -node-pty@^0.10.0-beta17: - version "0.10.0-beta9" - resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.10.0-beta9.tgz#e5a795f9b53948346803cb71bac4ffc02e7909f0" - integrity sha512-Qm6uSH30FUcAhJ9s76C+lgvTsOW2cHUbkIGjCdOVCL0c7S4DxsmKBRgjcr+guUK9d9KwfuZHeSjXYWjpJFPe4w== +node-pty@^0.10.0-beta19: + version "0.10.0" + resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.10.0.tgz#c98d23967b076b35c9fb216c542a04d0b5db4821" + integrity sha512-Q65ookKbjhqWUYKmtZ6iPn0nnqNdzpm3YJOBmzwWJde/TrenBxK9FgqGGtSW0Wjz4YsR1grQF4a7RS5nBwuW9A== dependencies: nan "^2.14.0" diff --git a/src/Exthost/Handlers.re b/src/Exthost/Handlers.re index 321f5accdb..db1984d9d4 100644 --- a/src/Exthost/Handlers.re +++ b/src/Exthost/Handlers.re @@ -114,6 +114,7 @@ let handlers = ), mainNotImplemented("MainThreadTextEditors"), mainNotImplemented("MainThreadEditorInsets"), + mainNotImplemented("MainThreadEditorTabs"), main( ~handler=Msg.Errors.handle, ~mapper=msg => Msg.Errors(msg), @@ -162,6 +163,7 @@ let handlers = ~mapper=msg => Msg.StatusBar(msg), "MainThreadStatusBar", ), + mainNotImplemented("MainThreadSecretStaet"), main( ~handler=Msg.Storage.handle, ~mapper=msg => Msg.Storage(msg), @@ -182,7 +184,7 @@ let handlers = mainNotImplemented("MainThreadWebviewViews"), mainNotImplemented("MainThreadCustomEditors"), mainNotImplemented("MainThreadUrls"), - //mainNotImplemented("MainThreadUriOpeners"), + mainNotImplemented("MainThreadUriOpeners"), main( ~handler=Msg.Workspace.handle, ~mapper=msg => Msg.Workspace(msg), @@ -247,9 +249,10 @@ let handlers = ext("ExtHostEditorInsets"), ext("ExtHostProgress"), ext("ExtHostComments"), + ext("ExtHostSecretState"), ext("ExtHostStorage"), ext("ExtHostUrls"), - //ext("ExtHostUriOpeners"), + ext("ExtHostUriOpeners"), ext("ExtHostOutputService"), ext("ExtHosLabelService"), // SIC ext("ExtHostNotebook"), diff --git a/src/Store/ExtensionClient.re b/src/Store/ExtensionClient.re index 0ac68e8eef..aea0a6bedb 100644 --- a/src/Store/ExtensionClient.re +++ b/src/Store/ExtensionClient.re @@ -333,7 +333,7 @@ let create = ); let environment = [ ( - "AMD_ENTRYPOINT", + "VSCODE_AMD_ENTRYPOINT", "vs/workbench/services/extensions/node/extensionHostProcess", ), ("VSCODE_IPC_HOOK_EXTHOST", pipeStr), diff --git a/test/Exthost/Test.re b/test/Exthost/Test.re index 73cfeea29b..f601c95ca5 100644 --- a/test/Exthost/Test.re +++ b/test/Exthost/Test.re @@ -127,7 +127,7 @@ let startWithExtensions = ~env=[ ("PATH", Oni_Core.ShellUtility.getPathFromEnvironment()), ( - "AMD_ENTRYPOINT", + "VSCODE_AMD_ENTRYPOINT", "vs/workbench/services/extensions/node/extensionHostProcess", ), ("PIPE_LOGGING", "true"), // Pipe logging to parent