Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>

extensions/github/package.json

@@ -8,6 +8,7 @@
   "engines": {
     "vscode": "^1.41.0"
   },
+  "icon": "images/icon.png",
   "enableProposedApi": true,
   "categories": [
     "Other"
@@ -19,6 +20,12 @@
     "vscode.git"
   ],
   "main": "./out/extension.js",
+  "capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+  },
   "contributes": {
     "commands": [
       {

extensions/github/src/publish.ts

@@ -168,7 +168,12 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 	}
 
 	const githubRepository = await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification, cancellable: false, title: 'Publish to GitHub' }, async progress => {
-		progress.report({ message: `Publishing to GitHub ${isPrivate ? 'private' : 'public'} repository`, increment: 25 });
+		progress.report({
+			message: isPrivate
+				? localize('publishing_private', "Publishing to a private GitHub repository")
+				: localize('publishing_public', "Publishing to a public GitHub repository"),
+			increment: 25
+		});
 
 		const res = await octokit.repos.createForAuthenticatedUser({
 			name: repo!,
@@ -177,7 +182,7 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 
 		const createdGithubRepository = res.data;
 
-		progress.report({ message: 'Creating first commit', increment: 25 });
+		progress.report({ message: localize('publishing_firstcommit', "Creating first commit"), increment: 25 });
 
 		if (!repository) {
 			repository = await gitAPI.init(folder) || undefined;
@@ -189,9 +194,11 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 			await repository.commit('first commit', { all: true });
 		}
 
-		progress.report({ message: 'Uploading files', increment: 25 });
+		progress.report({ message: localize('publishing_uploading', "Uploading files"), increment: 25 });
+
+		const branch = await repository.getBranch('HEAD');
 		await repository.addRemote('origin', createdGithubRepository.clone_url);
-		await repository.push('origin', 'master', true);
+		await repository.push('origin', branch.name, true);
 
 		return createdGithubRepository;
 	});
@@ -200,9 +207,9 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 		return;
 	}
 
-	const openInGitHub = 'Open In GitHub';
-	vscode.window.showInformationMessage(`Successfully published the '${owner}/${repo}' repository on GitHub.`, openInGitHub).then(action => {
-		if (action === openInGitHub) {
+	const openOnGitHub = localize('openingithub', "Open on GitHub");
+	vscode.window.showInformationMessage(localize('publishing_done', "Successfully published the '{0}' repository to GitHub.", `${owner}/${repo}`), openOnGitHub).then(action => {
+		if (action === openOnGitHub) {
 			vscode.commands.executeCommand('vscode.open', vscode.Uri.parse(githubRepository.html_url));
 		}
 	});

extensions/github/src/pushErrorHandler.ts

@@ -3,37 +3,69 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { PushErrorHandler, GitErrorCodes, Repository, Remote } from './typings/git';
-import { window, ProgressLocation, commands, Uri } from 'vscode';
+import { commands, env, ProgressLocation, Uri, window } from 'vscode';
 import * as nls from 'vscode-nls';
 import { getOctokit } from './auth';
+import { GitErrorCodes, PushErrorHandler, Remote, Repository } from './typings/git';
 
 const localize = nls.loadMessageBundle();
 
+type Awaited<T> = T extends PromiseLike<infer U> ? Awaited<U> : T;
+
+export function isInCodespaces(): boolean {
+	return env.remoteName === 'codespaces';
+}
+
 async function handlePushError(repository: Repository, remote: Remote, refspec: string, owner: string, repo: string): Promise<void> {
 	const yes = localize('create a fork', "Create Fork");
 	const no = localize('no', "No");
 
 	const answer = await window.showInformationMessage(localize('fork', "You don't have permissions to push to '{0}/{1}' on GitHub. Would you like to create a fork and push to it instead?", owner, repo), yes, no);
-
 	if (answer === no) {
 		return;
 	}
 
 	const match = /^([^:]*):([^:]*)$/.exec(refspec);
 	const localName = match ? match[1] : refspec;
-	const remoteName = match ? match[2] : refspec;
+	let remoteName = match ? match[2] : refspec;
 
 	const [octokit, ghRepository] = await window.withProgress({ location: ProgressLocation.Notification, cancellable: false, title: localize('create fork', 'Create GitHub fork') }, async progress => {
 		progress.report({ message: localize('forking', "Forking '{0}/{1}'...", owner, repo), increment: 33 });
 
 		const octokit = await getOctokit();
 
-		// Issue: what if the repo already exists?
-		const res = await octokit.repos.createFork({ owner, repo });
-		const ghRepository = res.data;
+		type CreateForkResponseData = Awaited<ReturnType<typeof octokit.repos.createFork>>['data'];
 
-		progress.report({ message: localize('pushing', "Pushing changes..."), increment: 33 });
+		// Issue: what if the repo already exists?
+		let ghRepository: CreateForkResponseData;
+		try {
+			if (isInCodespaces()) {
+				// Call into the codespaces extension to fork the repository
+				const resp = await commands.executeCommand<{ repository: CreateForkResponseData, ref: string }>('github.codespaces.forkRepository');
+				if (!resp) {
+					throw new Error('Unable to fork respository');
+				}
+
+				ghRepository = resp.repository;
+
+				if (resp.ref) {
+					let ref = resp.ref;
+					if (ref.startsWith('refs/heads/')) {
+						ref = ref.substr(11);
+					}
+
+					remoteName = ref;
+				}
+			} else {
+				const resp = await octokit.repos.createFork({ owner, repo });
+				ghRepository = resp.data;
+			}
+		} catch (ex) {
+			console.error(ex);
+			throw ex;
+		}
+
+		progress.report({ message: localize('forking_pushing', "Pushing changes..."), increment: 33 });
 
 		// Issue: what if there's already an `upstream` repo?
 		await repository.renameRemote(remote.name, 'upstream');
@@ -55,11 +87,11 @@ async function handlePushError(repository: Repository, remote: Remote, refspec:
 
 	// yield
 	(async () => {
-		const openInGitHub = localize('openingithub', "Open In GitHub");
+		const openOnGitHub = localize('openingithub', "Open on GitHub");
 		const createPR = localize('createpr', "Create PR");
-		const action = await window.showInformationMessage(localize('done', "The fork '{0}' was successfully created on GitHub.", ghRepository.full_name), openInGitHub, createPR);
+		const action = await window.showInformationMessage(localize('forking_done', "The fork '{0}' was successfully created on GitHub.", ghRepository.full_name), openOnGitHub, createPR);
 
-		if (action === openInGitHub) {
+		if (action === openOnGitHub) {
 			await commands.executeCommand('vscode.open', Uri.parse(ghRepository.html_url));
 		} else if (action === createPR) {
 			const pr = await window.withProgress({ location: ProgressLocation.Notification, cancellable: false, title: localize('createghpr', "Creating GitHub Pull Request...") }, async _ => {
@@ -103,13 +135,12 @@ export class GithubPushErrorHandler implements PushErrorHandler {
 			return false;
 		}
 
-		if (!remote.pushUrl) {
+		const remoteUrl = remote.pushUrl || (isInCodespaces() ? remote.fetchUrl : undefined);
+		if (!remoteUrl) {
 			return false;
 		}
 
-		const match = /^https:\/\/github\.com\/([^/]+)\/([^/]+)\.git/i.exec(remote.pushUrl)
-			|| /^git@github\.com:([^/]+)\/([^/]+)\.git/i.exec(remote.pushUrl);
-
+		const match = /^(?:https:\/\/github\.com\/|git@github\.com:)([^/]+)\/([^/.]+)(?:\.git)?$/i.exec(remoteUrl);
 		if (!match) {
 			return false;
 		}

extensions/github/src/remoteSourceProvider.ts

@@ -45,8 +45,8 @@ export class GithubRemoteSourceProvider implements RemoteSourceProvider {
 		}
 
 		const all = await Promise.all([
+			this.getQueryRemoteSources(octokit, query),
 			this.getUserRemoteSources(octokit, query),
-			this.getQueryRemoteSources(octokit, query)
 		]);
 
 		const map = new Map<string, RemoteSource>();
@@ -76,7 +76,7 @@ export class GithubRemoteSourceProvider implements RemoteSourceProvider {
 			return [];
 		}
 
-		const raw = await octokit.search.repos({ q: query, sort: 'updated' });
+		const raw = await octokit.search.repos({ q: query, sort: 'stars' });
 		return raw.data.items.map(asRemoteSource);
 	}
 

extensions/github/tsconfig.json

@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 		"experimentalDecorators": true,

extensions/github/yarn.lock

@@ -125,9 +125,9 @@ is-plain-object@^3.0.0:
   integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==
 
 node-fetch@^2.3.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
 once@^1.4.0:
   version "1.4.0"