Skip to content

Commit df83274

Browse files
author
Alexander Eyers-Taylor
committed
Also upgrade jsonrpc
1 parent c9e87ef commit df83274

7 files changed

Lines changed: 32 additions & 52 deletions

File tree

‎extensions/ql-vscode/package-lock.json‎

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

‎extensions/ql-vscode/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,7 @@
12951295
"tree-kill": "~1.2.2",
12961296
"unzipper": "~0.10.5",
12971297
"vscode-extension-telemetry": "^0.1.6",
1298-
"vscode-jsonrpc": "^5.0.1",
1298+
"vscode-jsonrpc": "^8.0.2",
12991299
"vscode-languageclient": "^8.0.2",
13001300
"vscode-test-adapter-api": "~1.7.0",
13011301
"vscode-test-adapter-util": "~0.7.0",

‎extensions/ql-vscode/src/legacy-query-server/queryserver-client.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as fs from 'fs-extra';
33

44
import { DisposableObject } from '../pure/disposable-object';
55
import { CancellationToken, commands } from 'vscode';
6-
import { createMessageConnection, RequestType } from 'vscode-jsonrpc';
6+
import { createMessageConnection, RequestType } from 'vscode-jsonrpc/node';
77
import * as cli from '../cli';
88
import { QueryServerConfig } from '../config';
99
import { Logger, ProgressReporter } from '../logging';
@@ -201,7 +201,7 @@ export class QueryServerClient extends DisposableObject {
201201
return this.serverProcess!.child.pid || 0;
202202
}
203203

