vscode-languageserver
Advanced tools
Comparing version 0.10.0-pre.5 to 0.10.0-pre.6
import { LanguageServerError, MessageKind } from './languageServerError'; | ||
import { Response, IRequestHandler, INotificationHandler, ErrorCodes } from 'vscode-jsonrpc'; | ||
import { IRequestHandler, INotificationHandler, ResponseError, ErrorCodes } from 'vscode-jsonrpc'; | ||
import { InitializeParams, InitializeResult, InitializeError, ShutdownParams, ExitParams, DidChangeConfigurationParams, DidOpenTextDocumentParams, DidChangeTextDocumentParams, DidCloseTextDocumentParams, DidChangeFilesParams, FileEvent, FileChangeType, PublishDiagnosticsParams, Diagnostic, Severity, Position } from './protocol'; | ||
import { ISimpleTextDocument } from './textDocuments'; | ||
export { Response, InitializeResult, InitializeError, Diagnostic, Severity, Position, FileEvent, FileChangeType, ErrorCodes }; | ||
export { InitializeResult, InitializeError, Diagnostic, Severity, Position, FileEvent, FileChangeType, ErrorCodes }; | ||
export { LanguageServerError, MessageKind }; | ||
@@ -18,3 +18,3 @@ export { ISimpleTextDocument }; | ||
export interface SingleFileValidator { | ||
initialize?(rootFolder: string): Result<Response<InitializeResult, InitializeError>>; | ||
initialize?(rootFolder: string): Result<InitializeResult | ResponseError<InitializeError>>; | ||
validate(document: ISimpleTextDocument): Result<Diagnostic[]>; | ||
@@ -21,0 +21,0 @@ onConfigurationChange?(settings: any, requestor: IValidationRequestor): void; |
@@ -128,9 +128,9 @@ /*--------------------------------------------------------- | ||
var shutdownHandler = null; | ||
connection.onRequest(protocol_1.ShutdownRequest.type, function (args) { | ||
connection.onRequest(protocol_1.ShutdownRequest.type, function (params) { | ||
shutdownReceived = true; | ||
if (shutdownHandler) { | ||
return shutdownHandler(args); | ||
return shutdownHandler(params); | ||
} | ||
else { | ||
return { success: true }; | ||
return undefined; | ||
} | ||
@@ -248,7 +248,7 @@ }); | ||
} | ||
function createInitializeResponse(initArgs) { | ||
function createInitializeResult(initArgs) { | ||
var resultCapabilities = { | ||
incrementalTextDocumentSync: false | ||
}; | ||
return { result: { capabilities: resultCapabilities } }; | ||
return { capabilities: resultCapabilities }; | ||
} | ||
@@ -258,8 +258,8 @@ connection.onInitialize(function (initArgs) { | ||
if (isFunction(handler.initialize)) { | ||
return doProcess(handler.initialize(rootFolder), function (response) { | ||
if (response && response.error) { | ||
return response; | ||
return doProcess(handler.initialize(rootFolder), function (resultOrError) { | ||
if (resultOrError) { | ||
return resultOrError; | ||
} | ||
else { | ||
return createInitializeResponse(initArgs); | ||
return createInitializeResult(initArgs); | ||
} | ||
@@ -269,10 +269,10 @@ }); | ||
else { | ||
return createInitializeResponse(initArgs); | ||
return createInitializeResult(initArgs); | ||
} | ||
}); | ||
connection.onShutdown(function (shutdownArgs) { | ||
connection.onShutdown(function (params) { | ||
if (isFunction(handler.shutdown)) { | ||
handler.shutdown(); | ||
} | ||
return { success: true }; | ||
return undefined; | ||
}); | ||
@@ -279,0 +279,0 @@ connection.onExit(function () { |
{ | ||
"name": "vscode-languageserver", | ||
"description": "Language server implementation for node", | ||
"version": "0.10.0-pre.5", | ||
"version": "0.10.0-pre.6", | ||
"author": "Microsoft Corporation", | ||
@@ -6,0 +6,0 @@ "license": "MIT", |
35831