Upgrade to latest LSP version. Make use of new CodeAction. Fixes #437

CHANGELOG.md

@@ -1,3 +1,12 @@
+### 1.4.12
+
+- Upgrade to latest version of the LSP libraries
+- Fixes [eslint server crashed 5 times in the last 3 minutes. the server will not be restarted.](https://github.com/Microsoft/vscode-eslint/issues/437)
+
+### 1.4.11
+
+Internal version to track down [eslint server crashed 5 times in the last 3 minutes. the server will not be restarted.](https://github.com/Microsoft/vscode-eslint/issues/437)
+
 ### 1.4.10
 
 - [Add Command to create a YAML configuration](https://github.com/Microsoft/vscode-eslint/issues/409)

client/package.json

@@ -23,6 +23,6 @@
 		"vscode": "^1.1.17"
 	},
 	"dependencies": {
-		"vscode-languageclient": "^4.1.4"
+		"vscode-languageclient": "^4.2.1"
 	}
 }

client/src/extension.ts

@@ -8,7 +8,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 import {
 	workspace as Workspace, window as Window, commands as Commands, languages as Languages, Disposable, ExtensionContext, Uri, StatusBarAlignment, TextDocument,
-	CodeActionContext, Diagnostic, ProviderResult, Command, QuickPickItem, WorkspaceFolder as VWorkspaceFolder
+	CodeActionContext, Diagnostic, ProviderResult, Command, QuickPickItem, WorkspaceFolder as VWorkspaceFolder, CodeAction
 } from 'vscode';
 import {
 	LanguageClient, LanguageClientOptions, RequestType, TransportKind,
@@ -373,16 +373,6 @@ export function realActivate(context: ExtensionContext) {
 				Workspace.createFileSystemWatcher('**/package.json')
 			]
 		},
-		initializationOptions: () => {
-			let configuration = Workspace.getConfiguration('eslint');
-			let folders = Workspace.workspaceFolders;
-			return {
-				legacyModuleResolve: configuration ? configuration.get('_legacyModuleResolve', false) : false,
-				nodePath: configuration ? configuration.get('nodePath', undefined) : undefined,
-				languageIds: configuration ? configuration.get('valiadate', defaultLanguages) : defaultLanguages,
-				workspaceFolders: folders ? folders.map(folder => folder.toString()) : []
-			};
-		},
 		initializationFailedHandler: (error) => {
 			client.error('Server initialization failed.', error);
 			client.outputChannel.show(true);
@@ -436,7 +426,7 @@ export function realActivate(context: ExtensionContext) {
 					next(document);
 				}
 			},
-			provideCodeActions: (document, range, context, token, next): ProviderResult<Command[]> => {
+			provideCodeActions: (document, range, context, token, next): ProviderResult<(Command | CodeAction)[]> => {
 				if (!syncedDocuments.has(document.uri.toString()) || !context.diagnostics || context.diagnostics.length === 0) {
 					return [];
 				}

package.json

@@ -2,7 +2,7 @@
 	"name": "vscode-eslint",
 	"displayName": "ESLint",
 	"description": "Integrates ESLint JavaScript into VS Code.",
-	"version": "1.4.10",
+	"version": "1.4.12",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
 	"repository": {
@@ -22,7 +22,7 @@
 		"multi-root ready"
 	],
 	"engines": {
-		"vscode": "^1.16.0"
+		"vscode": "^1.23.0"
 	},
 	"activationEvents": [
 		"*"
@@ -212,7 +212,7 @@
 		"postinstall": "cd client && npm install && cd ../server && npm install && cd .."
 	},
 	"devDependencies": {
-		"typescript": "^2.8.3",
-		"@types/node": "^6.0.90"
+		"typescript": "^2.9.1",
+		"@types/node": "^8.0.0"
 	}
 }

server/package.json

@@ -15,7 +15,7 @@
 	},
 	"dependencies": {
 		"vscode-uri": "^1.0.1",
-		"vscode-languageserver": "^4.1.3"
+		"vscode-languageserver": "^4.2.1"
 	},
 	"scripts": {}
 }