204-
async sendRequest<P, R, E, RO>(type: RequestType<WithProgressId<P>, R, E, RO>, parameter: P, token?: CancellationToken, progress?: (res: ProgressMessage) => void): Promise<R> {
204+
async sendRequest<P, R, E>(type: RequestType<WithProgressId<P>, R, E>, parameter: P, token?: CancellationToken, progress?: (res: ProgressMessage) => void): Promise<R> {
205205
const id = this.nextProgress++;
206206
this.progressCallbacks[id] = progress;
207207

‎extensions/ql-vscode/src/pure/legacy-messages.ts‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -977,77 +977,75 @@ export type ProgressMessage = shared.ProgressMessage;
977977
/**
978978
* Check a Ql query for errors without compiling it
979979
*/
980-
export const checkQuery = new rpc.RequestType<WithProgressId<CheckQueryParams>, CheckQueryResult, void, void>('compilation/checkQuery');
980+
export const checkQuery = new rpc.RequestType<WithProgressId<CheckQueryParams>, CheckQueryResult, void>('compilation/checkQuery');
981981
/**
982982
* Compile a Ql query into a qlo
983983
*/
984-
export const compileQuery = new rpc.RequestType<WithProgressId<CompileQueryParams>, CheckQueryResult, void, void>('compilation/compileQuery');
984+
export const compileQuery = new rpc.RequestType<WithProgressId<CompileQueryParams>, CheckQueryResult, void>('compilation/compileQuery');
985985
/**
986986
* Compile a dil query into a qlo
987987
*/
988-
export const compileDilQuery = new rpc.RequestType<WithProgressId<CompileDilParams>, CheckQueryResult, void, void>('compilation/compileDilQuery');
988+
export const compileDilQuery = new rpc.RequestType<WithProgressId<CompileDilParams>, CheckQueryResult, void>('compilation/compileDilQuery');
989989

990990

991991
/**
992992
* Check if there is a valid upgrade path between two dbschemes.
993993
*/
994-
export const checkUpgrade = new rpc.RequestType<WithProgressId<UpgradeParams>, CheckUpgradeResult, void, void>('compilation/checkUpgrade');
994+
export const checkUpgrade = new rpc.RequestType<WithProgressId<UpgradeParams>, CheckUpgradeResult, void>('compilation/checkUpgrade');
995995
/**
996996
* Compile an upgrade script to upgrade a dataset.
997997
*/
998-
export const compileUpgrade = new rpc.RequestType<WithProgressId<CompileUpgradeParams>, CompileUpgradeResult, void, void>('compilation/compileUpgrade');
998+
export const compileUpgrade = new rpc.RequestType<WithProgressId<CompileUpgradeParams>, CompileUpgradeResult, void>('compilation/compileUpgrade');
999999
/**
10001000
* Compile an upgrade script to upgrade a dataset.
10011001
*/
1002-
export const compileUpgradeSequence = new rpc.RequestType<WithProgressId<CompileUpgradeSequenceParams>, CompileUpgradeSequenceResult, void, void>('compilation/compileUpgradeSequence');
1002+
export const compileUpgradeSequence = new rpc.RequestType<WithProgressId<CompileUpgradeSequenceParams>, CompileUpgradeSequenceResult, void>('compilation/compileUpgradeSequence');
10031003

10041004
/**
10051005
* Start a new structured log in the evaluator, terminating the previous one if it exists
10061006
*/
1007-
export const startLog = new rpc.RequestType<WithProgressId<StartLogParams>, StartLogResult, void, void>('evaluation/startLog');
1007+
export const startLog = new rpc.RequestType<WithProgressId<StartLogParams>, StartLogResult, void>('evaluation/startLog');
10081008

10091009
/**
10101010
* Terminate a structured log in the evaluator. Is a no-op if we aren't logging to the given location
10111011
*/
1012-
export const endLog = new rpc.RequestType<WithProgressId<EndLogParams>, EndLogResult, void, void>('evaluation/endLog');
1012+
export const endLog = new rpc.RequestType<WithProgressId<EndLogParams>, EndLogResult, void>('evaluation/endLog');
10131013

10141014
/**
10151015
* Clear the cache of a dataset
10161016
*/
1017-
export const clearCache = new rpc.RequestType<WithProgressId<ClearCacheParams>, ClearCacheResult, void, void>('evaluation/clearCache');
1017+
export const clearCache = new rpc.RequestType<WithProgressId<ClearCacheParams>, ClearCacheResult, void>('evaluation/clearCache');
10181018
/**
10191019
* Trim the cache of a dataset
10201020
*/
1021-
export const trimCache = new rpc.RequestType<WithProgressId<TrimCacheParams>, ClearCacheResult, void, void>('evaluation/trimCache');
1021+
export const trimCache = new rpc.RequestType<WithProgressId<TrimCacheParams>, ClearCacheResult, void>('evaluation/trimCache');
10221022

10231023
/**
10241024
* Run some queries on a dataset
10251025
*/
1026-
export const runQueries = new rpc.RequestType<WithProgressId<EvaluateQueriesParams>, EvaluationComplete, void, void>('evaluation/runQueries');
1026+
export const runQueries = new rpc.RequestType<WithProgressId<EvaluateQueriesParams>, EvaluationComplete, void>('evaluation/runQueries');
10271027

10281028
/**
10291029
* Run upgrades on a dataset
10301030
*/
1031-
export const runUpgrade = new rpc.RequestType<WithProgressId<RunUpgradeParams>, RunUpgradeResult, void, void>('evaluation/runUpgrade');
1031+
export const runUpgrade = new rpc.RequestType<WithProgressId<RunUpgradeParams>, RunUpgradeResult, void>('evaluation/runUpgrade');
10321032

10331033
export const registerDatabases = new rpc.RequestType<
10341034
WithProgressId<RegisterDatabasesParams>,
10351035
RegisterDatabasesResult,
1036-
void,
10371036
void
10381037
>('evaluation/registerDatabases');
10391038

10401039
export const deregisterDatabases = new rpc.RequestType<
10411040
WithProgressId<DeregisterDatabasesParams>,
10421041
DeregisterDatabasesResult,
1043-
void,
10441042
void
10451043
>('evaluation/deregisterDatabases');
10461044

10471045
/**
10481046
* Request returned to the client to notify completion of a query.
10491047
* The full runQueries job is completed when all queries are acknowledged.
10501048
*/
1051-
export const completeQuery = new rpc.RequestType<EvaluationResult, Record<string, any>, void, void>('evaluation/queryCompleted');
1049+
export const completeQuery = new rpc.RequestType<EvaluationResult, Record<string, any>, void>('evaluation/queryCompleted');
10521050

10531051
export const progress = shared.progress;

‎extensions/ql-vscode/src/pure/messages-shared.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,4 @@ export interface ProgressMessage {
107107
/**
108108
* A notification that the progress has been changed.
109109
*/
110-
export const progress = new rpc.NotificationType<ProgressMessage, void>('ql/progressUpdated');
110+
export const progress = new rpc.NotificationType<ProgressMessage>('ql/progressUpdated');

‎extensions/ql-vscode/src/pure/new-messages.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,41 +171,38 @@ export type ProgressMessage = shared.ProgressMessage;
171171
/**
172172
* Clear the cache of a dataset
173173
*/
174-
export const clearCache = new rpc.RequestType<WithProgressId<ClearCacheParams>, ClearCacheResult, void, void>('evaluation/clearCache');
174+
export const clearCache = new rpc.RequestType<WithProgressId<ClearCacheParams>, ClearCacheResult, void>('evaluation/clearCache');
175175
/**
176176
* Trim the cache of a dataset
177177
*/
178-
export const trimCache = new rpc.RequestType<WithProgressId<TrimCacheParams>, ClearCacheResult, void, void>('evaluation/trimCache');
178+
export const trimCache = new rpc.RequestType<WithProgressId<TrimCacheParams>, ClearCacheResult, void>('evaluation/trimCache');
179179

180180
/**
181181
* Clear the pack cache
182182
*/
183-
export const clearPackCache = new rpc.RequestType<WithProgressId<ClearPackCacheParams>, ClearPackCacheResult, void, void>('evaluation/clearPackCache');
183+
export const clearPackCache = new rpc.RequestType<WithProgressId<ClearPackCacheParams>, ClearPackCacheResult, void>('evaluation/clearPackCache');
184184

185185
/**
186186
* Run a query on a database
187187
*/
188-
export const runQuery = new rpc.RequestType<WithProgressId<RunQueryParams>, RunQueryResult, void, void>('evaluation/runQuery');
188+
export const runQuery = new rpc.RequestType<WithProgressId<RunQueryParams>, RunQueryResult, void>('evaluation/runQuery');
189189

190190
export const registerDatabases = new rpc.RequestType<
191191
WithProgressId<RegisterDatabasesParams>,
192192
RegisterDatabasesResult,
193-
void,
194193
void
195194
>('evaluation/registerDatabases');
196195

197196
export const deregisterDatabases = new rpc.RequestType<
198197
WithProgressId<DeregisterDatabasesParams>,
199198
DeregisterDatabasesResult,
200-
void,
201199
void
202200
>('evaluation/deregisterDatabases');
203201

204202

205203
export const upgradeDatabase = new rpc.RequestType<
206204
WithProgressId<UpgradeParams>,
207205
UpgradeResult,
208-
void,
209206
void
210207
>('evaluation/runUpgrade');
211208

‎extensions/ql-vscode/src/query-server/queryserver-client.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as fs from 'fs-extra';
33

44
import { DisposableObject } from '../pure/disposable-object';
55
import { CancellationToken, commands } from 'vscode';
6-
import { createMessageConnection, RequestType } from 'vscode-jsonrpc';
6+
import { createMessageConnection, RequestType } from 'vscode-jsonrpc/node';
77
import * as cli from '../cli';
88
import { QueryServerConfig } from '../config';
99
import { Logger, ProgressReporter } from '../logging';
@@ -174,7 +174,7 @@ export class QueryServerClient extends DisposableObject {
174174
return this.serverProcess!.child.pid || 0;
175175
}
176176

177-
async sendRequest<P, R, E, RO>(type: RequestType<WithProgressId<P>, R, E, RO>, parameter: P, token?: CancellationToken, progress?: (res: ProgressMessage) => void): Promise<R> {
177+
async sendRequest<P, R, E>(type: RequestType<WithProgressId<P>, R, E>, parameter: P, token?: CancellationToken, progress?: (res: ProgressMessage) => void): Promise<R> {
178178
const id = this.nextProgress++;
179179
this.progressCallbacks[id] = progress;
180180

0 commit comments

Comments
 (0)