Skip to content
This repository was archived by the owner on Nov 18, 2022. It is now read-only.

Commit 64efbbe

Browse files
vsrsvsrs
committed
Add tests
1 parent b4539e1 commit 64efbbe

File tree

4 files changed

+128
-10
lines changed

4 files changed

+128
-10
lines changed

‎rust-analyzer/editors/code/src/config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export type UpdatesChannel = "stable" | "nightly";
55

66
export const NIGHTLY_TAG = "nightly";
77

8-
export type RunnableEnvCfg = Record<string, string> | [{ mask?: string, env: Record<string, string>; }]
8+
export type RunnableEnvCfg = undefined | Record<string, string> | { mask?: string, env: Record<string, string>; }[];
99

1010
export class Config {
1111
readonly extensionId = "matklad.rust-analyzer";
@@ -117,7 +117,7 @@ export class Config {
117117
}
118118

119119
get runnableEnv() {
120-
return this.get<RunnableEnvCfg | undefined>("runnableEnv");
120+
return this.get<RunnableEnvCfg>("runnableEnv");
121121
}
122122

123123
get debug() {

‎rust-analyzer/editors/code/src/debug.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ async function getDebugConfiguration(ctx: Ctx, runnable: ra.Runnable): Promise<v
9393
}
9494

9595
const executable = await getDebugExecutable(runnable);
96-
const env = prepareEnv(runnable, ctx.config);
96+
const env = prepareEnv(runnable, ctx.config.runnableEnv);
9797
const debugConfig = knownEngines[debugEngine.id](runnable, simplifyPath(executable), env, debugOptions.sourceFileMap);
9898
if (debugConfig.type in debugOptions.engineSettings) {
9999
const settingsMap = (debugOptions.engineSettings as any)[debugConfig.type];

‎rust-analyzer/editors/code/src/run.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as tasks from './tasks';
55

66
import { Ctx } from './ctx';
77
import { makeDebugConfig } from './debug';
8-
import { Config } from './config';
8+
import { Config, RunnableEnvCfg } from './config';
99

1010
const quickPickButtons = [{ iconPath: new vscode.ThemeIcon("save"), tooltip: "Save as a launch.json configurtation." }];
1111

@@ -96,22 +96,22 @@ export class RunnableQuickPick implements vscode.QuickPickItem {
9696
}
9797
}
9898

99-
export function prepareEnv(runnable: ra.Runnable, config: Config): Record<string, string> {
99+
export function prepareEnv(runnable: ra.Runnable, runnableEnvCfg: RunnableEnvCfg): Record<string, string> {
100100
const env: Record<string, string> = { "RUST_BACKTRACE": "short" };
101101

102102
if (runnable.args.expectTest) {
103103
env["UPDATE_EXPECT"] = "1";
104104
}
105105

106-
if (config.runnableEnv) {
107-
if (Array.isArray(config.runnableEnv)) {
108-
for (const it of config.runnableEnv) {
106+
if (runnableEnvCfg) {
107+
if (Array.isArray(runnableEnvCfg)) {
108+
for (const it of runnableEnvCfg) {
109109
if (!it.mask || new RegExp(it.mask).test(runnable.label)) {
110110
Object.assign(env, it.env);
111111
}
112112
}
113113
} else {
114-
Object.assign(env, config.runnableEnv as Record<string, string>);
114+
Object.assign(env, runnableEnvCfg as Record<string, string>);
115115
}
116116
}
117117

@@ -136,7 +136,7 @@ export async function createTask(runnable: ra.Runnable, config: Config): Promise
136136
command: args[0], // run, test, etc...
137137
args: args.slice(1),
138138
cwd: runnable.args.workspaceRoot,
139-
env: prepareEnv(runnable, config),
139+
env: prepareEnv(runnable, config.runnableEnv),
140140
};
141141

142142
const target = vscode.workspace.workspaceFolders![0]; // safe, see main activate()

‎rust-analyzer/editors/code/tests/unit/runnable_env.test.ts

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
import * as assert from 'assert';
2+
import { prepareEnv } from '../../src/run';
3+
import { RunnableEnvCfg } from '../../src/config';
4+
import * as ra from '../../src/lsp_ext';
5+
6+
function make_runnable(label: string): ra.Runnable {
7+
return {
8+
label,
9+
kind: "cargo",
10+
args: {
11+
cargoArgs: [],
12+
executableArgs: []
13+
}
14+
}
15+
}
16+
17+
function fakePrepareEnv(runnable_name: string, config: RunnableEnvCfg) : Record<string, string> {
18+
const runnable = make_runnable(runnable_name);
19+
return prepareEnv(runnable, config);
20+
}
21+
22+
suite('Runnable env', () => {
23+
test('Global config works', () => {
24+
const bin_env = fakePrepareEnv("run project_name", {"GLOBAL": "g"});
25+
assert.equal(bin_env["GLOBAL"], "g");
26+
27+
const test_env = fakePrepareEnv("test some::mod::test_name", {"GLOBAL": "g"});
28+
assert.equal(test_env["GLOBAL"], "g");
29+
});
30+
31+
test('null mask works', () => {
32+
const config = [
33+
{
34+
env: { DATA: "data" }
35+
}
36+
];
37+
const bin_env = fakePrepareEnv("run project_name", config);
38+
assert.equal(bin_env["DATA"], "data");
39+
40+
const test_env = fakePrepareEnv("test some::mod::test_name", config);
41+
assert.equal(test_env["DATA"], "data");
42+
});
43+
44+
test('order works', () => {
45+
const config = [
46+
{
47+
env: { DATA: "data" }
48+
},
49+
{
50+
env: { DATA: "newdata" }
51+
}
52+
];
53+
const bin_env = fakePrepareEnv("run project_name", config);
54+
assert.equal(bin_env["DATA"], "newdata");
55+
56+
const test_env = fakePrepareEnv("test some::mod::test_name", config);
57+
assert.equal(test_env["DATA"], "newdata");
58+
});
59+
60+
test('mask works', () => {
61+
const config = [
62+
{
63+
env: { DATA: "data" }
64+
},
65+
{
66+
mask: "^run",
67+
env: { DATA: "rundata" }
68+
},
69+
{
70+
mask: "special_test$",
71+
env: { DATA: "special_test" }
72+
}
73+
];
74+
const bin_env = fakePrepareEnv("run project_name", config);
75+
assert.equal(bin_env["DATA"], "rundata");
76+
77+
const test_env = fakePrepareEnv("test some::mod::test_name", config);
78+
assert.equal(test_env["DATA"], "data");
79+
80+
const special_test_env = fakePrepareEnv("test some::mod::special_test", config);
81+
assert.equal(special_test_env["DATA"], "special_test");
82+
});
83+
84+
test('exact test name works', () => {
85+
const config = [
86+
{
87+
env: { DATA: "data" }
88+
},
89+
{
90+
mask: "some::mod::test_name",
91+
env: { DATA: "test special" }
92+
}
93+
];
94+
const test_env = fakePrepareEnv("test some::mod::test_name", config);
95+
assert.equal(test_env["DATA"], "test special");
96+
97+
const special_test_env = fakePrepareEnv("test some::mod::another_test", config);
98+
assert.equal(special_test_env["DATA"], "data");
99+
});
100+
101+
test('test mod name works', () => {
102+
const config = [
103+
{
104+
env: { DATA: "data" }
105+
},
106+
{
107+
mask: "some::mod",
108+
env: { DATA: "mod special" }
109+
}
110+
];
111+
const test_env = fakePrepareEnv("test some::mod::test_name", config);
112+
assert.equal(test_env["DATA"], "mod special");
113+
114+
const special_test_env = fakePrepareEnv("test some::mod::another_test", config);
115+
assert.equal(special_test_env["DATA"], "mod special");
116+
});
117+
118+
});

0 commit comments

Comments
 (0)