Merge branch 'master' into release

README.md

@@ -105,11 +105,14 @@ $ yarn build
 
 The continued development and maintenance of GitHub1s is made possible by these generous sponsors:
 
-<br />
-<a href="https://vercel.com/?utm_source=vscode-github1s&utm_campaign=oss">
-	<img src="https://raw.githubusercontent.com/conwnet/github1s/master/resources/images/vercel-logo.svg">
-</a>
-<br /><br />
+<table><tbody><tr>
+<td><a href="https://vercel.com/?utm_source=vscode-github1s&utm_campaign=oss">
+<img height="40px" src="https://raw.githubusercontent.com/conwnet/github1s/master/resources/images/sourcegraph-logo.svg">
+</a></td>
+<td><a href="https://vercel.com/?utm_source=vscode-github1s&utm_campaign=oss">
+<img height="40px" src="https://raw.githubusercontent.com/conwnet/github1s/master/resources/images/vercel-logo.svg">
+</a></td>
+</tr></tbody></table>
 
 ## Third-party Related Projects
 

extensions/github1s/src/extension.ts

@@ -17,7 +17,7 @@ import {
 import {
 	GitHub1sFileSystemProvider,
 	GitHub1sFileSearchProvider,
-	// GitHub1sTextSearchProvider,
+	GitHub1sTextSearchProvider,
 	GitHub1sSubmoduleDecorationProvider,
 } from '@/providers';
 import { showSponsors } from '@/sponsors';
@@ -40,13 +40,10 @@ export function activate(context: vscode.ExtensionContext) {
 			GitHub1sFileSearchProvider.scheme,
 			new GitHub1sFileSearchProvider(fsProvider)
 		),
-		// TODO: The Code Search ability is powered by Sourcegraph
-		// We are actively in touch with the Sourcegraph Team
-		// It will be enabled if we get their permission
-		// vscode.workspace.registerTextSearchProvider(
-		// 	GitHub1sTextSearchProvider.scheme,
-		// 	new GitHub1sTextSearchProvider()
-		// ),
+		vscode.workspace.registerTextSearchProvider(
+			GitHub1sTextSearchProvider.scheme,
+			new GitHub1sTextSearchProvider()
+		),
 		vscode.window.registerFileDecorationProvider(
 			new GitHub1sSubmoduleDecorationProvider(fsProvider)
 		)

extensions/github1s/src/sponsors.ts

@@ -11,6 +11,11 @@ const sponsors = [
 		link: 'https://vercel.com/?utm_source=vscode-github1s&utm_campaign=oss',
 		description: 'Develop. Preview. Ship.',
 	},
+	{
+		name: 'Sourcegraph',
+		link: 'https://sourcegraph.com',
+		description: 'Universal code search',
+	},
 ];
 
 export const showSponsors = () => {

src/vs/workbench/contrib/url/browser/trustedDomains.ts

@@ -306,6 +306,7 @@ const github1sDefaultTrustedDomains = [
 	'*.microsoft.com',
 	'*.github1s.com',
 	'*.vercel.com',
+	'*.sourcegraph.com',
 ];
 
 export function readStaticTrustedDomains(