Merge branch 'main' into tyriar/258480

Author: Tyriar

extensions/git-base/src/decorators.ts

@@ -48,22 +48,10 @@ function _throttle<T>(fn: Function, key: string): Function {
 }
 
 function decorate(decorator: (fn: Function, key: string) => Function): Function {
-	return (_target: any, key: string, descriptor: any) => {
-		let fnKey: string | null = null;
-		let fn: Function | null = null;
-
-		if (typeof descriptor.value === 'function') {
-			fnKey = 'value';
-			fn = descriptor.value;
-		} else if (typeof descriptor.get === 'function') {
-			fnKey = 'get';
-			fn = descriptor.get;
-		}
-
-		if (!fn || !fnKey) {
+	return function (original: any, context: ClassMethodDecoratorContext) {
+		if (context.kind !== 'method') {
 			throw new Error('not supported');
 		}
-
-		descriptor[fnKey] = decorator(fn, key);
+		return decorator(original, context.name.toString());
 	};
 }

extensions/git-base/tsconfig.json

@@ -2,7 +2,6 @@
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
-		"experimentalDecorators": true,
 		"typeRoots": [
 			"./node_modules/@types"
 		]

extensions/git/src/api/extension.ts

@@ -8,15 +8,15 @@ import { GitExtension, Repository, API } from './git';
 import { ApiRepository, ApiImpl } from './api1';
 import { Event, EventEmitter } from 'vscode';
 
-export function deprecated(_target: any, key: string, descriptor: any): void {
-	if (typeof descriptor.value !== 'function') {
+function deprecated(original: any, context: ClassMemberDecoratorContext) {
+	if (context.kind !== 'method') {
 		throw new Error('not supported');
 	}
 
-	const fn = descriptor.value;
-	descriptor.value = function () {
+	const key = context.name.toString();
+	return function (this: any, ...args: any[]): any {
 		console.warn(`Git extension API method '${key}' is deprecated.`);
-		return fn.apply(this, arguments);
+		return original.apply(this, args);
 	};
 }
 

extensions/git/src/commands.ts

@@ -363,12 +363,12 @@ interface ScmCommand {
 const Commands: ScmCommand[] = [];
 
 function command(commandId: string, options: ScmCommandOptions = {}): Function {
-	return (_target: any, key: string, descriptor: any) => {
-		if (!(typeof descriptor.value === 'function')) {
+	return (value: any, context: ClassMethodDecoratorContext) => {
+		if (context.kind !== 'method') {
 			throw new Error('not supported');
 		}
-
-		Commands.push({ commandId, key, method: descriptor.value, options });
+		const key = context.name.toString();
+		Commands.push({ commandId, key, method: value, options });
 	};
 }
 

extensions/git/src/decorators.ts

@@ -6,23 +6,11 @@
 import { done } from './util';
 
 function decorate(decorator: (fn: Function, key: string) => Function): Function {
-	return (_target: any, key: string, descriptor: any) => {
-		let fnKey: string | null = null;
-		let fn: Function | null = null;
-
-		if (typeof descriptor.value === 'function') {
-			fnKey = 'value';
-			fn = descriptor.value;
-		} else if (typeof descriptor.get === 'function') {
-			fnKey = 'get';
-			fn = descriptor.get;
+	return function (original: any, context: ClassMethodDecoratorContext) {
+		if (context.kind === 'method' || context.kind === 'getter' || context.kind === 'setter') {
+			return decorator(original, context.name.toString());
 		}
-
-		if (!fn || !fnKey) {
-			throw new Error('not supported');
-		}
-
-		descriptor[fnKey] = decorator(fn, key);
+		throw new Error('not supported');
 	};
 }
 

extensions/git/tsconfig.json

@@ -2,7 +2,6 @@
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
-		"experimentalDecorators": true,
 		"typeRoots": [
 			"./node_modules/@types"
 		]

extensions/github-authentication/tsconfig.json

@@ -2,7 +2,6 @@
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
-		"experimentalDecorators": true,
 		"typeRoots": [
 			"./node_modules/@types"
 		],

extensions/github/src/util.ts

@@ -24,23 +24,11 @@ export class DisposableStore {
 }
 
 function decorate(decorator: (fn: Function, key: string) => Function): Function {
-	return (_target: any, key: string, descriptor: any) => {
-		let fnKey: string | null = null;
-		let fn: Function | null = null;
-
-		if (typeof descriptor.value === 'function') {
-			fnKey = 'value';
-			fn = descriptor.value;
-		} else if (typeof descriptor.get === 'function') {
-			fnKey = 'get';
-			fn = descriptor.get;
+	return function (original: any, context: ClassMethodDecoratorContext) {
+		if (context.kind === 'method' || context.kind === 'getter' || context.kind === 'setter') {
+			return decorator(original, context.name.toString());
 		}
-
-		if (!fn || !fnKey) {
-			throw new Error('not supported');
-		}
-
-		descriptor[fnKey] = decorator(fn, key);
+		throw new Error('not supported');
 	};
 }
 

extensions/github/tsconfig.json

@@ -5,7 +5,6 @@
 		"moduleResolution": "NodeNext",
 		"outDir": "./out",
 		"skipLibCheck": true,
-		"experimentalDecorators": true,
 		"allowSyntheticDefaultImports": false,
 		"typeRoots": [
 			"./node_modules/@types"

extensions/microsoft-authentication/tsconfig.json

@@ -2,7 +2,6 @@
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"baseUrl": ".",
-		"experimentalDecorators": true,
 		"module": "commonjs",
 		"moduleResolution": "node",
 		"noFallthroughCasesInSwitch": true,