vscode-eslint 0.0.2 → 0.0.3

package/bin/{vscode-eslint.js → vscode-eslint}

@@ -8,17 +8,18 @@
 'use strict';
 
 const path = require('path');
-const { spawn } = require('child_process');
+const pkg = require('../package.json');
 
 function usage(exitCode = 0) {
 	const msg = [
-		'vscode-eslint (LSP server)',
+		`vscode-eslint (LSP server) v${pkg.version}`,
 		'',
 		'Usage:',
 		'  vscode-eslint --stdio',
 		'',
 		'Options:',
 		'  --stdio     Use stdio transport (LSP over JSON-RPC on stdin/stdout)',
+		'  --version   Show version',
 		'  -h, --help  Show this help',
 	].join('\n');
 	if (exitCode === 0) {
@@ -34,6 +35,11 @@ if (args.includes('-h') || args.includes('--help')) {
 	usage(0);
 }
 
+if (args.includes('--version')) {
+	process.stdout.write(`${pkg.version}\n`);
+	process.exit(0);
+}
+
 const wantsStdio = args.includes('--stdio');
 if (!wantsStdio) {
 	process.stderr.write('error: missing required --stdio\n\n');
@@ -41,16 +47,13 @@ if (!wantsStdio) {
 }
 
 // Run the bundled server produced by server/webpack.config.js
+// We require it directly so it runs in the same process,
+// similar to how typescript-language-server and other LSPs are structured.
 const serverEntry = path.resolve(__dirname, '..', 'server', 'out', 'eslintServer.js');
 
-const child = spawn(process.execPath, [serverEntry], {
-	stdio: 'inherit'
-});
-
-child.on('exit', (code, signal) => {
-	if (signal) {
-		process.exitCode = 1;
-		return;
-	}
-	process.exitCode = code ?? 0;
-});
+try {
+	require(serverEntry);
+} catch (err) {
+	process.stderr.write(`Failed to start ESLint server: ${err.message}\n`);
+	process.exit(1);
+}

package/package.json

@@ -2,7 +2,7 @@
 "name": "vscode-eslint",
 	"displayName": "ESLint",
 	"description": "Integrates ESLint JavaScript into VS Code.",
-"version": "0.0.2",
+"version": "0.0.3",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
 	"repository": {
@@ -14,7 +14,7 @@
 	},
 	"publisher": "dbaeumer",
 	"bin": {
-		"vscode-eslint": "bin/vscode-eslint.js"
+		"vscode-eslint": "bin/vscode-eslint"
 	},
 	"icon": "eslint_icon.png",
 	"categories": [