Skip to content

Commit

Permalink
upgrade to latest vscode-uri
Browse files Browse the repository at this point in the history 
Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
  • Loading branch information
@akosyakov
akosyakov committed Apr 6, 2020
1 parent c54b09f commit 741a3df
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 35 deletions.
2 changes: 1 addition & 1 deletion client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion client/src/services.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
51 changes: 25 additions & 26 deletions client/src/vscode-api.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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<void> {
options?: { recursive?: boolean | undefined; useTrash?: boolean | undefined; } | undefined): Thenable<void> {
return Promise.resolve();
}
rename(source: vscode.Uri,
target: vscode.Uri,
options?: { overwrite?: boolean | undefined; } | undefined): Thenable<void> {
target: vscode.Uri,
options?: { overwrite?: boolean | undefined; } | undefined): Thenable<void> {
return Promise.resolve();
}

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

get onWillCreateFiles() : vscode.Event<vscode.FileWillCreateEvent> {
get onWillCreateFiles(): vscode.Event<vscode.FileWillCreateEvent> {
return Event.None;
},

get onDidCreateFiles() : vscode.Event<vscode.FileCreateEvent> {
get onDidCreateFiles(): vscode.Event<vscode.FileCreateEvent> {
return Event.None;
},

get onWillDeleteFiles() : vscode.Event<vscode.FileWillDeleteEvent> {
get onWillDeleteFiles(): vscode.Event<vscode.FileWillDeleteEvent> {
return Event.None;
},

get onDidDeleteFiles() : vscode.Event<vscode.FileDeleteEvent> {
get onDidDeleteFiles(): vscode.Event<vscode.FileDeleteEvent> {
return Event.None;
},

get onWillRenameFiles() : vscode.Event<vscode.FileWillRenameEvent> {
get onWillRenameFiles(): vscode.Event<vscode.FileWillRenameEvent> {
return Event.None;
},

get onDidRenameFiles() : vscode.Event<vscode.FileRenameEvent> {
get onDidRenameFiles(): vscode.Event<vscode.FileRenameEvent> {
return Event.None
},

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

function isVsCodeUri(v: vscode.Uri | ReadonlyArray<[vscode.Uri, ReadonlyArray<vscode.Diagnostic> | undefined]>) : v is vscode.Uri {
function isVsCodeUri(v: vscode.Uri | ReadonlyArray<[vscode.Uri, ReadonlyArray<vscode.Diagnostic> | 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;
Expand All @@ -272,12 +272,12 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc
entries() {
}

set(entries: ReadonlyArray<[vscode.Uri, ReadonlyArray<vscode.Diagnostic> | undefined]>): void;
set(entries: ReadonlyArray<[vscode.Uri, ReadonlyArray<vscode.Diagnostic> | undefined]>): void;
set(uri: vscode.Uri, arg1: ReadonlyArray<vscode.Diagnostic> | undefined): void;
set(arg0: vscode.Uri | ReadonlyArray<[vscode.Uri, ReadonlyArray<vscode.Diagnostic> | undefined]>,
arg1?: ReadonlyArray<vscode.Diagnostic>): 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
Expand All @@ -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,
Expand All @@ -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(), []);
Expand All @@ -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 = {
Expand All @@ -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 {

Expand Down Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion example/src/json-server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 0 additions & 5 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 741a3df

Please sign in to comment.