Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix direnv option being named direnv and not load_direnv in the docs (#14309)

Browse source 
This is a quick followup to #13902 that fixes a mistake with the setting
naming in the docs, I accidentally made
Release Notes:

- N/A
This commit is contained in:
Stanislav Alekseev 2024-07-13 00:12:02 +03:00 • committed by GitHub
parent 0a718c65e2
commit 59bc027750
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
assets/settings/default.json
View file

@ -548,12 +548,12 @@
}, },
// Configuration for how direnv configuration should be loaded. May take 2 values: // Configuration for how direnv configuration should be loaded. May take 2 values:
// 1. Load direnv configuration through the shell hook, works for POSIX shells and fish. // 1. Load direnv configuration through the shell hook, works for POSIX shells and fish.
// "direnv": "shell_hook" // "load_direnv": "shell_hook"
// 2. Load direnv configuration using `direnv export json` directly. // 2. Load direnv configuration using `direnv export json` directly.
// This can help with some shells that otherwise would not detect // This can help with some shells that otherwise would not detect
// the direnv environment, such as nushell or elvish. // the direnv environment, such as nushell or elvish.
// "direnv": "direct" // "load_direnv": "direct"
"direnv": "shell_hook", "load_direnv": "shell_hook",
"inline_completions": { "inline_completions": {
// A list of globs representing files that inline completions should be disabled for. // A list of globs representing files that inline completions should be disabled for.
"disabled_globs": [".env"] "disabled_globs": [".env"]

4
docs/src/configuring-zed.md
View file

@ -193,11 +193,11 @@ left and right padding of the central pane from the workspace when the centered
## Direnv Integration ## Direnv Integration
- Description: Settings for [direnv](https://direnv.net/) integration. Requires `direnv` to be installed. `direnv` integration currently only means that the environment variables set by a `direnv` configuration can be used to detect some language servers in `$PATH` instead of installing them. - Description: Settings for [direnv](https://direnv.net/) integration. Requires `direnv` to be installed. `direnv` integration currently only means that the environment variables set by a `direnv` configuration can be used to detect some language servers in `$PATH` instead of installing them.
- Setting: `direnv` - Setting: `load_direnv`
- Default: - Default:
```json ```json
"direnv": "shell_hook" "load_direnv": "shell_hook"
``` ```
**Options** **Options**