Migrate to 'vscode-test', fixes #1430

Author: Rachel Macfarlane

.gitignore

@@ -338,6 +338,8 @@ media
 .DS_Store
 *.vsix
 package-lock.json
+src/typings/vscode.d.ts
+src/typings/vscode.proposed.d.ts
 
 # CI
 package.insiders.json

.vscode/launch.json

@@ -23,10 +23,10 @@
 			"request": "launch",
 			"runtimeExecutable": "${execPath}",
 			"args": [
-				"${workspaceFolder}/out/test",
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--extensionTestsPath=${workspaceFolder}/out/test"
 			],
+			"preLaunchTask": "npm: preprocess",
 			"outFiles": [
 				"${workspaceFolder}/out/test/**/*.js"
 			]

package.json

@@ -1175,11 +1175,14 @@
   },
   "scripts": {
     "vscode:prepublish": "webpack --env.production",
-    "postinstall": "node ./node_modules/vscode/bin/install",
+    "postinstall": "cd src/typings && npx vscode-dts master && npx vscode-dts dev master",
     "compile": "tsc -p ./",
     "clean": "rm -r out/ media/ preview-src/dist/",
     "watch": "webpack --watch --env.development",
-    "test": "./test.sh"
+    "test": "yarn run preprocess && node ./out/test/runTests.js",
+    "preprocess": "yarn run compile && yarn run preprocess-gql && yarn run preprocess-svg",
+    "preprocess-gql": "scripts/preprocess-gql --in src/github/queries.gql --out out/github/queries.gql",
+    "preprocess-svg": "scripts/preprocess-svg --in resources/ --out preview-src/dist/resources"
   },
   "devDependencies": {
     "@types/chai": "^4.1.4",
@@ -1190,7 +1193,7 @@
     "@types/lru-cache": "^5.1.0",
     "@types/marked": "^0.7.2",
     "@types/mocha": "^5.2.2",
-    "@types/node": "*",
+    "@types/node": "^12.0.0",
     "@types/node-fetch": "^2.1.4",
     "@types/query-string": "^6.1.1",
     "@types/react": "^16.8.4",
@@ -1220,8 +1223,8 @@
     "tslint": "^6.0.0",
     "tslint-webpack-plugin": "^2.1.0",
     "tty": "1.0.1",
-    "typescript": "^3.8.2",
-    "vscode": "^1.1.36",
+    "typescript": "^3.8.3",
+    "vscode-test": "^1.3.0",
     "webpack": "^4.41.6",
     "webpack-cli": "^3.3.11"
   },
@@ -1254,4 +1257,4 @@
     "webpack/**/tar": "^4.4.2"
   },
   "license": "MIT"
-}
+}

preview-src/tsconfig.json

@@ -19,6 +19,7 @@
 		],
 	},
 	"include": [
-		"./**/*"
+		"./**/*",
+		"../src/typings/*"
 	]
 }

src/commands.ts

@@ -31,8 +31,8 @@ import { TreeNode } from './view/treeNodes/treeNode';
 import { CredentialStore, GitHub } from './github/credentials';
 import { GitAPI } from './typings/git';
 
-const _onDidUpdatePR = new vscode.EventEmitter<PullRequest | undefined>();
-export const onDidUpdatePR: vscode.Event<PullRequest | undefined> = _onDidUpdatePR.event;
+const _onDidUpdatePR = new vscode.EventEmitter<PullRequest | void>();
+export const onDidUpdatePR: vscode.Event<PullRequest | void> = _onDidUpdatePR.event;
 
 function ensurePR(prManager: PullRequestManager, pr?: PRNode | PullRequestModel): PullRequestModel {
 	// If the command is called from the command palette, no arguments are passed.

src/github/utils.ts

@@ -27,7 +27,7 @@ export function createVSCodeCommentThread(thread: ThreadData, commentController:
 		[]
 	);
 
-	vscodeThread.threadId = thread.threadId;
+	(vscodeThread as GHPRCommentThread).threadId = thread.threadId;
 
 	vscodeThread.comments = thread.comments.map(comment => new GHPRComment(comment, vscodeThread as GHPRCommentThread));
 

src/issues/issuesView.ts

@@ -10,8 +10,8 @@ import { StateManager } from './stateManager';
 import { Resource } from '../common/resources';
 
 export class IssuesTreeData implements vscode.TreeDataProvider<IssueModel | MilestoneModel | vscode.TreeItem> {
-	private _onDidChangeTreeData: vscode.EventEmitter<IssueModel | MilestoneModel | null | undefined> = new vscode.EventEmitter();
-	public onDidChangeTreeData: vscode.Event<IssueModel | MilestoneModel | null | undefined> = this._onDidChangeTreeData.event;
+	private _onDidChangeTreeData: vscode.EventEmitter<IssueModel | MilestoneModel | null | undefined | void> = new vscode.EventEmitter();
+	public onDidChangeTreeData: vscode.Event<IssueModel | MilestoneModel | null | undefined | void> = this._onDidChangeTreeData.event;
 	private firstLabel: string | undefined;
 
 	constructor(private stateManager: StateManager, context: vscode.ExtensionContext) {

src/test/mocks/mockExtensionContext.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
 import * as temp from 'temp';
-import { ExtensionContext } from 'vscode';
+import { ExtensionContext, Uri  } from 'vscode';
 
 import { InMemoryMemento } from './inMemoryMemento';
 
@@ -14,6 +14,9 @@ export class MockExtensionContext implements ExtensionContext {
 	storagePath: string;
 	globalStoragePath: string;
 	logPath: string;
+	extensionUri: Uri;
+	environmentVariableCollection: any;
+	extensionMode: any;
 
 	constructor() {
 		this.storagePath = temp.mkdirSync('storage-path');

src/test/runTests.ts

@@ -0,0 +1,25 @@
+import * as path from 'path';
+import { runTests } from 'vscode-test';
+
+async function go() {
+	try {
+		const extensionDevelopmentPath = path.resolve(__dirname, '../../');
+		const extensionTestsPath = path.resolve(__dirname, './');
+
+		/**
+		 * Basic usage
+		 */
+		await runTests({
+			version: 'insiders',
+			extensionDevelopmentPath,
+			extensionTestsPath,
+			launchArgs: [
+				'--disable-extensions'
+			]
+		});
+	} catch (e) {
+		console.log(e);
+	}
+}
+
+go();

src/typings/ref.d.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+/// <reference path='./vscode.d.ts'/>
 /// <reference path='./vscode.proposed.d.ts'/>
 /// <reference path='./git-credential-node.d.ts'/>
 /// <reference path='./graphql.d.ts'/>