2021-02-10 09:41:55 +03:00
# Contributing to Zellij
2021-01-25 20:36:24 +03:00
2022-02-24 13:35:23 +03:00
Thanks for considering contributing to Zellij!
2021-01-25 20:36:24 +03:00
2021-09-29 17:17:06 +03:00
**First**: if you're unsure of anything, feel free to ask on our [Discord
2022-07-10 20:51:01 +03:00
server](https://discord.gg/MHV3n76PDq), or on [Matrix ](https://matrix.to/#/#zellij_general:matrix.org ). We're a friendly and welcoming bunch!
2021-02-04 12:21:11 +03:00
# Code of Conduct
2021-01-25 20:36:24 +03:00
Before contributing please read our [Code of Conduct ](CODE_OF_CONDUCT.md ) which
all contributors are expected to adhere to.
2021-02-16 21:40:20 +03:00
## Building
2021-05-05 13:07:47 +03:00
To build Zellij, we're using cargo-make – you can install it by running `cargo
2022-07-29 19:59:50 +03:00
install --locked --force cargo-make`.
2021-09-29 17:17:06 +03:00
2022-07-29 19:59:50 +03:00
To edit our manpage, the mandown crate (`cargo install --locked
2021-05-05 13:07:47 +03:00
mandown`) is used and the work is done on a markdown file in docs/MANPAGE.md.
2021-04-13 18:06:04 +03:00
Here are some of the commands currently supported by the build system:
2021-02-16 21:40:20 +03:00
```sh
2021-04-13 20:14:13 +03:00
# Format code, build, then run tests and clippy
2021-04-13 18:06:04 +03:00
cargo make
# You can also perform these actions individually
cargo make format
cargo make build
cargo make test
2021-04-14 21:11:24 +03:00
# Run Zellij (optionally with additional arguments)
2021-04-13 18:06:04 +03:00
cargo make run
2021-10-31 22:41:49 +03:00
cargo make run -l strider
2021-04-13 18:06:04 +03:00
# Run Clippy (potentially with additional options)
cargo make clippy
cargo make clippy -W clippy::pedantic
# Install Zellij to some directory
cargo make install /path/of/zellij/binary
# Publish the zellij and zellij-tile crates
cargo make publish
2021-05-05 13:05:05 +03:00
# Update manpage
cargo make manpage
2021-02-16 21:40:20 +03:00
```
2021-05-19 11:48:30 +03:00
To run `install` or `publish` , you'll need the package `binaryen` in the
version `wasm-opt --version` > 97, for it's command `wasm-opt` .
2021-02-24 19:05:19 +03:00
2021-06-30 00:19:23 +03:00
To run `test` , you will need the package `pkg-config` and a version of `openssl` .
2022-03-04 18:33:42 +03:00
< details >
2022-03-04 19:43:31 +03:00
< summary > Should you be a `nix` (linux/macOs) user, you can use the following
2022-03-04 18:33:42 +03:00
commands in order to get set up: (expand)< / summary >
- `nix develop`
Download and set up dependencies.
- `nix build`
Build the binary in the `result` directory. (--release)
- `nix run`
Run the binary.
- `cachix use zellij`
Will use our binary cache as a substituter.
< / details >
2021-06-21 11:45:18 +03:00
## Running the end-to-end tests
2021-11-09 19:37:54 +03:00
Zellij includes some end-to-end tests which test the whole application as a black-box from the outside.
2021-06-21 11:45:18 +03:00
These tests work by running a docker container which contains the Zellij binary, connecting to it via ssh, sending some commands and comparing the output received against predefined snapshots.
2021-11-09 19:37:54 +03:00
< details >
< summary > Should you be a macOS (including m1) user, please follow these commands before. (expand here):< / summary >
1. `rustup target add x86_64-unknown-linux-musl`
2. `brew install messense/macos-cross-toolchains/x86_64-unknown-linux-musl`
3. `export CC_x86_64_unknown_linux_musl=$(brew --prefix)/bin/x86_64-unknown-linux-musl-gcc`
4. `export AR_x86_64_unknown_linux_musl=$(brew --prefix)/bin/x86_64-unknown-linux-musl-ar`
5. `export CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=$CC_x86_64_unknown_linux_musl`
< / details >
2022-03-04 18:33:42 +03:00
2022-02-27 15:21:36 +03:00
To run these tests locally, you'll need to have either `docker` or `podman` and also `docker-compose` installed.
2021-06-21 11:45:18 +03:00
Once you do, in the repository root:
2021-11-09 19:37:54 +03:00
2021-06-21 11:45:18 +03:00
1. `docker-compose up -d` will start up the docker container
2. `cargo make build-e2e` will build the generic linux executable of Zellij in the target folder, which is shared with the container
3. `cargo make e2e-test` will run the tests
To re-run the tests after you've changed something in the code base, be sure to repeat steps 2 and 3.
2022-08-01 19:07:06 +03:00
## Debugging / Troubleshooting while developing
Zellij uses the excellent [`log` ](https://crates.io/crates/log ) crate to handle its internal logging. The output of these logs will go to `/tmp/zellij-<UID>/zellij-log/zellij.log` .
Example:
```rust
let my_variable = some_function();
log::info!("my variable is: {:?}", my_variable);
```
Note that the output is truncated at 100KB. This can be adjusted for the purposes of debugging through the `LOG_MAX_BYTES` constant, at the time of writing here: https://github.com/zellij-org/zellij/blob/main/zellij-utils/src/logging.rs#L24
When running Zellij with the `--debug` flag, Zellij will dump a copy of all bytes received over the pty for each pane in: `/tmp/zellij-<UID>/zellij-log/zellij-<pane_id>.log` . These might be useful when troubleshooting terminal issues.
2022-02-27 13:52:20 +03:00
## How we treat clippy lints
We currently use clippy in [GitHub Actions ](https://github.com/zellij-org/zellij/blob/main/.github/workflows/rust.yml ) with the default settings that report only [`clippy::correctness` ](https://github.com/rust-lang/rust-clippy#readme ) as errors and other lints as warnings because Zellij is still unstable. This means that all warnings can be ignored depending on the situation at that time, even though they are also helpful to keep the code quality.
Since we just cannot afford to manage them, we are always welcome to fix them!
Here is [the detailed discussion ](https://github.com/zellij-org/zellij/pull/1090 ) if you want to see it.
2021-02-04 12:21:11 +03:00
## Looking for something to work on?
2021-01-25 20:36:24 +03:00
2021-05-05 13:07:47 +03:00
If you are new contributor to `Zellij` going through
[beginners][good-first-issue] should be a good start or you can join our public
[Discord server][discord-invite-link], we would be happy to help finding
something interesting to work on and guide through.
2021-01-25 20:36:24 +03:00
2021-11-30 10:01:24 +03:00
[discord-invite-link]: https://discord.gg/feHDHahHCz
[good-first-issue]: https://github.com/zellij-org/zellij/labels/good%20first%20issue
2021-01-25 20:36:24 +03:00
2022-10-18 17:14:38 +03:00
## Tips for Code Contributions
### Prefer returning `Result`s instead of `unwrap`ing
- Add `use zellij_utils::errors::prelude::*;` to the file
- Make the function return `Result<T>` , with an appropriate `T` (Use `()` if there's nothing to return)
- Append `.context()` to any `Result` you get with a sensible error description (see [the docs][error-docs-context])
- Generate ad-hoc errors with `anyhow!(<SOME MESSAGE>)`
- *Further reading*: [See here][error-docs-result]
2022-11-09 21:01:36 +03:00
### Logging errors
- When there's a `Result` type around, use `.non_fatal()` on that instead of `log::error!`
- When there's a `Err` type around, use `Err::<(), _>(err).non_fatal()`
- Also attach context before logging!
- *Further reading*: [See here][error-docs-logging]
### Adding Concrete Errors, Handling Specific Errors
- Add a new variant to `zellij_utils::errors::ZellijError` , if needed
- Use `anyhow::Error::downcast_ref::<ZellijError>()` to recover underlying errors
- *Further reading*: [See here][error-docs-zellijerror]
2022-10-18 17:14:38 +03:00
[error-docs-context]: https://github.com/zellij-org/zellij/blob/main/docs/ERROR_HANDLING.md#attaching-context
[error-docs-result]: https://github.com/zellij-org/zellij/blob/main/docs/ERROR_HANDLING.md#converting-a-function-to-return-a-result-type
2022-11-09 21:01:36 +03:00
[error-docs-logging]: https://github.com/zellij-org/zellij/blob/main/docs/ERROR_HANDLING.md#logging-errors
[error-docs-zellijerror]: https://github.com/zellij-org/zellij/blob/main/docs/ERROR_HANDLING.md#adding-concrete-errors-handling-specific-errors
2022-10-18 17:14:38 +03:00
2021-02-04 12:21:11 +03:00
## Filing Issues
2021-01-25 20:36:24 +03:00
2021-02-04 12:21:11 +03:00
Bugs and enhancement suggestions are tracked as GitHub issues.
2021-02-10 09:41:55 +03:00
### Lacking API for plugin in Zellij?
2021-01-25 20:36:24 +03:00
2021-02-10 09:41:55 +03:00
If you have a plugin idea, but Zellij still doesn't have API required to make
2021-05-05 13:07:47 +03:00
the plugin consider opening [an issue][plugin-issue] and describing your
requirements.
2021-01-25 20:36:24 +03:00
2021-05-05 13:07:47 +03:00
[plugin-issue]:
https://github.com/zellij-org/zellij/issues/new?assignees=& labels=plugin%20system
2021-02-04 12:21:11 +03:00
2021-02-04 16:21:00 +03:00
### How Do I Submit A (Good) Bug Report?
2021-02-04 12:21:11 +03:00
After you've determined which repository your bug is related to and that the
issue is still present in the latest version of the master branch, create an
issue on that repository and provide the following information:
- Use a **clear and descriptive title** for the issue to identify the problem.
- Explain which **behavior you expected** to see instead and why.
2021-05-05 13:07:47 +03:00
- Describe the exact **steps to reproduce the problem** in as many details as
necessary.
2021-02-04 16:18:47 +03:00
- When providing code samples, please use [code blocks][code-blocks].
2021-02-04 12:21:11 +03:00
2021-02-04 16:21:00 +03:00
### How Do I Submit A (Good) Enhancement Suggestion?
2021-02-04 12:21:11 +03:00
Instructions are similar to those for bug reports. Please provide the following
information:
2021-05-05 13:07:47 +03:00
- Use a **clear and descriptive title** for the issue to identify the
suggestion.
- Provide a **description of the suggested enhancement** in as many details as
necessary.
2021-02-04 16:18:47 +03:00
- When providing code samples, please use [code blocks][code-blocks].
2021-02-04 12:21:11 +03:00
2021-05-05 13:07:47 +03:00
[code-blocks]:
https://help.github.com/articles/creating-and-highlighting-code-blocks/
2021-02-04 12:21:11 +03:00
## Submitting Pull Requests
2021-05-05 13:07:47 +03:00
Instructions are similar to those for bug reports. Please provide the following
information:
2021-02-04 12:21:11 +03:00
2021-05-05 13:07:47 +03:00
- If this is not a trivial fix, consider **creating an issue to discuss first**
and **later link to it from the PR** .
2021-02-04 12:21:11 +03:00
- Use a **clear and descriptive title** for the pull request.
2021-05-05 13:07:47 +03:00
- Follow [Conventional Commit
specification](https://www.conventionalcommits.org/en/v1.0.0/) where
sufficiently large or impactful change is made.
2021-02-04 12:21:11 +03:00
- Provide a **description of the changes** in as many details as necessary.
2021-05-05 13:07:47 +03:00
Before submitting your pull request, also make sure that the following
conditions are met:
2021-02-04 12:21:11 +03:00
- Your new code **adheres to the code style** through running `cargo fmt` .
2021-05-05 13:07:47 +03:00
- Your new code **passes all existing and new tests** through running `cargo
test`.