support merge code lens for vscode-userdata

sandy081 · sandy081 · commit 81ec777df288 · 2019-09-20T22:09:21.000+02:00
diff --git a/extensions/merge-conflict/src/codelensProvider.ts b/extensions/merge-conflict/src/codelensProvider.ts
@@ -100,6 +100,7 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
 		this.codeLensRegistrationHandle = vscode.languages.registerCodeLensProvider([
 			{ scheme: 'file' },
 			{ scheme: 'untitled' },
+			{ scheme: 'vscode-userdata' },
 		], this);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro`
`100`	`100`	`this.codeLensRegistrationHandle = vscode.languages.registerCodeLensProvider([`
`101`	`101`	`{ scheme: 'file' },`
`102`	`102`	`{ scheme: 'untitled' },`
	`103`	`+ { scheme: 'vscode-userdata' },`
`103`	`104`	`], this);`
`104`	`105`	`}`
`105`	`106`	`}`