Add `zip` extract support for Windows #11156

huacnlee · 2024-04-29T10:54:20Z

Release Notes:

Fixed install Node.js runtime and NPM lsp installation on Windows.
Update Node runtime command to execute on Windows with no window popup.

Ref #9619, #9424

crates/fs/src/fs.rs

crates/util/test_data/test.tar.gz

huacnlee · 2024-04-29T14:12:30Z

Node.js runtime have successfully installed on Windows now.

crates/util/src/archive.rs

huacnlee · 2024-04-30T14:41:22Z

Now, Node.js runtime has fixed and Copilot works.

2024-04-30.223822.mp4

huacnlee · 2024-04-30T15:27:02Z

Node runtime have been passed test.

2024-04-30.232507.mp4

huacnlee · 2024-04-30T15:34:49Z

Hi @maxdeviant, @mikayla-maki

I think I have done of all about Windows install zip and Node.js runtime install, we can review and testing now.

I have to do a lot of file change, because there are too many issues on Windows. They are mostly issues that have different path on Windows.

crates/node_runtime/src/node_runtime.rs

Release Notes: - N/A --- Follow #11156, to make sure extensions install on window. https://github.com/tamasfe/taplo/releases/tag/0.8.1 The Taplo have `gz` for windows, so we can just use `gz`. --------- Co-authored-by: Marshall Bowers <[email protected]>

eth0net · 2024-05-05T14:23:16Z

Anything I can do to help with this? Was trying to solve the same issue and found this PR 🙂 Those force-pushes are killing me trying to work out what's going on with the current state of the PR so thought it better I just ask 😅

huacnlee · 2024-05-06T15:03:20Z

crates/node_runtime/src/node_runtime.rs

 }

+ #[cfg(windows)]
+ command.creation_flags(windows::Win32::System::Threading::CREATE_NO_WINDOW.0);


@maxdeviant I'd like to improve the Command::new in entire of the Zed, there have a lot of place need to do this.

For example: crates\languages\src\go.rs

So, can I add a helper in util::process:command in util crate to create smol::process:Command in shortly with Windows special creation_flags? Then other place can just use this method to create command.

This is not related to this PR, I think we can split a new PR to do this.

maxdeviant

After multiple attempts to review this PR, I think it's touching a few too many parts.

I think we should refocus on just fixing Node runtime support on Windows and leave the other bits untouched.

We can inline the zip extraction into the node_runtime crate. We don't need to add a new archive crate or touch any of the tar or tar.gz-related code.

huacnlee · 2024-05-08T19:33:50Z

crates/extension/src/wasm_host/wit/since_v0_0_6.rs

 futures::pin_mut!(body);
- self.host.fs.create_file_with(&zip_path, body).await?;
-
- let unzip_status = std::process::Command::new("unzip")


@maxdeviant

How about the part?

I make extract_zip method before , because here it requires the new zip extraction method, the unzip command is not working on Windows. And node_runtime and more places also need to.

huacnlee · 2024-05-09T02:03:44Z

I have updated:

Moved archive into node_runtime crate as a mod, I keep the methods not just only the zip, we may use that in the future.
Reverted other crate changes, just keep the node_runtime.
The since_v0_0_6.rs still use unzip command to extract zip file, this can't work on Windows, I think we can make author PR to discuss this.
For example: https://github.com/zed-industries/zed/blob/main/extensions/csharp/src/csharp.rs#L75

huacnlee · 2024-05-09T08:32:44Z

I just did a fresh installation of the Node.js runtime on Windows. It seems that we have to modify the root_path part of Copilot (Commit: 5131e1a), otherwise it will not start and will directly crash.

Reverted this copilot change.

The https://github.com/zed-industries/zed/pull/11591/files#diff-9aed0f58926aee71638164c95da3800a90460d525d736a354c71490e333c8d88R581 is a better way.

maxdeviant

Thanks, much better!

huacnlee · 2024-05-09T13:34:06Z

@maxdeviant For other parts of the zip decompression, you can follow up to see how to deal with it. Currently, there are still problems using the unzip command in the extension, and you need to follow up.

However, the parts that have been merged so far and the panic problem caused by Copilot's root_path unwrap will be fixed. Then the most Node.js related ones can already be run.

The HTTP Proxy issue has not been resolved yet. I don’t know if it is a problem with my proxy software. I have tested it before, but it was strange today, so I canceled it first. I'll submit another one after it's resolved.

CharlesChen0823 · 2024-05-09T13:44:51Z

However, the parts that have been merged so far and the panic problem caused by Copilot's root_path unwrap will be fixed. Then the most Node.js related ones can already be run.

this should fixed, currently open immediaterly crashed.

This reverts commit 5e06ce4.

Release Notes: - [x] Fixed install Node.js runtime and NPM lsp installation on Windows. - [x] Update Node runtime command to execute on Windows with no window popup. Ref zed-industries#9619, zed-industries#9424 --------- Co-authored-by: Marshall Bowers <[email protected]>

cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Apr 29, 2024

huacnlee commented Apr 29, 2024

View reviewed changes

crates/fs/src/fs.rs Outdated Show resolved Hide resolved

huacnlee commented Apr 29, 2024

View reviewed changes

crates/fs/src/fs.rs Outdated Show resolved Hide resolved

SomeoneToIgnore assigned mikayla-maki Apr 29, 2024

