diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-02-10 11:38:56 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-02-10 11:38:56 +0000 |
commit | 82a1b91f205ac9c3d397b2bea033639f5df9e6b6 (patch) | |
tree | 4683820d7a28c6bc991992a8c1978c3bf87b1b61 /editors/code/src/run.ts | |
parent | 5e39d7a68032ba40d3ed76d41d0f01ad628f5c95 (diff) | |
parent | 97166e2ad9307b3f4cca33d2c82149be9eb5a633 (diff) |
Merge #7625
7625: Add **Copy Run Command Line** command for vscode r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'editors/code/src/run.ts')
-rw-r--r-- | editors/code/src/run.ts | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/editors/code/src/run.ts b/editors/code/src/run.ts index 7ac7ca3cb..138e3f686 100644 --- a/editors/code/src/run.ts +++ b/editors/code/src/run.ts | |||
@@ -128,13 +128,7 @@ export async function createTask(runnable: ra.Runnable, config: Config): Promise | |||
128 | throw `Unexpected runnable kind: ${runnable.kind}`; | 128 | throw `Unexpected runnable kind: ${runnable.kind}`; |
129 | } | 129 | } |
130 | 130 | ||
131 | const args = [...runnable.args.cargoArgs]; // should be a copy! | 131 | const args = createArgs(runnable); |
132 | if (runnable.args.cargoExtraArgs) { | ||
133 | args.push(...runnable.args.cargoExtraArgs); // Append user-specified cargo options. | ||
134 | } | ||
135 | if (runnable.args.executableArgs.length > 0) { | ||
136 | args.push('--', ...runnable.args.executableArgs); | ||
137 | } | ||
138 | 132 | ||
139 | const definition: tasks.CargoTaskDefinition = { | 133 | const definition: tasks.CargoTaskDefinition = { |
140 | type: tasks.TASK_TYPE, | 134 | type: tasks.TASK_TYPE, |
@@ -152,3 +146,14 @@ export async function createTask(runnable: ra.Runnable, config: Config): Promise | |||
152 | 146 | ||
153 | return cargoTask; | 147 | return cargoTask; |
154 | } | 148 | } |
149 | |||
150 | export function createArgs(runnable: ra.Runnable): string[] { | ||
151 | const args = [...runnable.args.cargoArgs]; // should be a copy! | ||
152 | if (runnable.args.cargoExtraArgs) { | ||
153 | args.push(...runnable.args.cargoExtraArgs); // Append user-specified cargo options. | ||
154 | } | ||
155 | if (runnable.args.executableArgs.length > 0) { | ||
156 | args.push('--', ...runnable.args.executableArgs); | ||
157 | } | ||
158 | return args; | ||
159 | } | ||