Merge pull request #330 from redhat-developer/revert-324-323-catchThr…

…ownErrorInOtherExtensions Revert "Catch errors that can be thrown by registered schema providers #323"
redhat-developer · Jul 24, 2020 · 397c37d · 397c37d
2 parents 2dfb3d5 + 70717c9
commit 397c37d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 42 deletions.
diff --git a/src/schema-extension-api.ts b/src/schema-extension-api.ts
@@ -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;

diff --git a/test/schemaProvider.test.ts b/test/schemaProvider.test.ts
@@ -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');
@@ -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"
-				}
-			]
-		});
     });
 });
 
@@ -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;
 }