diff options
| author | bors <bors@rust-lang.org> | 2024-09-30 06:32:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-30 06:32:20 +0000 |
| commit | 1ca85ac7063cf6479d0fe0d879eb62a7c3c475cb (patch) | |
| tree | 20b2232af0f808cda9e6b1a3d52deda84903e4a6 /src/tools/rust-analyzer/editors/code | |
| parent | e50339a5df602901849e4a9c3dadebdcda8bc723 (diff) | |
| parent | 91834ec7197efeff7dabcea0091937e3ce0f4d2b (diff) | |
Auto merge of #18085 - ChayimFriedman2:gate-test, r=Veykril
feat: Provide an config option to not set `cfg(test)` Fixes #17957.
Diffstat (limited to 'src/tools/rust-analyzer/editors/code')
| -rw-r--r-- | src/tools/rust-analyzer/editors/code/package.json | 10 | ||||
| -rw-r--r-- | src/tools/rust-analyzer/editors/code/src/config.ts | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/tools/rust-analyzer/editors/code/package.json b/src/tools/rust-analyzer/editors/code/package.json index 869bcb65c49..a823e5bb96c 100644 --- a/src/tools/rust-analyzer/editors/code/package.json +++ b/src/tools/rust-analyzer/editors/code/package.json @@ -854,6 +854,16 @@ } }, { + "title": "cfg", + "properties": { + "rust-analyzer.cfg.setTest": { + "markdownDescription": "Set `cfg(test)` for local crates. Defaults to true.", + "default": true, + "type": "boolean" + } + } + }, + { "title": "general", "properties": { "rust-analyzer.checkOnSave": { diff --git a/src/tools/rust-analyzer/editors/code/src/config.ts b/src/tools/rust-analyzer/editors/code/src/config.ts index 59ef132b1e4..abb4099f9f5 100644 --- a/src/tools/rust-analyzer/editors/code/src/config.ts +++ b/src/tools/rust-analyzer/editors/code/src/config.ts @@ -24,6 +24,7 @@ export class Config { "serverPath", "server", "files", + "cfg", ].map((opt) => `${this.rootSection}.${opt}`); private readonly requiresWindowReloadOpts = ["testExplorer"].map( |