aboutsummaryrefslogtreecommitdiff
path: root/editors/code/src
diff options
context:
space:
mode:
Diffstat (limited to 'editors/code/src')
-rw-r--r--editors/code/src/run.ts4
-rw-r--r--editors/code/src/util.ts5
2 files changed, 5 insertions, 4 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 }
diff --git a/editors/code/src/util.ts b/editors/code/src/util.ts
index 08159b43c..53492a445 100644
--- a/editors/code/src/util.ts
+++ b/editors/code/src/util.ts
@@ -75,12 +75,11 @@ export async function sendRequestWithRetry<TParam, TRet>(
75 log.warn("LSP request timed out", { method: reqType.method, param, error }); 75 log.warn("LSP request timed out", { method: reqType.method, param, error });
76 throw error; 76 throw error;
77 } 77 }
78 78 if (error.code === lc.LSPErrorCodes.RequestCancelled) {
79 if (error.code === lc.ErrorCodes.RequestCancelled) {
80 throw error; 79 throw error;
81 } 80 }
82 81
83 if (error.code !== lc.ErrorCodes.ContentModified) { 82 if (error.code !== lc.LSPErrorCodes.ContentModified) {
84 log.warn("LSP request failed", { method: reqType.method, param, error }); 83 log.warn("LSP request failed", { method: reqType.method, param, error });
85 throw error; 84 throw error;
86 } 85 }