Skip to content

Commit 7cec6fc

Browse files
authored
Update dependencies, remove @proposed (#931)
1 parent db25e42 commit 7cec6fc

28 files changed

Lines changed: 767 additions & 1658 deletions

client-node-tests/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-node-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"@types/minimatch": "^3.0.5",
3838
"@types/sinon": "^10.0.2",
3939
"@types/uuid": "^8.3.1",
40-
"@types/vscode": "1.66.0",
40+
"@types/vscode": "1.67.0",
4141
"glob": "^7.1.7",
4242
"sinon": "^11.1.2",
4343
"uuid": "^8.3.2",

client/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"devDependencies": {
2626
"@types/minimatch": "^3.0.5",
2727
"@types/semver": "^7.3.8",
28-
"@types/vscode": "1.66.0",
28+
"@types/vscode": "1.67.0",
2929
"shx": "^0.3.3"
3030
},
3131
"dependencies": {

client/src/common/codeConverter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export interface Converter {
7878
asPosition(value: code.Position): proto.Position;
7979
asPosition(value: code.Position | undefined | null): proto.Position | undefined | null;
8080

81-
asPositions(value: code.Position[], token?: code.CancellationToken): Promise<proto.Position[]>;
81+
asPositions(value: readonly code.Position[], token?: code.CancellationToken): Promise<proto.Position[]>;
8282

8383
asRange(value: null): null;
8484
asRange(value: undefined): undefined;
@@ -415,7 +415,7 @@ export function createConverter(uriConverter?: URIConverter): Converter {
415415
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 };
416416
}
417417

418-
function asPositions(value: code.Position[], token?: code.CancellationToken): Promise<proto.Position[]> {
418+
function asPositions(value: readonly code.Position[], token?: code.CancellationToken): Promise<proto.Position[]> {
419419
return async.map(value, (asPosition as (item: code.Position) => proto.Position), token);
420420
}
421421

client/src/common/diagnostic.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
* Copyright (c) Microsoft Corporation. All rights reserved.
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
* ------------------------------------------------------------------------------------------ */
5-
/// <reference path="../../typings/vscode.proposed.tabs.d.ts" />
65

76
import * as minimatch from 'minimatch';
87

client/src/common/notebook.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
* Copyright (c) Microsoft Corporation. All rights reserved.
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
* ------------------------------------------------------------------------------------------ */
5-
/// <reference path="../../typings/vscode.proposed.notebookDocumentEvents.d.ts" />
65

76
import * as vscode from 'vscode';
87
import * as minimatch from 'minimatch';

client/src/common/selectionRange.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import {
1313
import { TextDocumentLanguageFeature, FeatureClient, ensure } from './features';
1414

1515
export interface ProvideSelectionRangeSignature {
16-
(this: void, document: TextDocument, positions: VPosition[], token: CancellationToken): ProviderResult<VSelectionRange[]>;
16+
(this: void, document: TextDocument, positions: readonly VPosition[], token: CancellationToken): ProviderResult<VSelectionRange[]>;
1717
}
1818

1919
export interface SelectionRangeProviderMiddleware {
20-
provideSelectionRanges?: (this: void, document: TextDocument, positions: VPosition[], token: CancellationToken, next: ProvideSelectionRangeSignature) => ProviderResult<VSelectionRange[]>;
20+
provideSelectionRanges?: (this: void, document: TextDocument, positions: readonly VPosition[], token: CancellationToken, next: ProvideSelectionRangeSignature) => ProviderResult<VSelectionRange[]>;
2121
}
2222

2323
export class SelectionRangeFeature extends TextDocumentLanguageFeature<boolean | SelectionRangeOptions, SelectionRangeRegistrationOptions, SelectionRangeProvider, SelectionRangeProviderMiddleware> {

client/src/common/typeHierarchy.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ export type TypeHierarchySubtypesSignature = (this: void, item: VTypeHierarchyIt
2222
* Type hierarchy middleware
2323
*
2424
* @since 3.17.0
25-
* @proposed
2625
*/
2726
export type TypeHierarchyMiddleware = {
2827
prepareTypeHierarchy?: (this: void, document: TextDocument, positions: VPosition, token: CancellationToken, next: PrepareTypeHierarchySignature) => ProviderResult<VTypeHierarchyItem[]>;

client/src/node/main.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,16 @@ export class LanguageClient extends BaseLanguageClient {
213213
}
214214

215215
private checkProcessDied(childProcess: ChildProcess | undefined): void {
216-
if (!childProcess) {
216+
if (!childProcess || childProcess.pid === undefined) {
217217
return;
218218
}
219219
setTimeout(() => {
220220
// Test if the process is still alive. Throws an exception if not
221221
try {
222-
process.kill(childProcess.pid, <any>0);
223-
terminate(childProcess);
222+
if (childProcess.pid !== undefined) {
223+
process.kill(childProcess.pid, <any>0);
224+
terminate(childProcess as (ChildProcess & { pid: number }));
225+
}
224226
} catch (error) {
225227
// All is fine.
226228
}

0 commit comments

Comments
 (0)