From c880c618b131484a756b2ffe074d7af4d14a2782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20B=C3=A4umer?= Date: Wed, 13 Sep 2023 01:21:26 +0200 Subject: [PATCH] Move to vscode version 1.82 (#1312) --- client-node-tests/package-lock.json | 8 ++--- client-node-tests/package.json | 2 +- client/package-lock.json | 8 ++--- client/package.json | 4 +-- client/src/common/formatting.ts | 1 - client/src/node/main.ts | 2 +- .../vscode.proposed.formatMultipleRanges.d.ts | 29 ------------------- 7 files changed, 12 insertions(+), 42 deletions(-) delete mode 100644 client/typings/vscode.proposed.formatMultipleRanges.d.ts diff --git a/client-node-tests/package-lock.json b/client-node-tests/package-lock.json index 66ab2cfe7..96a508573 100644 --- a/client-node-tests/package-lock.json +++ b/client-node-tests/package-lock.json @@ -17,7 +17,7 @@ "@types/minimatch": "^3.0.5", "@types/sinon": "^10.0.2", "@types/uuid": "^8.3.1", - "@types/vscode": "1.79.0", + "@types/vscode": "1.82.0", "find-process": "^1.4.7", "glob": "^7.1.7", "sinon": "^11.1.2", @@ -125,9 +125,9 @@ "dev": true }, "node_modules/@types/vscode": { - "version": "1.79.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.79.0.tgz", - "integrity": "sha512-Tfowu2rSW8hVGbqzQLSPlOEiIOYYryTkgJ+chMecpYiJcnw9n0essvSiclnK+Qh/TcSVJHgaK4EMrQDZjZJ/Sw==", + "version": "1.82.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.82.0.tgz", + "integrity": "sha512-VSHV+VnpF8DEm8LNrn8OJ8VuUNcBzN3tMvKrNpbhhfuVjFm82+6v44AbDhLvVFgCzn6vs94EJNTp7w8S6+Q1Rw==", "dev": true }, "node_modules/agent-base": { diff --git a/client-node-tests/package.json b/client-node-tests/package.json index 28fcaa770..66e7390c1 100644 --- a/client-node-tests/package.json +++ b/client-node-tests/package.json @@ -38,7 +38,7 @@ "@types/minimatch": "^3.0.5", "@types/sinon": "^10.0.2", "@types/uuid": "^8.3.1", - "@types/vscode": "1.79.0", + "@types/vscode": "1.82.0", "find-process": "^1.4.7", "glob": "^7.1.7", "sinon": "^11.1.2", diff --git a/client/package-lock.json b/client/package-lock.json index 319438f72..b4a762f66 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -16,7 +16,7 @@ "devDependencies": { "@types/minimatch": "^3.0.5", "@types/semver": "^7.3.10", - "@types/vscode": "1.79.0", + "@types/vscode": "1.82.0", "shx": "^0.3.4" }, "engines": { @@ -36,9 +36,9 @@ "dev": true }, "node_modules/@types/vscode": { - "version": "1.79.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.79.0.tgz", - "integrity": "sha512-Tfowu2rSW8hVGbqzQLSPlOEiIOYYryTkgJ+chMecpYiJcnw9n0essvSiclnK+Qh/TcSVJHgaK4EMrQDZjZJ/Sw==", + "version": "1.82.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.82.0.tgz", + "integrity": "sha512-VSHV+VnpF8DEm8LNrn8OJ8VuUNcBzN3tMvKrNpbhhfuVjFm82+6v44AbDhLvVFgCzn6vs94EJNTp7w8S6+Q1Rw==", "dev": true }, "node_modules/balanced-match": { diff --git a/client/package.json b/client/package.json index c4e813daa..320f9653f 100644 --- a/client/package.json +++ b/client/package.json @@ -5,7 +5,7 @@ "author": "Microsoft Corporation", "license": "MIT", "engines": { - "vscode": "^1.79.0" + "vscode": "^1.82.0" }, "repository": { "type": "git", @@ -24,7 +24,7 @@ "devDependencies": { "@types/minimatch": "^3.0.5", "@types/semver": "^7.3.10", - "@types/vscode": "1.79.0", + "@types/vscode": "1.82.0", "shx": "^0.3.4" }, "dependencies": { diff --git a/client/src/common/formatting.ts b/client/src/common/formatting.ts index 5a56d7a34..fb1d35543 100644 --- a/client/src/common/formatting.ts +++ b/client/src/common/formatting.ts @@ -2,7 +2,6 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ -/// import { languages as Languages, Disposable, TextDocument, ProviderResult, Range as VRange, Position as VPosition, TextEdit as VTextEdit, FormattingOptions as VFormattingOptions, diff --git a/client/src/node/main.ts b/client/src/node/main.ts index 859e0cea5..e021ee412 100644 --- a/client/src/node/main.ts +++ b/client/src/node/main.ts @@ -23,7 +23,7 @@ import semverSatisfies = require('semver/functions/satisfies'); export * from 'vscode-languageserver-protocol/node'; export * from '../common/api'; -const REQUIRED_VSCODE_VERSION = '^1.78.0'; // do not change format, updated by `updateVSCode` script +const REQUIRED_VSCODE_VERSION = '^1.82.0'; // do not change format, updated by `updateVSCode` script export enum TransportKind { stdio, diff --git a/client/typings/vscode.proposed.formatMultipleRanges.d.ts b/client/typings/vscode.proposed.formatMultipleRanges.d.ts deleted file mode 100644 index 702bc14b4..000000000 --- a/client/typings/vscode.proposed.formatMultipleRanges.d.ts +++ /dev/null @@ -1,29 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -declare module 'vscode' { - - // https://github.com/microsoft/vscode/issues/158776 - - - export interface DocumentRangeFormattingEditProvider { - - /** - * Provide formatting edits for multiple ranges in a document. - * - * The given ranges are hints and providers can decide to format a smaller - * or larger range. Often this is done by adjusting the start and end - * of the range to full syntax nodes. - * - * @param document The document in which the command was invoked. - * @param ranges The ranges which should be formatted. - * @param options Options controlling formatting. - * @param token A cancellation token. - * @return A set of text edits or a thenable that resolves to such. The lack of a result can be - * signaled by returning `undefined`, `null`, or an empty array. - */ - provideDocumentRangesFormattingEdits?(document: TextDocument, ranges: Range[], options: FormattingOptions, token: CancellationToken): ProviderResult; - } -}