Skip to content

fix: substitute vscode variables in config.serverPath #13993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jan 20, 2023
Merged

fix: substitute vscode variables in config.serverPath #13993

merged 1 commit into from
Jan 20, 2023

Conversation

OmarTawfik
Copy link
Contributor

From comment by @Veykril in #13939 (comment):

Yep, we pull the server path first, then substitute the configs, that's the wrong order.

rust-analyzer/editors/code/src/ctx.ts

Lines 155 to 161 in 6e52c64

const newEnv = substituteVariablesInEnv(
Object.assign({}, process.env, this.config.serverExtraEnv)
);
const run: lc.Executable = {
command: this._serverPath,
options: { env: newEnv },
};

Fixes #13939

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 20, 2023
@OmarTawfik OmarTawfik changed the title allow using vscode variables in config.serverPath fix: substitute vscode variables in config.serverPath Jan 20, 2023
@OmarTawfik OmarTawfik mentioned this pull request Jan 20, 2023
Closed
@Veykril
Copy link
Member

Veykril commented Jan 20, 2023

Thanks!
@bors r+

@bors
Copy link
Contributor

bors commented Jan 20, 2023

📌 Commit 7198cd0 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 20, 2023

⌛ Testing commit 7198cd0 with merge 9a6294d...

@bors
Copy link
Contributor

bors commented Jan 20, 2023

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing 9a6294d to master...

@bors bors merged commit 9a6294d into rust-lang:master Jan 20, 2023
OmarTawfik added a commit to NomicFoundation/slang that referenced this pull request Feb 7, 2023
@OmarTawfik
infra: use local rust-analyzer binary
e3aa638 
Using fix from: rust-lang/rust-analyzer#13993
OmarTawfik added a commit to NomicFoundation/slang that referenced this pull request Feb 7, 2023
@OmarTawfik
build infra fixes
6df784b 
- remove hermit files from rg linter file search, as it was including files in `$REPO_ROOT/.hermit` in linting.
- use local rust-analyzer binary: rust-lang/rust-analyzer#13993
- showing the `unused_crate_dependencies` cargo warning locally, not just CI.
@OmarTawfik OmarTawfik mentioned this pull request Feb 7, 2023
Merged
OmarTawfik added a commit to NomicFoundation/slang that referenced this pull request Feb 11, 2023
@OmarTawfik
build infra fixes
3722454 
- remove hermit files from rg linter file search, as it was including files in `$REPO_ROOT/.hermit` in linting.
- use local rust-analyzer binary: rust-lang/rust-analyzer#13993
- showing the `unused_crate_dependencies` cargo warning locally, not just CI.
OmarTawfik added a commit to NomicFoundation/slang that referenced this pull request Feb 11, 2023
@OmarTawfik
fix empty_productions schema validation (#315)
73ab072 
* build infra fixes

- remove hermit files from rg linter file search, as it was including files in `$REPO_ROOT/.hermit` in linting.
- use local rust-analyzer binary: rust-lang/rust-analyzer#13993
- showing the `unused_crate_dependencies` cargo warning locally, not just CI.

* fix empty_productions schema validation

It should be checking nested expressions of sequences
OmarTawfik added a commit to NomicFoundation/slang that referenced this pull request Feb 11, 2023
@OmarTawfik
build infra fixes (#314)
e95f489 
- remove hermit files from rg linter file search, as it was including files in `$REPO_ROOT/.hermit` in linting.
- use local rust-analyzer binary: rust-lang/rust-analyzer#13993
- showing the `unused_crate_dependencies` cargo warning locally, not just CI.
OmarTawfik added a commit to NomicFoundation/slang that referenced this pull request Feb 11, 2023
@OmarTawfik
fix empty_productions schema validation (#315)
f0bb59c 
* build infra fixes

- remove hermit files from rg linter file search, as it was including files in `$REPO_ROOT/.hermit` in linting.
- use local rust-analyzer binary: rust-lang/rust-analyzer#13993
- showing the `unused_crate_dependencies` cargo warning locally, not just CI.

* fix empty_productions schema validation

It should be checking nested expressions of sequences
OmarTawfik added a commit to NomicFoundation/slang that referenced this pull request Feb 11, 2023
@OmarTawfik
add tests for TupleExpression (#316)
6fbd0c8 
* build infra fixes

- remove hermit files from rg linter file search, as it was including files in `$REPO_ROOT/.hermit` in linting.
- use local rust-analyzer binary: rust-lang/rust-analyzer#13993
- showing the `unused_crate_dependencies` cargo warning locally, not just CI.

* fix empty_productions schema validation

It should be checking nested expressions of sequences

* add tests for TupleExpression
OmarTawfik added a commit to NomicFoundation/slang that referenced this pull request Feb 11, 2023
@OmarTawfik
build infra fixes (#314)
b22c0f4 
- remove hermit files from rg linter file search, as it was including files in `$REPO_ROOT/.hermit` in linting.
- use local rust-analyzer binary: rust-lang/rust-analyzer#13993
- showing the `unused_crate_dependencies` cargo warning locally, not just CI.
AntonyBlakey pushed a commit to NomicFoundation/slang that referenced this pull request Feb 14, 2023
@OmarTawfik @AntonyBlakey
build infra fixes (#314)
50c037d 
- remove hermit files from rg linter file search, as it was including files in `$REPO_ROOT/.hermit` in linting.
- use local rust-analyzer binary: rust-lang/rust-analyzer#13993
- showing the `unused_crate_dependencies` cargo warning locally, not just CI.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support repo-relative paths in rust-analyzer.server.path
4 participants
@OmarTawfik @Veykril @bors @rustbot