Skip to content

Commit f57d064

Browse files
committed
Removes unneeded @GATE call unneeded custom resolver
1 parent 59ce94f commit f57d064

File tree

3 files changed

+20
-25
lines changed

3 files changed

+20
-25
lines changed

src/system/decorators/resolver.ts

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@ import { isTag } from '../../git/models/tag';
66
import { isViewNode } from '../../views/nodes/abstract/viewNode';
77

88
function replacer(key: string, value: any): any {
9-
if (key === '') return value;
10-
11-
if (value == null) return value;
12-
if (typeof value !== 'object') return value;
9+
if (key === '' || value == null || typeof value !== 'object') return value;
1310

1411
if (value instanceof Error) return String(value);
1512
if (value instanceof Uri) {
16-
if ('sha' in (value as any) && (value as any).sha) {
17-
return `${(value as any).sha}:${value.toString()}`;
13+
if ('sha' in value && typeof value.sha === 'string' && value.sha) {
14+
return `${value.sha}:${value.toString()}`;
1815
}
1916
return value.toString();
2017
}
@@ -28,37 +25,36 @@ function replacer(key: string, value: any): any {
2825

2926
export function defaultResolver(...args: any[]): string {
3027
if (args.length === 0) return '';
31-
if (args.length !== 1) {
32-
return JSON.stringify(args, replacer);
33-
}
28+
if (args.length > 1) return JSON.stringify(args, replacer);
29+
30+
const [arg] = args;
31+
if (arg == null) return '';
3432

35-
const arg0 = args[0];
36-
if (arg0 == null) return '';
37-
switch (typeof arg0) {
33+
switch (typeof arg) {
3834
case 'string':
39-
return arg0;
35+
return arg;
4036

4137
case 'number':
4238
case 'boolean':
4339
case 'undefined':
4440
case 'symbol':
4541
case 'bigint':
46-
return String(arg0);
42+
return String(arg);
4743

4844
default:
49-
if (arg0 instanceof Error) return String(arg0);
50-
if (arg0 instanceof Uri) {
51-
if ('sha' in arg0 && typeof arg0.sha === 'string' && arg0.sha) {
52-
return `${arg0.sha}:${arg0.toString()}`;
45+
if (arg instanceof Error) return String(arg);
46+
if (arg instanceof Uri) {
47+
if ('sha' in arg && typeof arg.sha === 'string' && arg.sha) {
48+
return `${arg.sha}:${arg.toString()}`;
5349
}
54-
return arg0.toString();
50+
return arg.toString();
5551
}
56-
if (isBranch(arg0) || isCommit(arg0) || isTag(arg0) || isViewNode(arg0)) {
57-
return arg0.toString();
52+
if (isBranch(arg) || isCommit(arg) || isTag(arg) || isViewNode(arg)) {
53+
return arg.toString();
5854
}
59-
if (isContainer(arg0)) return '<container>';
55+
if (isContainer(arg)) return '<container>';
6056

61-
return JSON.stringify(arg0, replacer);
57+
return JSON.stringify(arg, replacer);
6258
}
6359
}
6460

src/views/nodes/abstract/subscribeableViewNode.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ export abstract class SubscribeableViewNode<
5757
this.disposable?.dispose();
5858
}
5959

60-
@gate<ViewNode['triggerChange']>((reset, force) => `${reset}|${force}`)
6160
@debug()
6261
override async triggerChange(reset: boolean = false, force: boolean = false): Promise<void> {
6362
if (!this.loaded || this._disposed) return;

src/views/nodes/abstract/viewNode.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ export abstract class ViewNode<
285285

286286
refresh?(reset?: boolean): boolean | void | Promise<void> | Promise<boolean>;
287287

288-
@gate<ViewNode['triggerChange']>((reset, force, avoidSelf) => `${reset}|${force}|${avoidSelf?.toString()}`)
288+
@gate()
289289
@debug()
290290
triggerChange(reset: boolean = false, force: boolean = false, avoidSelf?: ViewNode): Promise<void> {
291291
if (this._disposed) return Promise.resolve();

0 commit comments

Comments
 (0)