From 13a88a8da4142e1c528fb701223603772eeafd2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20B=C3=A4umer?= Date: Wed, 10 Apr 2024 12:03:56 +0200 Subject: [PATCH] Fixes #208581: ESLint and .vscode/extensions is tricky to configure (#210031) --- .eslintignore | 1 + .../src/coverageProvider.ts | 7 +++--- .../src/debounce.ts | 7 +++--- .../src/extension.ts | 7 +++--- .../src/failingDeepStrictEqualAssertFixer.ts | 23 ++++++++++--------- .../src/memoize.ts | 7 +++--- .../src/metadata.ts | 7 +++--- .../src/snapshot.ts | 7 +++--- .../src/sourceUtils.ts | 7 +++--- .../src/testOutputScanner.ts | 7 +++--- .../src/testTree.ts | 13 ++++++----- .../src/vscodeTestRunner.ts | 7 +++--- 12 files changed, 56 insertions(+), 44 deletions(-) diff --git a/.eslintignore b/.eslintignore index 7bbd3778e90..12da4a432e1 100644 --- a/.eslintignore +++ b/.eslintignore @@ -33,3 +33,4 @@ **/test/unit/assert.js **/test/automation/out/** **/typings/** +!.vscode diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/coverageProvider.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/coverageProvider.ts index 1a891523655..16fa7843336 100644 --- a/.vscode/extensions/vscode-selfhost-test-provider/src/coverageProvider.ts +++ b/.vscode/extensions/vscode-selfhost-test-provider/src/coverageProvider.ts @@ -1,6 +1,7 @@ -/*--------------------------------------------------------- - * Copyright (C) Microsoft Corporation. All rights reserved. - *--------------------------------------------------------*/ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ import { IstanbulCoverageContext } from 'istanbul-to-vscode'; diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/debounce.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/debounce.ts index 2d2f0ba1bf4..fd5c087c074 100644 --- a/.vscode/extensions/vscode-selfhost-test-provider/src/debounce.ts +++ b/.vscode/extensions/vscode-selfhost-test-provider/src/debounce.ts @@ -1,6 +1,7 @@ -/*--------------------------------------------------------- - * Copyright (C) Microsoft Corporation. All rights reserved. - *--------------------------------------------------------*/ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ /** * Debounces the function call for an interval. diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/extension.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/extension.ts index b7269def2e7..b4fa3310545 100644 --- a/.vscode/extensions/vscode-selfhost-test-provider/src/extension.ts +++ b/.vscode/extensions/vscode-selfhost-test-provider/src/extension.ts @@ -1,6 +1,7 @@ -/*--------------------------------------------------------- - * Copyright (C) Microsoft Corporation. All rights reserved. - *--------------------------------------------------------*/ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ import { randomBytes } from 'crypto'; import { tmpdir } from 'os'; diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/failingDeepStrictEqualAssertFixer.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/failingDeepStrictEqualAssertFixer.ts index c6236c18402..b0494471f29 100644 --- a/.vscode/extensions/vscode-selfhost-test-provider/src/failingDeepStrictEqualAssertFixer.ts +++ b/.vscode/extensions/vscode-selfhost-test-provider/src/failingDeepStrictEqualAssertFixer.ts @@ -1,6 +1,7 @@ -/*--------------------------------------------------------- - * Copyright (C) Microsoft Corporation. All rights reserved. - *--------------------------------------------------------*/ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ import * as ts from 'typescript'; import { @@ -98,15 +99,15 @@ const formatJsonValue = (value: unknown) => { context => (node: ts.Node) => { const visitor = (node: ts.Node): ts.Node => ts.isPropertyAssignment(node) && - ts.isStringLiteralLike(node.name) && - identifierLikeRe.test(node.name.text) + ts.isStringLiteralLike(node.name) && + identifierLikeRe.test(node.name.text) ? ts.factory.createPropertyAssignment( - ts.factory.createIdentifier(node.name.text), - ts.visitNode(node.initializer, visitor) as ts.Expression - ) + ts.factory.createIdentifier(node.name.text), + ts.visitNode(node.initializer, visitor) as ts.Expression + ) : ts.isStringLiteralLike(node) && node.text === '[undefined]' - ? ts.factory.createIdentifier('undefined') - : ts.visitEachChild(node, visitor, context); + ? ts.factory.createIdentifier('undefined') + : ts.visitEachChild(node, visitor, context); return ts.visitNode(node, visitor); }, @@ -189,7 +190,7 @@ class StrictEqualAssertion { return undefined; } - constructor(private readonly expression: ts.CallExpression) {} + constructor(private readonly expression: ts.CallExpression) { } /** Gets the expected value */ public get expectedValue(): ts.Expression | undefined { diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/memoize.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/memoize.ts index f655f58f62a..52c2aa2c98f 100644 --- a/.vscode/extensions/vscode-selfhost-test-provider/src/memoize.ts +++ b/.vscode/extensions/vscode-selfhost-test-provider/src/memoize.ts @@ -1,6 +1,7 @@ -/*--------------------------------------------------------- - * Copyright (C) Microsoft Corporation. All rights reserved. - *--------------------------------------------------------*/ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ export const memoizeLast = (fn: (args: A) => T): ((args: A) => T) => { let last: { arg: A; result: T } | undefined; diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/metadata.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/metadata.ts index 0c03614b8bb..08540b14fbf 100644 --- a/.vscode/extensions/vscode-selfhost-test-provider/src/metadata.ts +++ b/.vscode/extensions/vscode-selfhost-test-provider/src/metadata.ts @@ -1,6 +1,7 @@ -/*--------------------------------------------------------- - * Copyright (C) Microsoft Corporation. All rights reserved. - *--------------------------------------------------------*/ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ import { TestMessage } from 'vscode'; export interface TestMessageMetadata { diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/snapshot.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/snapshot.ts index f6936094c22..33fbc8fa8bb 100644 --- a/.vscode/extensions/vscode-selfhost-test-provider/src/snapshot.ts +++ b/.vscode/extensions/vscode-selfhost-test-provider/src/snapshot.ts @@ -1,6 +1,7 @@ -/*--------------------------------------------------------- - * Copyright (C) Microsoft Corporation. All rights reserved. - *--------------------------------------------------------*/ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ import { promises as fs } from 'fs'; import * as vscode from 'vscode'; diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/sourceUtils.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/sourceUtils.ts index 334b39f0aa3..944d3bc6f6d 100644 --- a/.vscode/extensions/vscode-selfhost-test-provider/src/sourceUtils.ts +++ b/.vscode/extensions/vscode-selfhost-test-provider/src/sourceUtils.ts @@ -1,6 +1,7 @@ -/*--------------------------------------------------------- - * Copyright (C) Microsoft Corporation. All rights reserved. - *--------------------------------------------------------*/ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ import * as ts from 'typescript'; import * as vscode from 'vscode'; diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/testOutputScanner.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/testOutputScanner.ts index 8b8de4dc8cc..dbf0f64ea71 100644 --- a/.vscode/extensions/vscode-selfhost-test-provider/src/testOutputScanner.ts +++ b/.vscode/extensions/vscode-selfhost-test-provider/src/testOutputScanner.ts @@ -1,6 +1,7 @@ -/*--------------------------------------------------------- - * Copyright (C) Microsoft Corporation. All rights reserved. - *--------------------------------------------------------*/ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ import { GREATEST_LOWER_BOUND, diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/testTree.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/testTree.ts index 453740535a3..6ecfb8bc07f 100644 --- a/.vscode/extensions/vscode-selfhost-test-provider/src/testTree.ts +++ b/.vscode/extensions/vscode-selfhost-test-provider/src/testTree.ts @@ -1,6 +1,7 @@ -/*--------------------------------------------------------- - * Copyright (C) Microsoft Corporation. All rights reserved. - *--------------------------------------------------------*/ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ import { join, relative } from 'path'; import * as ts from 'typescript'; @@ -57,7 +58,7 @@ export class TestFile { constructor( public readonly uri: vscode.Uri, public readonly workspaceFolder: vscode.WorkspaceFolder - ) {} + ) { } public getId() { return this.uri.toString().toLowerCase(); @@ -168,8 +169,8 @@ export abstract class TestConstruct { } } -export class TestSuite extends TestConstruct {} +export class TestSuite extends TestConstruct { } -export class TestCase extends TestConstruct {} +export class TestCase extends TestConstruct { } export type VSCodeTest = TestFile | TestSuite | TestCase; diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/vscodeTestRunner.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/vscodeTestRunner.ts index 3870be367ed..e8c36118c65 100644 --- a/.vscode/extensions/vscode-selfhost-test-provider/src/vscodeTestRunner.ts +++ b/.vscode/extensions/vscode-selfhost-test-provider/src/vscodeTestRunner.ts @@ -1,6 +1,7 @@ -/*--------------------------------------------------------- - * Copyright (C) Microsoft Corporation. All rights reserved. - *--------------------------------------------------------*/ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ import { spawn } from 'child_process'; import { promises as fs } from 'fs';