Skip to content

Revert "Catch errors that can be thrown by registered schema providers #323" #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JPinkney merged 1 commit into from
Jul 24, 2020
Merged

Revert "Catch errors that can be thrown by registered schema providers #323" #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 13 additions & 17 deletions src/schema-extension-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,28 +92,24 @@ class SchemaExtensionAPI implements ExtensionAPI {
public requestCustomSchema(resource: string): string[] {
const matches = [];
for (let customKey of Object.keys(this._customSchemaContributors)) {
try {
const contributor = this._customSchemaContributors[customKey];
let uri: string;
if (contributor.label && workspace.textDocuments) {
const labelRegexp = new RegExp(contributor.label, 'g');
for (const doc of workspace.textDocuments) {
if (doc.uri.toString() === resource) {
if (labelRegexp.test(doc.getText())) {
uri = contributor.requestSchema(resource);
return [uri];
}
const contributor = this._customSchemaContributors[customKey];
let uri: string;
if (contributor.label && workspace.textDocuments) {
const labelRegexp = new RegExp(contributor.label, 'g');
for (const doc of workspace.textDocuments) {
if (doc.uri.toString() === resource) {
if (labelRegexp.test(doc.getText())) {
uri = contributor.requestSchema(resource);
return [uri];
}
}
}
}

uri = contributor.requestSchema(resource);
uri = contributor.requestSchema(resource);

if (uri) {
matches.push(uri);
}
} catch (error) {
console.log(`Error thrown while requesting schema ` + error);
if (uri) {
matches.push(uri);
}
}
return matches;
Expand Down
26 changes: 1 addition & 25 deletions test/schemaProvider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import * as vscode from 'vscode';
import { getDocUri, activate, testCompletion, testHover, testDiagnostics, sleep } from './helper';
import { Uri } from 'vscode';

describe('Tests for schema provider feature', () => {
const docUri = getDocUri('completion/completion.yaml');
Expand Down Expand Up @@ -133,23 +134,6 @@ describe('Tests for schema provider feature', () => {
}
]
});
});

it('Multiple contributors with one throwing an error', async () => {
const client = await activate(docUri);
client._customSchemaContributors = {};
client.registerContributor(SCHEMA2, onRequestSchema2URI, onRequestSchema2Content);
client.registerContributor("schemathrowingerror", onRequestSchemaURIThrowError, onRequestSchemaContentThrowError);

await testCompletion(docUri, new vscode.Position(0, 0), {
items: [
{
label: "apple",
kind: 9,
documentation: "An apple"
}
]
});
});
});

Expand Down Expand Up @@ -177,14 +161,6 @@ function onRequestSchema1URI(resource: string): string | undefined {
return undefined;
}

function onRequestSchemaURIThrowError(resource: string): string | undefined {
throw new Error('test what happens when an error is thrown and not caught');
}

function onRequestSchemaContentThrowError(schemaUri: string): string | undefined {
throw new Error('test what happens when an error is thrown and not caught');
}

function onRequestSchema1Content(schemaUri: string): string | undefined {
return schemaJSON;
}
Expand Down
⚡