diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-19 16:35:32 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-10-19 16:35:32 +0100 |
commit | 2c5bd9517e202a6e2b004664f291b85093c8e0a9 (patch) | |
tree | df379c8277c4385dd798bda91cc16b44a329936a /editors | |
parent | 9b656463ceb18c3fc86ac3cac888cc0ad9a9b4f4 (diff) | |
parent | d019cdbbb29c00400ed5b74b99131087c7fb8aac (diff) |
Merge #6274
6274: Check cargoExtraArgs for undefined before using r=matklad a=feileacan
Fixes #6273
Co-authored-by: feileacan <[email protected]>
Diffstat (limited to 'editors')
-rw-r--r-- | editors/code/src/run.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/editors/code/src/run.ts b/editors/code/src/run.ts index 459b7f250..17573cd82 100644 --- a/editors/code/src/run.ts +++ b/editors/code/src/run.ts | |||
@@ -129,7 +129,9 @@ export async function createTask(runnable: ra.Runnable, config: Config): Promise | |||
129 | } | 129 | } |
130 | 130 | ||
131 | const args = [...runnable.args.cargoArgs]; // should be a copy! | 131 | const args = [...runnable.args.cargoArgs]; // should be a copy! |
132 | args.push(...runnable.args.cargoExtraArgs); // Append user-specified cargo options. | 132 | if (runnable.args.cargoExtraArgs) { |
133 | args.push(...runnable.args.cargoExtraArgs); // Append user-specified cargo options. | ||
134 | } | ||
133 | if (runnable.args.executableArgs.length > 0) { | 135 | if (runnable.args.executableArgs.length > 0) { |
134 | args.push('--', ...runnable.args.executableArgs); | 136 | args.push('--', ...runnable.args.executableArgs); |
135 | } | 137 | } |