Skip to content

Commit 741a3df

Browse files
akosyakovakosyakov
committed
upgrade to latest vscode-uri
Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
1 parent c54b09f commit 741a3df

6 files changed

Lines changed: 29 additions & 35 deletions

File tree

‎client/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"glob-to-regexp": "^0.3.0",
2121
"vscode-jsonrpc": "^5.0.0",
2222
"vscode-languageclient": "^6.0.0",
23-
"vscode-uri": "^1.0.8"
23+
"vscode-uri": "^2.1.1"
2424
},
2525
"scripts": {
2626
"prepare": "yarn run clean && yarn run compile",

‎client/src/services.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
Disposable, CancellationToken, Event, Emitter
2323
} from 'vscode-jsonrpc';
2424

25-
import Uri from 'vscode-uri';
25+
import { URI as Uri } from 'vscode-uri';
2626

2727
export {
2828
Disposable, CancellationToken, Event, Emitter

‎client/src/vscode-api.ts‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* ------------------------------------------------------------------------------------------ */
55

66
import * as vscode from "vscode";
7-
import URI from "vscode-uri"
7+
import { URI } from "vscode-uri"
88
import { Disposable } from "./disposable";
99
import {
1010
Services, Event, DiagnosticCollection, WorkspaceEdit, isDocumentSelector,
@@ -70,12 +70,12 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc
7070
return Promise.resolve();
7171
}
7272
delete(uri: vscode.Uri,
73-
options?: { recursive?: boolean | undefined; useTrash?: boolean | undefined; } | undefined): Thenable<void> {
73+
options?: { recursive?: boolean | undefined; useTrash?: boolean | undefined; } | undefined): Thenable<void> {
7474
return Promise.resolve();
7575
}
7676
rename(source: vscode.Uri,
77-
target: vscode.Uri,
78-
options?: { overwrite?: boolean | undefined; } | undefined): Thenable<void> {
77+
target: vscode.Uri,
78+
options?: { overwrite?: boolean | undefined; } | undefined): Thenable<void> {
7979
return Promise.resolve();
8080
}
8181

@@ -215,27 +215,27 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc
215215
return (services.workspace.onDidSaveTextDocument as any) || Event.None;
216216
},
217217

