Merge branch 'master' into useAnOutputChannel

Author: JPinkney

Jenkinsfile

@@ -45,11 +45,18 @@ node('rhel8'){
 		input message:'Approve deployment?', submitter: 'jpinkney'
 	}
 
-	stage "Publish to Marketplace"
+	stage "Publish to Marketplaces"
 	unstash 'vsix';
+	def vsix = findFiles(glob: '**.vsix')
+	// VS Code Marketplace
 	withCredentials([[$class: 'StringBinding', credentialsId: 'vscode_java_marketplace', variable: 'TOKEN']]) {
-		def vsix = findFiles(glob: '**.vsix')
 		sh 'vsce publish -p ${TOKEN} --packagePath' + " ${vsix[0].path}"
 	}
+
+	// Open-vsx Marketplace
+	sh "npm install -g ovsx"
+	withCredentials([[$class: 'StringBinding', credentialsId: 'open-vsx-access-token', variable: 'OVSX_TOKEN']]) {
+		sh 'ovsx publish -p ${OVSX_TOKEN}' + " ${vsix[0].path}"
+	}
 	archive includes:"**.vsix"
 }

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 trhown and not caught');
-}
-
-function onRequestSchemaContentThrowError(schemaUri: string): string | undefined {
-	throw new Error('test what happens when an error is trhown and not caught');
-}
-
 function onRequestSchema1Content(schemaUri: string): string | undefined {
 	return schemaJSON;
 }