Merge remote-tracking branch 'origin/main' into bugfix/prompt-install…

…-pip

.github/workflows/test-merge.yml

@@ -17,6 +17,27 @@ jobs:
       currents_tags: "merge,electron/linux"
     secrets: inherit
 
+  e2e-windows-electron:
+    name: e2e
+    uses: ./.github/workflows/test-e2e-windows.yml
+    with:
+      grep: ""
+      display_name: "electron (windows)"
+      currents_tags: "merge,electron/windows"
+      report_testrail: false
+    secrets: inherit
+
+  e2e-linux-browser:
+    name: e2e
+    uses: ./.github/workflows/test-e2e-linux.yml
+    with:
+      grep: ""
+      display_name: "browser (linux)"
+      project: "e2e-browser"
+      currents_tags: "merge,browser/linux"
+      report_testrail: false
+    secrets: inherit
+
   unit-tests:
     name: test
     uses: ./.github/workflows/test-unit.yml
@@ -29,7 +50,7 @@ jobs:
 
   slack-notify:
     if: failure()
-    needs: [unit-tests, integration-tests, e2e-electron]
+    needs: [unit-tests, integration-tests, e2e-electron, e2e-windows-electron, e2e-linux-browser]
     runs-on: ubuntu-latest
     steps:
       - name: Send Slack Notification

.vscode/shared.code-snippets

@@ -49,5 +49,15 @@
 			"private readonly _onDid$1 = new Emitter<$2>();",
 			"readonly onDid$1: Event<$2> = this._onDid$1.event;"
 		],
+	},
+	"Positron Markers": {
+		"scope": "javascript,typescript",
+		"prefix": "// --- Start Positron ---",
+		"description": "Add Positron overlay markers",
+		"body": [
+			"// --- Start Positron ---",
+			"$0",
+			"// --- End Positron ---"
+		]
 	}
 }

build/gulpfile.reh.js

@@ -342,7 +342,8 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 		// --- Start Positron ---
 		// Note: The remote/reh-web/package.json is generated/updated in build/npm/postinstall.js
 		const packageJsonBase = type === 'reh-web' ? 'remote/reh-web' : 'remote';
-		const packageJsonStream = gulp.src(['remote/package.json'], { base: packageJsonBase })
+		const packageJsonStream = gulp.src([`${packageJsonBase}/package.json`], { base: packageJsonBase })
+			// --- End Positron ---
 			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, type: 'module' }))
 			.pipe(es.through(function (file) {
 				packageJsonContents = file.contents.toString();
@@ -391,7 +392,9 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 			].map(resource => gulp.src(resource, { base: '.' }).pipe(rename(resource)));
 		}
 
-		const all = es.merge(
+		// --- Start Positron ---
+		let all = es.merge(
+			// --- End Positron ---
 			packageJsonStream,
 			productJsonStream,
 			license,
@@ -401,6 +404,14 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 			...web
 		);
 
+		// --- Start Positron ---
+		if (type === 'reh-web') {
+			// External modules (React, etc.)
+			const moduleSources = gulp.src('src/esm-package-dependencies/**').pipe(rename(function (p) { p.dirname = path.join('out', 'esm-package-dependencies', p.dirname) }));
+			all = es.merge(all, moduleSources);
+		}
+		// --- End Positron ---
+
 		let result = all
 			.pipe(util.skipDirectories())
 			.pipe(util.fixWin32DirectoryPermissions());

build/gulpfile.vscode.web.js

@@ -40,6 +40,10 @@ const positronVersion = (quality && quality !== 'stable') ? `${product.positronV
 // --- End Positron ---
 
 const vscodeWebResourceIncludes = [
+	// --- Start Positron ---
+	// Positron Help
+	'out-build/vs/workbench/contrib/positronHelp/browser/resources/help.html',
+	// --- End Positron ---
 
 	// NLS
 	'out-build/nls.messages.js',

extensions/npm/package.json

@@ -36,11 +36,11 @@
     "@types/which": "^3.0.0"
   },
   "overrides": {
-    "micromatch": "^4.0.6",
+    "micromatch": "^4.0.8",
     "braces": "^3.0.3"
   },
   "resolutions": {
-    "micromatch": "^4.0.6",
+    "micromatch": "^4.0.8",
     "braces": "^3.0.3"
   },
   "main": "./out/npmMain",

extensions/positron-supervisor/package.json

@@ -141,7 +141,7 @@
   },
   "positron": {
     "binaryDependencies": {
-      "kallichore": "0.1.27"
+      "kallichore": "0.1.28"
     }
   },
   "dependencies": {

extensions/positron-supervisor/src/KallichoreAdapterApi.ts

@@ -422,8 +422,23 @@ export class KCApi implements KallichoreAdapterApi {
 						continue;
 					} else {
 						// Give up; it shouldn't take this long to start
-						this._log.appendLine(`Kallichore server did not start after ${Date.now() - startTime}ms`);
-						throw new Error(`Kallichore server did not start after ${Date.now() - startTime}ms`);
+						let message = `Kallichore server did not start after ${Date.now() - startTime}ms`;
+						this._log.appendLine(message);
+
+						// The error that we're about to throw will show up in
+						// the Console. If there's any content in the log
+						// files, append it to the error message so that the
+						// user can see it without clicking over to the logs.
+						if (fs.existsSync(outFile)) {
+							// Note that we don't need to append this content
+							// to the lgos since the output file is already
+							// being watched by the log streamer.
+							const contents = fs.readFileSync(outFile, 'utf8');
+							if (contents) {
+								message += `; output:\n\n${contents}`;
+							}
+						}
+						throw new Error(message);
 					}
 				}