huacnlee force-pushed the add-zip-unarchive-support branch 4 times, most recently from 01db39c to 5c526a5 Compare April 29, 2024 13:25

maxdeviant reviewed Apr 29, 2024

View reviewed changes

crates/util/test_data/test.tar.gz Outdated Show resolved Hide resolved

maxdeviant reviewed Apr 29, 2024

View reviewed changes

crates/util/src/archive.rs Outdated Show resolved Hide resolved

huacnlee force-pushed the add-zip-unarchive-support branch 4 times, most recently from 110db34 to 67868eb Compare April 29, 2024 17:19

huacnlee marked this pull request as ready for review April 29, 2024 17:26

huacnlee force-pushed the add-zip-unarchive-support branch 7 times, most recently from 5471989 to 1d5b131 Compare April 30, 2024 06:57

huacnlee force-pushed the add-zip-unarchive-support branch from 10957ab to 54af09b Compare April 30, 2024 14:46

huacnlee commented Apr 30, 2024

View reviewed changes

crates/node_runtime/src/node_runtime.rs Outdated Show resolved Hide resolved

maxdeviant changed the title ~~Add zip extract supports for Windows~~ Add zip extract support for Windows May 1, 2024

huacnlee mentioned this pull request May 1, 2024

toml: Fix language server installation on Windows #11251

Merged

maxdeviant assigned maxdeviant and unassigned mikayla-maki May 5, 2024

huacnlee mentioned this pull request May 6, 2024

windows fails autoupdate and some functionality is reduced with C# language support #11405

Open

1 task

huacnlee commented May 6, 2024

View reviewed changes

maxdeviant requested changes May 8, 2024

View reviewed changes

huacnlee commented May 8, 2024

View reviewed changes

huacnlee force-pushed the add-zip-unarchive-support branch from ecc3ba4 to 91e00bd Compare May 9, 2024 01:54

LoganDark mentioned this pull request May 9, 2024

Fix node LSPs on Windows #11591

Closed

huacnlee force-pushed the add-zip-unarchive-support branch from 91e00bd to 5131e1a Compare May 9, 2024 08:25

huacnlee marked this pull request as draft May 9, 2024 08:33

Add zip unarchive support, and fix node_runtime on Windows platform.

6a6e6f3

huacnlee force-pushed the add-zip-unarchive-support branch from 5131e1a to 6a6e6f3 Compare May 9, 2024 11:37

huacnlee marked this pull request as ready for review May 9, 2024 11:45

huacnlee requested a review from maxdeviant May 9, 2024 11:46

maxdeviant added 3 commits May 9, 2024 09:01

Merge branch 'main' into pr/11156

446f343

Clean up

838db97

Fix ordering

0218ce4

maxdeviant approved these changes May 9, 2024

View reviewed changes

maxdeviant merged commit 5e06ce4 into zed-industries:main May 9, 2024
8 checks passed

LoganDark added a commit to LoganDark/zed that referenced this pull request May 9, 2024

Revert "Add zip extract support for Windows (zed-industries#11156)"

7d1544b

This reverts commit 5e06ce4.

huacnlee mentioned this pull request May 9, 2024

github copilot can't be started. failed to iterate over archive #10908

Open

1 task

huacnlee deleted the add-zip-unarchive-support branch May 9, 2024 14:43

LoganDark added a commit to LoganDark/zed that referenced this pull request May 9, 2024

Revert "Add zip extract support for Windows (zed-industries#11156)"

9524234

This reverts commit 5e06ce4.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add `zip` extract support for Windows #11156

Add `zip` extract support for Windows #11156

huacnlee commented Apr 29, 2024 •

edited

huacnlee commented Apr 29, 2024 •

edited

huacnlee commented Apr 30, 2024

huacnlee commented Apr 30, 2024

huacnlee commented Apr 30, 2024

eth0net commented May 5, 2024

huacnlee May 6, 2024 •

edited

maxdeviant left a comment

huacnlee May 8, 2024

huacnlee commented May 9, 2024 •

edited

huacnlee commented May 9, 2024 •

edited

maxdeviant left a comment

huacnlee commented May 9, 2024

CharlesChen0823 commented May 9, 2024

Add zip extract support for Windows #11156

Add zip extract support for Windows #11156

Conversation

huacnlee commented Apr 29, 2024 • edited

huacnlee commented Apr 29, 2024 • edited

huacnlee commented Apr 30, 2024

huacnlee commented Apr 30, 2024

huacnlee commented Apr 30, 2024

eth0net commented May 5, 2024

huacnlee May 6, 2024 • edited

Choose a reason for hiding this comment

maxdeviant left a comment

Choose a reason for hiding this comment

huacnlee May 8, 2024

Choose a reason for hiding this comment

huacnlee commented May 9, 2024 • edited

huacnlee commented May 9, 2024 • edited

maxdeviant left a comment

Choose a reason for hiding this comment

huacnlee commented May 9, 2024

CharlesChen0823 commented May 9, 2024

Add `zip` extract support for Windows #11156

Add `zip` extract support for Windows #11156

huacnlee commented Apr 29, 2024 •

edited

huacnlee commented Apr 29, 2024 •

edited

huacnlee May 6, 2024 •

edited

huacnlee commented May 9, 2024 •

edited

huacnlee commented May 9, 2024 •

edited