From 741a3dfb865eff55c3dcc4a51f74759921d3f2a5 Mon Sep 17 00:00:00 2001 From: Anton Kosyakov Date: Mon, 6 Apr 2020 09:12:15 +0000 Subject: [PATCH] upgrade to latest vscode-uri Signed-off-by: Anton Kosyakov --- client/package.json | 2 +- client/src/services.ts | 2 +- client/src/vscode-api.ts | 51 +++++++++++++++++++------------------- example/package.json | 2 +- example/src/json-server.ts | 2 +- yarn.lock | 5 ---- 6 files changed, 29 insertions(+), 35 deletions(-) diff --git a/client/package.json b/client/package.json index 91fb145e0..b7538a49b 100644 --- a/client/package.json +++ b/client/package.json @@ -20,7 +20,7 @@ "glob-to-regexp": "^0.3.0", "vscode-jsonrpc": "^5.0.0", "vscode-languageclient": "^6.0.0", - "vscode-uri": "^1.0.8" + "vscode-uri": "^2.1.1" }, "scripts": { "prepare": "yarn run clean && yarn run compile", diff --git a/client/src/services.ts b/client/src/services.ts index ade390c23..41a9b4207 100644 --- a/client/src/services.ts +++ b/client/src/services.ts @@ -22,7 +22,7 @@ import { Disposable, CancellationToken, Event, Emitter } from 'vscode-jsonrpc'; -import Uri from 'vscode-uri'; +import { URI as Uri } from 'vscode-uri'; export { Disposable, CancellationToken, Event, Emitter diff --git a/client/src/vscode-api.ts b/client/src/vscode-api.ts index 438a26b98..bc416bc09 100644 --- a/client/src/vscode-api.ts +++ b/client/src/vscode-api.ts @@ -4,7 +4,7 @@ * ------------------------------------------------------------------------------------------ */ import * as vscode from "vscode"; -import URI from "vscode-uri" +import { URI } from "vscode-uri" import { Disposable } from "./disposable"; import { Services, Event, DiagnosticCollection, WorkspaceEdit, isDocumentSelector, @@ -70,12 +70,12 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc return Promise.resolve(); } delete(uri: vscode.Uri, - options?: { recursive?: boolean | undefined; useTrash?: boolean | undefined; } | undefined): Thenable { + options?: { recursive?: boolean | undefined; useTrash?: boolean | undefined; } | undefined): Thenable { return Promise.resolve(); } rename(source: vscode.Uri, - target: vscode.Uri, - options?: { overwrite?: boolean | undefined; } | undefined): Thenable { + target: vscode.Uri, + options?: { overwrite?: boolean | undefined; } | undefined): Thenable { return Promise.resolve(); } @@ -215,27 +215,27 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc return (services.workspace.onDidSaveTextDocument as any) || Event.None; }, - get onWillCreateFiles() : vscode.Event { + get onWillCreateFiles(): vscode.Event { return Event.None; }, - get onDidCreateFiles() : vscode.Event { + get onDidCreateFiles(): vscode.Event { return Event.None; }, - get onWillDeleteFiles() : vscode.Event { + get onWillDeleteFiles(): vscode.Event { return Event.None; }, - get onDidDeleteFiles() : vscode.Event { + get onDidDeleteFiles(): vscode.Event { return Event.None; }, - get onWillRenameFiles() : vscode.Event { + get onWillRenameFiles(): vscode.Event { return Event.None; }, - get onDidRenameFiles() : vscode.Event { + get onDidRenameFiles(): vscode.Event { return Event.None }, @@ -252,18 +252,18 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc name: undefined }; - function isVsCodeUri(v: vscode.Uri | ReadonlyArray<[vscode.Uri, ReadonlyArray | undefined]>) : v is vscode.Uri { + function isVsCodeUri(v: vscode.Uri | ReadonlyArray<[vscode.Uri, ReadonlyArray | undefined]>): v is vscode.Uri { return (v instanceof URI) !== undefined; } class ApiDiagnosticCollection implements vscode.DiagnosticCollection { readonly name: string; - private readonly services : Services; - private readonly collection : DiagnosticCollection | undefined; + private readonly services: Services; + private readonly collection: DiagnosticCollection | undefined; constructor(name?: string) { this.name = name || 'default', - this.services = servicesProvider(); + this.services = servicesProvider(); this.collection = this.services.languages.createDiagnosticCollection ? this.services.languages.createDiagnosticCollection(name) : undefined; @@ -272,12 +272,12 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc entries() { } - set(entries: ReadonlyArray<[vscode.Uri, ReadonlyArray | undefined]>): void; + set(entries: ReadonlyArray<[vscode.Uri, ReadonlyArray | undefined]>): void; set(uri: vscode.Uri, arg1: ReadonlyArray | undefined): void; set(arg0: vscode.Uri | ReadonlyArray<[vscode.Uri, ReadonlyArray | undefined]>, arg1?: ReadonlyArray): void { - function toInternalSeverity(severity: vscode.DiagnosticSeverity) : DiagnosticSeverity { + function toInternalSeverity(severity: vscode.DiagnosticSeverity): DiagnosticSeverity { // there is a typing mismatch, trying to use the proper switch // mixes error with warnings etc... // just cast for now, this as the correct behaviour @@ -303,8 +303,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc if (isVsCodeUri(arg0)) { if (this.collection) { if (arg1) { - this.collection.set(arg0.toString(), arg1.map(diag => - { + this.collection.set(arg0.toString(), arg1.map(diag => { return { range: diag.range, code: diag.code, @@ -313,7 +312,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc tags: diag.tags, relatedInformation: undefined, severity: toInternalSeverity(diag.severity) - }; + }; })); } else { this.collection.set(arg0.toString(), []); @@ -332,11 +331,11 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc } } - delete(uri : vscode.Uri) {} - clear() {} - forEach(callback: any, thisArg?: any) {} - get(uri : vscode.Uri) { return undefined; } - has(uri : vscode.Uri) { return false; } + delete(uri: vscode.Uri) { } + clear() { } + forEach(callback: any, thisArg?: any) { } + get(uri: vscode.Uri) { return undefined; } + has(uri: vscode.Uri) { return false; } } const languages: typeof vscode.languages = { @@ -351,7 +350,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc const result = services.languages.match(selector, document); return result ? 1 : 0; }, - registerCallHierarchyProvider( + registerCallHierarchyProvider( selector: vscode.DocumentSelector, provider: vscode.CallHierarchyProvider): vscode.Disposable { @@ -810,6 +809,6 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc CodeActionKind, Disposable: CodeDisposable, SignatureHelpTriggerKind: SignatureHelpTriggerKind, - DiagnosticSeverity: ServicesModule.DiagnosticSeverity + DiagnosticSeverity: ServicesModule.DiagnosticSeverity } as any; } diff --git a/example/package.json b/example/package.json index 9bae135b5..44d8e1c94 100644 --- a/example/package.json +++ b/example/package.json @@ -13,7 +13,7 @@ "vscode-json-languageservice": "^3.4.11", "vscode-jsonrpc": "^5.0.0", "vscode-languageserver": "^6.0.0", - "vscode-uri": "^1.0.8", + "vscode-uri": "^2.1.1", "vscode-ws-jsonrpc": "^0.2.0", "ws": "^5.0.0" }, diff --git a/example/src/json-server.ts b/example/src/json-server.ts index a9c2f59d0..ab25fe56d 100644 --- a/example/src/json-server.ts +++ b/example/src/json-server.ts @@ -4,7 +4,7 @@ * ------------------------------------------------------------------------------------------ */ import * as fs from "fs"; import { xhr, getErrorStatusDescription } from 'request-light'; -import URI from 'vscode-uri'; +import { URI } from 'vscode-uri'; import { MessageReader, MessageWriter } from "vscode-jsonrpc"; import { IConnection, TextDocuments, DocumentSymbolParams, createConnection } from 'vscode-languageserver'; import { diff --git a/yarn.lock b/yarn.lock index 5d75e7467..f7165bb48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7149,11 +7149,6 @@ vscode-nls@^4.0.0, vscode-nls@^4.1.1: resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c" integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A== -vscode-uri@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59" - integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ== - vscode-uri@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.0.3.tgz#25e5f37f552fbee3cec7e5f80cef8469cefc6543"