218-
get onWillCreateFiles() : vscode.Event<vscode.FileWillCreateEvent> {
218+
get onWillCreateFiles(): vscode.Event<vscode.FileWillCreateEvent> {
219219
return Event.None;
220220
},
221221

222-
get onDidCreateFiles() : vscode.Event<vscode.FileCreateEvent> {
222+
get onDidCreateFiles(): vscode.Event<vscode.FileCreateEvent> {
223223
return Event.None;
224224
},
225225

226-
get onWillDeleteFiles() : vscode.Event<vscode.FileWillDeleteEvent> {
226+
get onWillDeleteFiles(): vscode.Event<vscode.FileWillDeleteEvent> {
227227
return Event.None;
228228
},
229229

230-
get onDidDeleteFiles() : vscode.Event<vscode.FileDeleteEvent> {
230+
get onDidDeleteFiles(): vscode.Event<vscode.FileDeleteEvent> {
231231
return Event.None;
232232
},
233233

234-
get onWillRenameFiles() : vscode.Event<vscode.FileWillRenameEvent> {
234+
get onWillRenameFiles(): vscode.Event<vscode.FileWillRenameEvent> {
235235
return Event.None;
236236
},
237237

238-
get onDidRenameFiles() : vscode.Event<vscode.FileRenameEvent> {
238+
get onDidRenameFiles(): vscode.Event<vscode.FileRenameEvent> {
239239
return Event.None
240240
},
241241

@@ -252,18 +252,18 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc
252252
name: undefined
253253
};
254254

255-
function isVsCodeUri(v: vscode.Uri | ReadonlyArray<[vscode.Uri, ReadonlyArray<vscode.Diagnostic> | undefined]>) : v is vscode.Uri {
255+
function isVsCodeUri(v: vscode.Uri | ReadonlyArray<[vscode.Uri, ReadonlyArray<vscode.Diagnostic> | undefined]>): v is vscode.Uri {
256256
return (v instanceof URI) !== undefined;
257257
}
258258

259259
class ApiDiagnosticCollection implements vscode.DiagnosticCollection {
260260
readonly name: string;
261-
private readonly services : Services;
262-
private readonly collection : DiagnosticCollection | undefined;
261+
private readonly services: Services;
262+
private readonly collection: DiagnosticCollection | undefined;
263263

264264
constructor(name?: string) {
265265
this.name = name || 'default',
266-
this.services = servicesProvider();
266+
this.services = servicesProvider();
267267
this.collection = this.services.languages.createDiagnosticCollection
268268
? this.services.languages.createDiagnosticCollection(name)
269269
: undefined;
@@ -272,12 +272,12 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc
272272
entries() {
273273
}
274274

275-
set(entries: ReadonlyArray<[vscode.Uri, ReadonlyArray<vscode.Diagnostic> | undefined]>): void;
275+
set(entries: ReadonlyArray<[vscode.Uri, ReadonlyArray<vscode.Diagnostic> | undefined]>): void;
276276
set(uri: vscode.Uri, arg1: ReadonlyArray<vscode.Diagnostic> | undefined): void;
277277
set(arg0: vscode.Uri | ReadonlyArray<[vscode.Uri, ReadonlyArray<vscode.Diagnostic> | undefined]>,
278278
arg1?: ReadonlyArray<vscode.Diagnostic>): void {
279279

280-
function toInternalSeverity(severity: vscode.DiagnosticSeverity) : DiagnosticSeverity {
280+
function toInternalSeverity(severity: vscode.DiagnosticSeverity): DiagnosticSeverity {
281281
// there is a typing mismatch, trying to use the proper switch
282282
// mixes error with warnings etc...
283283
// just cast for now, this as the correct behaviour
@@ -303,8 +303,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc
303303
if (isVsCodeUri(arg0)) {
304304
if (this.collection) {
305305
if (arg1) {
306-
this.collection.set(arg0.toString(), arg1.map(diag =>
307-
{
306+
this.collection.set(arg0.toString(), arg1.map(diag => {
308307
return {
309308
range: diag.range,
310309
code: diag.code,
@@ -313,7 +312,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc
313312
tags: diag.tags,
314313
relatedInformation: undefined,
315314
severity: toInternalSeverity(diag.severity)
316-
};
315+
};
317316
}));
318317
} else {
319318
this.collection.set(arg0.toString(), []);
@@ -332,11 +331,11 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc
332331
}
333332
}
334333

335-
delete(uri : vscode.Uri) {}
336-
clear() {}
337-
forEach(callback: any, thisArg?: any) {}
338-
get(uri : vscode.Uri) { return undefined; }
339-
has(uri : vscode.Uri) { return false; }
334+
delete(uri: vscode.Uri) { }
335+
clear() { }
336+
forEach(callback: any, thisArg?: any) { }
337+
get(uri: vscode.Uri) { return undefined; }
338+
has(uri: vscode.Uri) { return false; }
340339
}
341340

342341
const languages: typeof vscode.languages = {
@@ -351,7 +350,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc
351350
const result = services.languages.match(selector, document);
352351
return result ? 1 : 0;
353352
},
354-
registerCallHierarchyProvider(
353+
registerCallHierarchyProvider(
355354
selector: vscode.DocumentSelector,
356355
provider: vscode.CallHierarchyProvider): vscode.Disposable {
357356

@@ -810,6 +809,6 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc
810809
CodeActionKind,
811810
Disposable: CodeDisposable,
812811
SignatureHelpTriggerKind: SignatureHelpTriggerKind,
813-
DiagnosticSeverity: ServicesModule.DiagnosticSeverity
812+
DiagnosticSeverity: ServicesModule.DiagnosticSeverity
814813
} as any;
815814
}

‎example/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"vscode-json-languageservice": "^3.4.11",
1414
"vscode-jsonrpc": "^5.0.0",
1515
"vscode-languageserver": "^6.0.0",
16-
"vscode-uri": "^1.0.8",
16+
"vscode-uri": "^2.1.1",
1717
"vscode-ws-jsonrpc": "^0.2.0",
1818
"ws": "^5.0.0"
1919
},

‎example/src/json-server.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* ------------------------------------------------------------------------------------------ */
55
import * as fs from "fs";
66
import { xhr, getErrorStatusDescription } from 'request-light';
7-
import URI from 'vscode-uri';
7+
import { URI } from 'vscode-uri';
88
import { MessageReader, MessageWriter } from "vscode-jsonrpc";
99
import { IConnection, TextDocuments, DocumentSymbolParams, createConnection } from 'vscode-languageserver';
1010
import {

‎yarn.lock‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7149,11 +7149,6 @@ vscode-nls@^4.0.0, vscode-nls@^4.1.1:
71497149
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c"
71507150
integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==
71517151

7152-
vscode-uri@^1.0.8:
7153-
version "1.0.8"
7154-
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"
7155-
integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==
7156-
71577152
vscode-uri@^2.0.3:
71587153
version "2.0.3"
71597154
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.0.3.tgz#25e5f37f552fbee3cec7e5f80cef8469cefc6543"

0 commit comments

Comments
 (0)