Merge from vscode fb5dc0083bfa9a0e3da7ed1f86e1ecb9836fcc8b

extensions/image-preview/src/preview.ts

@@ -27,8 +27,8 @@ export class PreviewManager implements vscode.CustomEditorProvider {
 		private readonly zoomStatusBarEntry: ZoomStatusBarEntry,
 	) { }
 
-	public async resolveCustomDocument(_document: vscode.CustomDocument): Promise<vscode.CustomEditorCapabilities> {
-		return {};
+	public async resolveCustomDocument(_document: vscode.CustomDocument): Promise<void> {
+		// noop
 	}
 
 	public async resolveCustomEditor(

extensions/json-language-features/client/src/jsonMain.ts

@@ -345,6 +345,9 @@ function getSchemaAssociations(_context: ExtensionContext): ISchemaAssociation[]
 						fileMatch = [fileMatch];
 					}
 					if (Array.isArray(fileMatch) && url) {
+						if (url[0] === '.' && url[1] === '/') {
+							url = Uri.file(path.join(extension.extensionPath, url)).toString();
+						}
 						fileMatch = fileMatch.map(fm => {
 							if (fm[0] === '%') {
 								fm = fm.replace(/%APP_SETTINGS_HOME%/, '/User');

extensions/markdown-language-features/src/features/previewManager.ts

@@ -148,8 +148,8 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 		this.registerDynamicPreview(preview);
 	}
 
-	public async resolveCustomDocument(_document: vscode.CustomDocument): Promise<vscode.CustomEditorCapabilities> {
-		return {};
+	public async resolveCustomDocument(_document: vscode.CustomDocument): Promise<void> {
+		// noop
 	}
 
 	public async resolveCustomTextEditor(