Update dependencies, remove @proposed (#931)

microsoft · May 10, 2022 · 7cec6fc · 7cec6fc
1 parent db25e42
commit 7cec6fc
Show file tree

Hide file tree

Showing 28 changed files with 767 additions and 1,658 deletions.
diff --git a/client-node-tests/package-lock.json b/client-node-tests/package-lock.json
diff --git a/client-node-tests/package.json b/client-node-tests/package.json
@@ -37,7 +37,7 @@
 		"@types/minimatch": "^3.0.5",
 		"@types/sinon": "^10.0.2",
 		"@types/uuid": "^8.3.1",
-		"@types/vscode": "1.66.0",
+		"@types/vscode": "1.67.0",
 		"glob": "^7.1.7",
 		"sinon": "^11.1.2",
 		"uuid": "^8.3.2",

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -25,7 +25,7 @@
 	"devDependencies": {
 		"@types/minimatch": "^3.0.5",
 		"@types/semver": "^7.3.8",
-		"@types/vscode": "1.66.0",
+		"@types/vscode": "1.67.0",
 		"shx": "^0.3.3"
 	},
 	"dependencies": {

diff --git a/client/src/common/codeConverter.ts b/client/src/common/codeConverter.ts
@@ -78,7 +78,7 @@ export interface Converter {
 	asPosition(value: code.Position): proto.Position;
 	asPosition(value: code.Position | undefined | null): proto.Position | undefined | null;
 
-	asPositions(value: code.Position[], token?: code.CancellationToken): Promise<proto.Position[]>;
+	asPositions(value: readonly code.Position[], token?: code.CancellationToken): Promise<proto.Position[]>;
 
 	asRange(value: null): null;
 	asRange(value: undefined): undefined;
@@ -415,7 +415,7 @@ export function createConverter(uriConverter?: URIConverter): Converter {
 		return { line: value.line > proto.uinteger.MAX_VALUE ? proto.uinteger.MAX_VALUE : value.line, character: value.character > proto.uinteger.MAX_VALUE ? proto.uinteger.MAX_VALUE : value.character };
 	}
 
-	function asPositions(value: code.Position[], token?: code.CancellationToken): Promise<proto.Position[]> {
+	function asPositions(value: readonly code.Position[], token?: code.CancellationToken): Promise<proto.Position[]> {
 		return async.map(value, (asPosition as (item: code.Position) => proto.Position), token);
 	}
 

diff --git a/client/src/common/diagnostic.ts b/client/src/common/diagnostic.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.
  * ------------------------------------------------------------------------------------------ */
-/// <reference path="../../typings/vscode.proposed.tabs.d.ts" />
 
 import * as minimatch from 'minimatch';
 

diff --git a/client/src/common/notebook.ts b/client/src/common/notebook.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.
  * ------------------------------------------------------------------------------------------ */
-/// <reference path="../../typings/vscode.proposed.notebookDocumentEvents.d.ts" />
 
 import * as vscode from 'vscode';
 import * as minimatch from 'minimatch';

diff --git a/client/src/common/selectionRange.ts b/client/src/common/selectionRange.ts
@@ -13,11 +13,11 @@ import {
 import { TextDocumentLanguageFeature, FeatureClient, ensure } from './features';
 
 export interface ProvideSelectionRangeSignature {
-	(this: void, document: TextDocument, positions: VPosition[], token: CancellationToken): ProviderResult<VSelectionRange[]>;
+	(this: void, document: TextDocument, positions: readonly VPosition[], token: CancellationToken): ProviderResult<VSelectionRange[]>;
 }
 
 export interface SelectionRangeProviderMiddleware {
-	provideSelectionRanges?: (this: void, document: TextDocument, positions: VPosition[], token: CancellationToken, next: ProvideSelectionRangeSignature) => ProviderResult<VSelectionRange[]>;
+	provideSelectionRanges?: (this: void, document: TextDocument, positions: readonly VPosition[], token: CancellationToken, next: ProvideSelectionRangeSignature) => ProviderResult<VSelectionRange[]>;
 }
 
 export class SelectionRangeFeature extends TextDocumentLanguageFeature<boolean | SelectionRangeOptions, SelectionRangeRegistrationOptions, SelectionRangeProvider, SelectionRangeProviderMiddleware> {

diff --git a/client/src/common/typeHierarchy.ts b/client/src/common/typeHierarchy.ts
@@ -22,7 +22,6 @@ export type TypeHierarchySubtypesSignature = (this: void, item: VTypeHierarchyIt
  * Type hierarchy middleware
  *
  * @since 3.17.0
- * @proposed
  */
 export type TypeHierarchyMiddleware = {
 	prepareTypeHierarchy?: (this: void, document: TextDocument, positions: VPosition, token: CancellationToken, next: PrepareTypeHierarchySignature) => ProviderResult<VTypeHierarchyItem[]>;

diff --git a/client/src/node/main.ts b/client/src/node/main.ts
@@ -213,14 +213,16 @@ export class LanguageClient extends BaseLanguageClient {
 	}
 
 	private checkProcessDied(childProcess: ChildProcess | undefined): void {
-		if (!childProcess) {
+		if (!childProcess || childProcess.pid === undefined) {
 			return;
 		}
 		setTimeout(() => {
 			// Test if the process is still alive. Throws an exception if not
 			try {
-				process.kill(childProcess.pid, <any>0);
-				terminate(childProcess);
+				if (childProcess.pid !== undefined) {
+					process.kill(childProcess.pid, <any>0);
+					terminate(childProcess as (ChildProcess & { pid: number }));
+				}
 			} catch (error) {
 				// All is fine.
 			}

diff --git a/client/src/node/processes.ts b/client/src/node/processes.ts
@@ -11,7 +11,7 @@ import { join } from 'path';
 const isWindows = (process.platform === 'win32');
 const isMacintosh = (process.platform === 'darwin');
 const isLinux = (process.platform === 'linux');
-export function terminate(process: ChildProcess, cwd?: string): boolean {
+export function terminate(process: ChildProcess & { pid: number }, cwd?: string): boolean {
 	if (isWindows) {
 		try {
 			// This we run in Atom execFileSync is available.

diff --git a/client/typings/vscode.proposed.notebookDocumentEvents.d.ts b/client/typings/vscode.proposed.notebookDocumentEvents.d.ts