Skip to content

Commit f152032

Browse files
lramos15bpasero
andauthored
Have FileSystemError adopt ErrorNoTelemetry (microsoft#155885)
* Cleanup FileSystemErrors * Implement the naive solution * hm? Co-authored-by: Benjamin Pasero <[email protected]>
1 parent 2c93c17 commit f152032

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/vs/base/common/errors.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ export class ErrorNoTelemetry extends Error {
243243

244244
constructor(msg?: string) {
245245
super(msg);
246-
this.name = 'ErrorNoTelemetry';
246+
this.name = 'CodeExpectedError';
247247
}
248248

249249
public static fromError(err: Error): ErrorNoTelemetry {
@@ -258,7 +258,7 @@ export class ErrorNoTelemetry extends Error {
258258
}
259259

260260
public static isErrorNoTelemetry(err: Error): err is ErrorNoTelemetry {
261-
return err.name === 'ErrorNoTelemetry';
261+
return err.name === 'CodeExpectedError';
262262
}
263263
}
264264

src/vs/platform/telemetry/common/errorTelemetry.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { binarySearch } from 'vs/base/common/arrays';
77
import { errorHandler, ErrorNoTelemetry } from 'vs/base/common/errors';
88
import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
99
import { safeStringify } from 'vs/base/common/objects';
10+
import { FileOperationError } from 'vs/platform/files/common/files';
1011
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
1112

1213
type ErrorEventFragment = {
@@ -87,7 +88,8 @@ export default abstract class BaseErrorTelemetry {
8788
}
8889

8990
// If it's the no telemetry error it doesn't get logged
90-
if (ErrorNoTelemetry.isErrorNoTelemetry(err)) {
91+
// TOOD @lramos15 hacking in FileOperation error because it's too messy to adopt ErrorNoTelemetry. A better solution should be found
92+
if (ErrorNoTelemetry.isErrorNoTelemetry(err) || err instanceof FileOperationError) {
9193
return;
9294
}
9395

0 commit comments

Comments
 (0)