server/src/eslintServer.ts

@@ -13,7 +13,7 @@ import {
 	Command, WorkspaceChange,
 	CodeActionRequest, VersionedTextDocumentIdentifier,
 	ExecuteCommandRequest, DidChangeWatchedFilesNotification, DidChangeConfigurationNotification,
-	WorkspaceFolder, DidChangeWorkspaceFoldersNotification
+	WorkspaceFolder, DidChangeWorkspaceFoldersNotification, CodeAction, CodeActionKind
 } from 'vscode-languageserver';
 
 import URI from 'vscode-uri';
@@ -293,13 +293,13 @@ function getFilePath(documentOrUri: string | TextDocument): string {
 const exitCalled = new NotificationType<[number, string], void>('eslint/exitCalled');
 
 const nodeExit = process.exit;
-process.exit = (code?: number) => {
+process.exit = ((code?: number): void => {
 	let stack = new Error('stack');
 	connection.sendNotification(exitCalled, [code ? code : 0, stack.stack]);
 	setTimeout(() => {
 		nodeExit(code);
 	}, 1000);
-}
+}) as any;
 process.on('uncaughtException', (error: any) => {
 	let message: string;
 	if (error) {
@@ -1014,7 +1014,7 @@ class Fixes {
 let commands: Map<string, WorkspaceChange>;
 messageQueue.registerRequest(CodeActionRequest.type, (params) => {
 	commands = new Map<string, WorkspaceChange>();
-	let result: Command[] = [];
+	let result: CodeAction[] = [];
 	let uri = params.textDocument.uri;
 	let edits = codeActions.get(uri);
 	if (!edits) {
@@ -1048,14 +1048,17 @@ messageQueue.registerRequest(CodeActionRequest.type, (params) => {
 		let workspaceChange = new WorkspaceChange();
 		workspaceChange.getTextEditChange({uri, version: documentVersion}).add(createTextEdit(editInfo));
 		commands.set(CommandIds.applySingleFix, workspaceChange);
-		result.push(Command.create(editInfo.label, CommandIds.applySingleFix));
+		result.push(CodeAction.create(
+			editInfo.label,
+			Command.create(editInfo.label, CommandIds.applySingleFix),
+			CodeActionKind.QuickFix
+		));
 	};
 
 	if (result.length > 0) {
 		let same: AutoFix[] = [];
 		let all: AutoFix[] = [];
 
-
 		for (let editInfo of fixes.getAllSorted()) {
 			if (documentVersion === -1) {
 				documentVersion = editInfo.documentVersion;
@@ -1072,14 +1075,24 @@ messageQueue.registerRequest(CodeActionRequest.type, (params) => {
 			let sameTextChange = sameFixes.getTextEditChange({uri, version: documentVersion});
 			same.map(createTextEdit).forEach(edit => sameTextChange.add(edit));
 			commands.set(CommandIds.applySameFixes, sameFixes);
-			result.push(Command.create(`Fix all ${ruleId} problems`, CommandIds.applySameFixes));
+			let title = `Fix all ${ruleId} problems`;
+			result.push(CodeAction.create(
+				title,
+				Command.create(title, CommandIds.applySameFixes),
+				CodeActionKind.QuickFix
+			));
 		}
 		if (all.length > 1) {
 			let allFixes: WorkspaceChange = new WorkspaceChange();
 			let allTextChange = allFixes.getTextEditChange({uri, version: documentVersion});
 			all.map(createTextEdit).forEach(edit => allTextChange.add(edit));
 			commands.set(CommandIds.applyAllFixes, allFixes);
-			result.push(Command.create(`Fix all auto-fixable problems`, CommandIds.applyAllFixes));
+			let title = `Fix all auto-fixable problems`;
+			result.push(CodeAction.create(
+				title,
+				Command.create(title, CommandIds.applyAllFixes),
+				CodeActionKind.QuickFix
+			));
 		}
 	}
 	return result;