Fixes logging issue

Improves getLoggableName to include @logname decorator

Author: eamodio

src/git/models/repository.ts

@@ -392,7 +392,7 @@ export class Repository implements Disposable {
 	}
 
 	toString(): string {
-		return `${getLoggableName(this)}(${this.id})`;
+		return getLoggableName(this);
 	}
 
 	get virtual(): boolean {

src/system/decorators/log.ts

@@ -109,10 +109,7 @@ export function log<T extends (...arg: any) => any>(options?: LogOptions<T>, deb
 
 			const scopeId = logScopeIdGenerator.next();
 
-			const instanceName =
-				this != null
-					? this.constructor?.[LogInstanceNameFn]?.(this, getLoggableName(this)) ?? getLoggableName(this)
-					: undefined;
+			const instanceName = this != null ? getLoggableName(this) : undefined;
 
 			let prefix = instanceName
 				? scoped

src/system/logger.ts

@@ -1,3 +1,4 @@
+import { LogInstanceNameFn } from './decorators/log';
 import type { LogLevel } from './logger.constants';
 import type { LogScope } from './logger.scope';
 
@@ -272,18 +273,26 @@ function toOrderedLevel(logLevel: LogLevel): OrderedLevel {
 }
 
 export function getLoggableName(instance: Function | object) {
-	let name: string;
+	let ctor;
 	if (typeof instance === 'function') {
 		if (instance.prototype?.constructor == null) return instance.name;
 
-		name = instance.prototype.constructor.name ?? '';
+		ctor = instance.prototype.constructor;
 	} else {
-		name = instance.constructor?.name ?? '';
+		ctor = instance.constructor;
 	}
 
+	let name: string = ctor?.name ?? '';
+
 	// Strip webpack module name (since I never name classes with an _)
 	const index = name.indexOf('_');
-	return index === -1 ? name : name.substr(index + 1);
+	name = index === -1 ? name : name.substr(index + 1);
+
+	if (ctor?.[LogInstanceNameFn] != null) {
+		name = ctor[LogInstanceNameFn](instance, name);
+	}
+
+	return name;
 }
 
 export interface LogProvider {

src/views/nodes/abstract/viewNode.ts

@@ -278,8 +278,7 @@ export abstract class ViewNode<
 	toClipboard?(type?: ClipboardType): string | Promise<string>;
 
 	toString(): string {
-		const id = this.id;
-		return `${getLoggableName(this)}${id != null ? `(${id})` : ''}`;
+		return getLoggableName(this);
 	}
 
 	protected _uri: GitUri;

src/webviews/webviewController.ts

@@ -9,7 +9,7 @@ import { setContext } from '../system/context';
 import { getScopedCounter } from '../system/counter';
 import { debug, logName } from '../system/decorators/log';
 import { serialize } from '../system/decorators/serialize';
-import { Logger } from '../system/logger';
+import { getLoggableName, Logger } from '../system/logger';
 import { getLogScope, getNewLogScope, setLogScopeExit } from '../system/logger.scope';
 import { isPromise } from '../system/promise';
 import { maybeStopWatch } from '../system/stopwatch';
@@ -512,12 +512,13 @@ export class WebviewController<
 	): Promise<boolean> {
 		let packed;
 		if (notificationType.pack && params != null) {
-			const scope = getLogScope();
-
-			const sw = maybeStopWatch(getNewLogScope(` serializing msg=${notificationType.method}`, scope), {
-				log: false,
-				logLevel: 'debug',
-			});
+			const sw = maybeStopWatch(
+				getNewLogScope(`${getLoggableName(this)}.notify serializing msg=${notificationType.method}`),
+				{
+					log: false,
+					logLevel: 'debug',
+				},
+			);
 			packed = utf8TextEncoder.encode(JSON.stringify(params));
 			sw?.stop();
 		}