287e412780
docs(keymap): add select_all_children ( #11972 )
...
Co-authored-by: Sam Kagan <skagan@nrao.edu>
5 days ago
bc18dc2c0c
Pluralize 'parenthesis' in the tutorial ( #12015 )
5 days ago
3fd7ca334e
Add support for textproto language. ( #11874 )
5 days ago
6373027c9e
chore: add "ui.virtual.jump-label" to serika-dark theme ( #11911 )
5 days ago
f06f481ad9
build(deps): bump the rust-dependencies group with 5 updates ( #12088 )
...
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 days ago
a219d5aabb
build(deps): bump unicode-general-category from 0.6.0 to 1.0.0 ( #12089 )
...
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 days ago
d489c03c4f
helix-term: Use workspace thiserror dep
5 days ago
f621423e7d
build(deps): bump thiserror from 1.0.64 to 2.0.3
...
Bumps [thiserror](https://github.com/dtolnay/thiserror ) from 1.0.64 to 2.0.3.
- [Release notes](https://github.com/dtolnay/thiserror/releases )
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.64...2.0.3 )
---
updated-dependencies:
- dependency-name: thiserror
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
5 days ago
35802cb025
build(deps): bump which from 6.0.3 to 7.0.0 ( #12090 )
...
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 days ago
6cca98264f
Re-vendor encoding_rs test data
...
This fixes a test (`helix_view::document::gb18030_decode`) since
encoding_rs updated its gb18030 encoding to match GB18030-2022 (was
GB18030-2005).
The newly vendored files update the license line and I've included the
referenced license in the `encoding/` directory.
2 weeks ago
9806ca08b1
Fix breaking change in gix Tree::loop_entry_by_path
2 weeks ago
b5d56e57a6
build(deps): bump the rust-dependencies group across 1 directory with 11 updates
...
Bumps the rust-dependencies group with 10 updates in the / directory:
| Package | From | To |
| --- | --- | --- |
| [regex](https://github.com/rust-lang/regex ) | `1.11.0` | `1.11.1` |
| [url](https://github.com/servo/rust-url ) | `2.5.2` | `2.5.3` |
| [serde](https://github.com/serde-rs/serde ) | `1.0.210` | `1.0.215` |
| [encoding_rs](https://github.com/hsivonen/encoding_rs ) | `0.8.34` | `0.8.35` |
| [anyhow](https://github.com/dtolnay/anyhow ) | `1.0.90` | `1.0.93` |
| [tempfile](https://github.com/Stebalien/tempfile ) | `3.13.0` | `3.14.0` |
| [tokio](https://github.com/tokio-rs/tokio ) | `1.40.0` | `1.41.1` |
| [libc](https://github.com/rust-lang/libc ) | `0.2.161` | `0.2.162` |
| [cc](https://github.com/rust-lang/cc-rs ) | `1.1.31` | `1.1.37` |
| [gix](https://github.com/GitoxideLabs/gitoxide ) | `0.66.0` | `0.67.0` |
Updates `regex` from 1.11.0 to 1.11.1
- [Release notes](https://github.com/rust-lang/regex/releases )
- [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rust-lang/regex/compare/1.11.0...1.11.1 )
Updates `url` from 2.5.2 to 2.5.3
- [Release notes](https://github.com/servo/rust-url/releases )
- [Commits](https://github.com/servo/rust-url/compare/v2.5.2...v2.5.3 )
Updates `serde` from 1.0.210 to 1.0.215
- [Release notes](https://github.com/serde-rs/serde/releases )
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.210...v1.0.215 )
Updates `encoding_rs` from 0.8.34 to 0.8.35
- [Commits](https://github.com/hsivonen/encoding_rs/compare/v0.8.34...v0.8.35 )
Updates `anyhow` from 1.0.90 to 1.0.93
- [Release notes](https://github.com/dtolnay/anyhow/releases )
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.90...1.0.93 )
Updates `tempfile` from 3.13.0 to 3.14.0
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.13.0...v3.14.0 )
Updates `tokio` from 1.40.0 to 1.41.1
- [Release notes](https://github.com/tokio-rs/tokio/releases )
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.40.0...tokio-1.41.1 )
Updates `libc` from 0.2.161 to 0.2.162
- [Release notes](https://github.com/rust-lang/libc/releases )
- [Changelog](https://github.com/rust-lang/libc/blob/0.2.162/CHANGELOG.md )
- [Commits](https://github.com/rust-lang/libc/compare/0.2.161...0.2.162 )
Updates `rustix` from 0.38.37 to 0.38.40
- [Release notes](https://github.com/bytecodealliance/rustix/releases )
- [Changelog](https://github.com/bytecodealliance/rustix/blob/main/CHANGELOG.md )
- [Commits](https://github.com/bytecodealliance/rustix/compare/v0.38.37...v0.38.40 )
Updates `cc` from 1.1.31 to 1.1.37
- [Release notes](https://github.com/rust-lang/cc-rs/releases )
- [Changelog](https://github.com/rust-lang/cc-rs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/rust-lang/cc-rs/compare/cc-v1.1.31...cc-v1.1.37 )
Updates `gix` from 0.66.0 to 0.67.0
- [Release notes](https://github.com/GitoxideLabs/gitoxide/releases )
- [Changelog](https://github.com/GitoxideLabs/gitoxide/blob/main/CHANGELOG.md )
- [Commits](https://github.com/GitoxideLabs/gitoxide/compare/gix-v0.66.0...gix-v0.67.0 )
---
updated-dependencies:
- dependency-name: regex
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: url
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: serde
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: encoding_rs
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: anyhow
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: tempfile
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-dependencies
- dependency-name: tokio
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-dependencies
- dependency-name: libc
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: rustix
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: cc
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: gix
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-dependencies
...
Signed-off-by: dependabot[bot] <support@github.com>
2 weeks ago
10c3502a89
fix: removed explict default config file from swift-format ( #12052 )
2 weeks ago
b53dafe326
Treat .prettierrc as YAML ( #11997 )
3 weeks ago
c0920e779d
just: update tree-sitter-grammar to support 1.36.0 ( #11606 )
...
Release notes:
- https://github.com/casey/just/releases/tag/1.35.0
- https://github.com/casey/just/releases/tag/1.36.0
Notably, this adds `[private]` attributes on modules, which the current version of the grammar cannot parse,
as well as unicode codepoint escape sequences.
3 weeks ago
38faf74feb
feat: Add support for cylc configuration files ( #11830 )
...
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
4 weeks ago
101a74bf6e
build(deps): bump the rust-dependencies group with 6 updates ( #11924 )
...
Bumps the rust-dependencies group with 6 updates:
| Package | From | To |
| --- | --- | --- |
| [serde_json](https://github.com/serde-rs/json ) | `1.0.128` | `1.0.132` |
| [anyhow](https://github.com/dtolnay/anyhow ) | `1.0.89` | `1.0.90` |
| [libc](https://github.com/rust-lang/libc ) | `0.2.159` | `0.2.161` |
| [fern](https://github.com/daboross/fern ) | `0.6.2` | `0.7.0` |
| [pulldown-cmark](https://github.com/raphlinus/pulldown-cmark ) | `0.12.1` | `0.12.2` |
| [cc](https://github.com/rust-lang/cc-rs ) | `1.1.30` | `1.1.31` |
Updates `serde_json` from 1.0.128 to 1.0.132
- [Release notes](https://github.com/serde-rs/json/releases )
- [Commits](https://github.com/serde-rs/json/compare/1.0.128...1.0.132 )
Updates `anyhow` from 1.0.89 to 1.0.90
- [Release notes](https://github.com/dtolnay/anyhow/releases )
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.89...1.0.90 )
Updates `libc` from 0.2.159 to 0.2.161
- [Release notes](https://github.com/rust-lang/libc/releases )
- [Changelog](https://github.com/rust-lang/libc/blob/0.2.161/CHANGELOG.md )
- [Commits](https://github.com/rust-lang/libc/compare/0.2.159...0.2.161 )
Updates `fern` from 0.6.2 to 0.7.0
- [Release notes](https://github.com/daboross/fern/releases )
- [Changelog](https://github.com/daboross/fern/blob/main/CHANGELOG.md )
- [Commits](https://github.com/daboross/fern/compare/fern-0.6.2...fern-0.7.0 )
Updates `pulldown-cmark` from 0.12.1 to 0.12.2
- [Release notes](https://github.com/raphlinus/pulldown-cmark/releases )
- [Commits](https://github.com/raphlinus/pulldown-cmark/compare/v0.12.1...v0.12.2 )
Updates `cc` from 1.1.30 to 1.1.31
- [Release notes](https://github.com/rust-lang/cc-rs/releases )
- [Changelog](https://github.com/rust-lang/cc-rs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/rust-lang/cc-rs/compare/cc-v1.1.30...cc-v1.1.31 )
---
updated-dependencies:
- dependency-name: serde_json
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: anyhow
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: libc
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: fern
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-dependencies
- dependency-name: pulldown-cmark
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: cc
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 month ago
6d64e6288a
Bump flake dependencies
...
`nix flake update`
1 month ago
f371dcaa4e
flake: Include --cfg tokio_unstable in Rust flags
...
The flake sets `RUSTFLAGS` and that overwrites the setting in
`.cargo/config.toml`. We need to add the `--cfg tokio_unstable` flag to
enable integration tests to run when called from the devShell.
1 month ago
be2884d800
Continue line comments ( #10996 )
1 month ago
a1453350df
Adding snakemake to language ( #11858 )
...
* feat: snakemake language
* feat: snakemake syntax highlighting
* doc: xtask docgen - snakemake
* Addressed feedback: removed redundant grammar
* fixed indentation
* removed has-ancestor predicate
---------
Co-authored-by: “SebastianDall” <“semoda@bio.auu.dk”>
1 month ago
855a43a266
Bump `jjdescription` grammar revision ( #11857 )
1 month ago
5ab1f1eb5a
docs(themes): place `ui.highlight.frameline` and `ui.highlight` together ( #11896 )
...
* docs(themes): place `ui.highlight.frameline` and `ui.highlight` together
* docs(themes): small fix
1 month ago
1437ba1e5a
Add glsl_analyzer as default language server for GLSL ( #11891 )
...
* Add glsl_analyzer as default language server for GLSL
* Generate docs
1 month ago
d1b8129491
build(deps): bump cc in the rust-dependencies group ( #11890 )
...
Bumps the rust-dependencies group with 1 update: [cc](https://github.com/rust-lang/cc-rs ).
Updates `cc` from 1.1.28 to 1.1.30
- [Release notes](https://github.com/rust-lang/cc-rs/releases )
- [Changelog](https://github.com/rust-lang/cc-rs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/rust-lang/cc-rs/compare/cc-v1.1.28...cc-v1.1.30 )
---
updated-dependencies:
- dependency-name: cc
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 month ago
f2d54db24f
Update repology URL after change from helix to helix-editor ( #11877 )
...
* Update repology URL after change from helix to helix-editor
* Update book/src/package-managers.md
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---------
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
1 month ago
e4f3483bd1
Fix repology badge ( #11895 )
1 month ago
a7651f5bf0
build(deps): bump the rust-dependencies group with 4 updates ( #11850 )
...
Bumps the rust-dependencies group with 4 updates: [once_cell](https://github.com/matklad/once_cell ), [futures-util](https://github.com/rust-lang/futures-rs ), [futures-executor](https://github.com/rust-lang/futures-rs ) and [cc](https://github.com/rust-lang/cc-rs ).
Updates `once_cell` from 1.20.1 to 1.20.2
- [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md )
- [Commits](https://github.com/matklad/once_cell/compare/v1.20.1...v1.20.2 )
Updates `futures-util` from 0.3.30 to 0.3.31
- [Release notes](https://github.com/rust-lang/futures-rs/releases )
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.30...0.3.31 )
Updates `futures-executor` from 0.3.30 to 0.3.31
- [Release notes](https://github.com/rust-lang/futures-rs/releases )
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.30...0.3.31 )
Updates `cc` from 1.1.23 to 1.1.28
- [Release notes](https://github.com/rust-lang/cc-rs/releases )
- [Changelog](https://github.com/rust-lang/cc-rs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/rust-lang/cc-rs/compare/cc-v1.1.23...cc-v1.1.28 )
---
updated-dependencies:
- dependency-name: once_cell
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: futures-util
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: futures-executor
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: cc
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 months ago
761f70d611
build(deps): bump cachix/install-nix-action from 29 to 30 ( #11852 )
...
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action ) from 29 to 30.
- [Release notes](https://github.com/cachix/install-nix-action/releases )
- [Commits](https://github.com/cachix/install-nix-action/compare/v29...v30 )
---
updated-dependencies:
- dependency-name: cachix/install-nix-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 months ago
f55f1f8b43
Remove auto-pair for single quote in SML. ( #11838 )
...
Similar to OCaml and other ML languages, single quote is a normal
character that can appear in identifiers and is also used in type
parameters. It is not used for strings or character literals, which both
use double quote.
Co-authored-by: Rose Hogenson <rosehogenson@posteo.net>
2 months ago
048973fc55
Add support for dune project language ( #11829 )
2 months ago
f6d39cbc1d
refactor(lsp): handle out-of-range `active_signature` ( #11825 )
2 months ago
162028d444
Merge pull request #11486 from helix-editor/lsp-location-refactor
...
Replace uses of `lsp::Location` with a custom Location type
2 months ago
02b6f1488a
fix git repo detection on symlinks ( #11732 )
2 months ago
57ec3b7330
Add a highlight for the keyword.storage scope to the onedark theme ( #11802 )
...
Rust highlight queries make use of keyword.storage for keywords like
`struct`, `enum`, and also for modifiers like `mut` and `ref`.
Using a color that's different to the one used for
`"variable.parameter"` (red) improves differentiation for mutable
function arguments.
2 months ago
083bb0118f
Fix some odin highlights ( #11804 )
...
Some of the odin highlights seemed wrong or lacking, like the import names were not being matched:
```odin
// color both "rl" here to same value
import rl "vendor:raylib"
...
rl.Vector3
```
Import color was also not being used correctly
2 months ago
cb9307bb03
build(deps): bump the rust-dependencies group with 5 updates ( #11805 )
...
Bumps the rust-dependencies group with 5 updates:
| Package | From | To |
| --- | --- | --- |
| [once_cell](https://github.com/matklad/once_cell ) | `1.19.0` | `1.20.1` |
| [regex](https://github.com/rust-lang/regex ) | `1.10.6` | `1.11.0` |
| [tempfile](https://github.com/Stebalien/tempfile ) | `3.12.0` | `3.13.0` |
| [libc](https://github.com/rust-lang/libc ) | `0.2.158` | `0.2.159` |
| [cc](https://github.com/rust-lang/cc-rs ) | `1.1.21` | `1.1.23` |
Updates `once_cell` from 1.19.0 to 1.20.1
- [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md )
- [Commits](https://github.com/matklad/once_cell/compare/v1.19.0...v1.20.1 )
Updates `regex` from 1.10.6 to 1.11.0
- [Release notes](https://github.com/rust-lang/regex/releases )
- [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rust-lang/regex/compare/1.10.6...1.11.0 )
Updates `tempfile` from 3.12.0 to 3.13.0
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.12.0...v3.13.0 )
Updates `libc` from 0.2.158 to 0.2.159
- [Release notes](https://github.com/rust-lang/libc/releases )
- [Changelog](https://github.com/rust-lang/libc/blob/0.2.159/CHANGELOG.md )
- [Commits](https://github.com/rust-lang/libc/compare/0.2.158...0.2.159 )
Updates `cc` from 1.1.21 to 1.1.23
- [Release notes](https://github.com/rust-lang/cc-rs/releases )
- [Changelog](https://github.com/rust-lang/cc-rs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/rust-lang/cc-rs/compare/cc-v1.1.21...cc-v1.1.23 )
---
updated-dependencies:
- dependency-name: once_cell
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-dependencies
- dependency-name: regex
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-dependencies
- dependency-name: tempfile
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-dependencies
- dependency-name: libc
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
- dependency-name: cc
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-dependencies
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 months ago
e28b0da1fb
build(deps): bump cachix/install-nix-action from V28 to 29 ( #11806 )
...
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action ) from V28 to 29. This release includes the previously tagged commit.
- [Release notes](https://github.com/cachix/install-nix-action/releases )
- [Commits](https://github.com/cachix/install-nix-action/compare/V28...v29 )
---
updated-dependencies:
- dependency-name: cachix/install-nix-action
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 months ago
e5dd60f794
Add Erlang Language Platform (ELP) support to Erlang ( #11499 )
...
* Add ELP LSP to Erlang
* generate docs
---------
Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
2 months ago
d103248cb8
Small bogster theme improvements ( #11353 )
...
* Add a distinct jump-label to bogster theme
* Make the primary label visible in the bogster theme
2 months ago
42453786a0
add key concepts to usage.md ( #11485 )
2 months ago
e1cacd149c
chore: add "ui.virtual.jump-label" to gruber-darker theme ( #11547 )
2 months ago
5975e53600
Add vale language server ( #11636 )
...
Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
2 months ago
24f24299f2
feat(languages): add `superhtml` as lsp for `html` ( #11609 )
2 months ago
5ffd4ae529
Add undocumented keybindings to book ( #11662 )
2 months ago
8cdce9212c
Improve tree-sitter-subtree ( #11663 )
...
* Make unnamed nodes visible in subtree view
* Refine command description
* Update generated docs
* Update unit test expected output
2 months ago
48b89d4dcf
fix: fish builtin functions are highlighted as such ( #11792 )
...
* fix: fish builtin functions are highlighted as such
* fix: single-character commands recognized as builtins
???? how did that query even happen
* fix: update builtins to fish 3.7.1
* fix: add back `alias` and `isatty`
they are builtins, but aren't reported by builtin -n for some reason
2 months ago
dd45ae1289
languages.toml: recognize ldtk files ( #11793 )
2 months ago
2c3a00e96a
Fix typo in tutor ch 13.5 ( #11765 )
...
It said "split" instead of "swap"
2 months ago
2ce4c6d5fa
Bump tree-sitter-nickel ( #11771 )
2 months ago
Sam Kagan
stefanvi
Sebastian Dörner
Oren Mittman
dependabot[bot]
Michael Davis
Elizabeth
Yuki Kobayashi
Poliorcetics
Elliot Fontaine
TornaxO7
Sebastian Dall
karei
Ivan B.
langurmonkey
David Else
Dmitry Marakasov
rhogenson
Christopher Kaster
RoloEdits
Pascal Kuthe
Skyler Hawthorne
Ian Hobson
Akseli
offsetcyan
Denis Krienbühl
David Crespo
chtenb
Axlefublr
Dmitriy Sokolov
Ian J Sikes
jneem