fix review comments

packages/core/src/common/objects.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { isObject } from './types';
+import { isObject, isUndefined } from './types';
 
 export function deepClone<T>(obj: T): T {
     if (!isObject(obj)) {
@@ -70,3 +70,50 @@ export function notEmpty<T>(arg: T | undefined | null): arg is T {
 export function isEmpty(arg: Object): boolean {
     return Object.keys(arg).length === 0 && arg.constructor === Object;
 }
+
+// copied and modified from https://github.com/microsoft/vscode/blob/1.76.0/src/vs/base/common/objects.ts#L45-L83
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function cloneAndChange(obj: any, changer: (orig: any) => any, seen: Set<any>): any {
+    // impossible to clone an undefined or null object
+    // eslint-disable-next-line no-null/no-null
+    if (isUndefined(obj) || obj === null) {
+        return obj;
+    }
+
+    const changed = changer(obj);
+    if (!isUndefined(changed)) {
+        return changed;
+    }
+
+    if (Array.isArray(obj)) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const r1: any[] = [];
+        for (const e of obj) {
+            r1.push(cloneAndChange(e, changer, seen));
+        }
+        return r1;
+    }
+
+    if (isObject(obj)) {
+        if (seen.has(obj)) {
+            throw new Error('Cannot clone recursive data-structure');
+        }
+        seen.add(obj);
+        const r2 = {};
+        for (const i2 in obj) {
+            if (_hasOwnProperty.call(obj, i2)) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                (r2 as any)[i2] = cloneAndChange(obj[i2], changer, seen);
+            }
+        }
+        seen.delete(obj);
+        return r2;
+    }
+
+    return obj;
+}

packages/core/src/common/telemetry.ts

@@ -42,5 +42,4 @@ interface TelemetrySender {
 }
 
 interface TelemetryLoggerOptions {
-
 }

packages/plugin-ext/src/common/plugin-api-rpc.ts

@@ -2077,7 +2077,6 @@ export interface TabsMain {
 }
 
 export interface TelemetryMain {
-
 }
 
 export interface TelemetryExt {

packages/plugin-ext/src/plugin/telemetry-ext.ts

@@ -12,7 +12,10 @@
 // https://www.gnu.org/software/classpath/license.html.
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
 import { Event, Emitter } from '@theia/core/lib/common/event';
+import { cloneAndChange } from '@theia/core';
+import { mixin } from '../common/types';
 import { TelemetryTrustedValue, TelemetryLoggerOptions } from './types-impl';
 
 export class TelemetryExtImpl {
@@ -174,6 +177,7 @@ function mixInCommonPropsAndCleanData(data: Record<string, any>, additionalPrope
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+
 /**
  * Cleans a given stack of possible paths
  * @param stack The stack to sanitize
@@ -214,7 +218,7 @@ function anonymizeFilePaths(stack: string, cleanupPatterns: RegExp[]): string {
         // Check to see if the any cleanupIndexes partially overlap with this match
         const overlappingRange = cleanUpIndexes.some(([start, end]) => result.index < end && start < fileRegex.lastIndex);
 
-        // anoynimize user file paths that do not need to be retained or cleaned up.
+        // anonymize user file paths that do not need to be retained or cleaned up.
         if (!nodeModulesRegex.test(result[0]) && !overlappingRange) {
             updatedStack += stack.substring(lastIndex, result.index) + '<REDACTED: user-file-path>';
             lastIndex = fileRegex.lastIndex;
@@ -293,81 +297,3 @@ export function cleanData(data: Record<string, any>, cleanUpPatterns: RegExp[]):
     }, new Set());
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function cloneAndChange(obj: any, changer: (orig: any) => any, seen: Set<any>): any {
-    // impossible to clone a null or undefined object
-    if (isUndefined(obj) || obj === null) {
-        return obj;
-    }
-
-    const changed = changer(obj);
-    if (!isUndefined(changed)) {
-        return changed;
-    }
-
-    if (Array.isArray(obj)) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const r1: any[] = [];
-        for (const e of obj) {
-            r1.push(cloneAndChange(e, changer, seen));
-        }
-        return r1;
-    }
-
-    if (isObject(obj)) {
-        if (seen.has(obj)) {
-            throw new Error('Cannot clone recursive data-structure');
-        }
-        seen.add(obj);
-        const r2 = {};
-        for (const i2 in obj) {
-            if (Object.prototype.hasOwnProperty.call(obj, i2)) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                (r2 as any)[i2] = cloneAndChange(obj[i2], changer, seen);
-            }
-        }
-        seen.delete(obj);
-        return r2;
-    }
-
-    return obj;
-}
-
-/**
- * Copies all properties of source into destination. The optional parameter "overwrite" allows to control
- * if existing properties on the destination should be overwritten or not. Defaults to true (overwrite).
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function mixin(destination: any, source: any, overwrite: boolean = true): any {
-    if (!isObject(destination)) {
-        return source;
-    }
-
-    if (isObject(source)) {
-        Object.keys(source).forEach(key => {
-            if (key in destination) {
-                if (overwrite) {
-                    if (isObject(destination[key]) && isObject(source[key])) {
-                        mixin(destination[key], source[key], overwrite);
-                    } else {
-                        destination[key] = source[key];
-                    }
-                }
-            } else {
-                destination[key] = source[key];
-            }
-        });
-    }
-    return destination;
-}
-
-type UnknownObject<T extends object> = Record<string | number | symbol, unknown> & { [K in keyof T]: unknown };
-
-export function isObject<T extends object>(value: unknown): value is UnknownObject<T> {
-    // eslint-disable-next-line no-null/no-null
-    return typeof value === 'object' && value !== null;
-}
-
-export function isUndefined(value: unknown): value is undefined {
-    return typeof value === 'undefined';
-}