Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

[json] name & test polishes

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-06-12 17:53:06 +02:00
parent 37aaef5304
commit 966cb81e0a
4 changed files with 156 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
extensions/json/server/src/jsonServerMain.ts
View File

@@ -7,9 +7,7 @@
import {
IPCMessageReader, IPCMessageWriter, createConnection, IConnection,
TextDocuments, TextDocument, Diagnostic, DiagnosticSeverity,
InitializeParams, InitializeResult, TextDocumentPositionParams, CompletionList,
CompletionItem, Hover, SymbolInformation, DocumentFormattingParams, DocumentSymbolParams,
DocumentRangeFormattingParams, NotificationType, RequestType
InitializeParams, InitializeResult, NotificationType, RequestType
} from 'vscode-languageserver';
import {xhr, XHROptions, XHRResponse, configure as configureHttpRequests} from 'request-light';
@@ -267,34 +265,34 @@ function getJSONDocument(document: TextDocument): JSONDocument {
return parseJSON(document.getText());
}
connection.onCompletion((textDocumentPosition: TextDocumentPositionParams): Thenable<CompletionList> => {
connection.onCompletion(textDocumentPosition => {
let document = documents.get(textDocumentPosition.textDocument.uri);
let jsonDocument = getJSONDocument(document);
return jsonCompletion.doSuggest(document, textDocumentPosition.position, jsonDocument);
return jsonCompletion.doComplete(document, textDocumentPosition.position, jsonDocument);
});
connection.onCompletionResolve((item: CompletionItem) : Thenable<CompletionItem> => {
return jsonCompletion.doResolve(item);
connection.onCompletionResolve(completionItem => {
return jsonCompletion.doResolve(completionItem);
});
connection.onHover((textDocumentPosition: TextDocumentPositionParams): Thenable<Hover> => {
let document = documents.get(textDocumentPosition.textDocument.uri);
connection.onHover(textDocumentPositionParams => {
let document = documents.get(textDocumentPositionParams.textDocument.uri);
let jsonDocument = getJSONDocument(document);
return jsonHover.doHover(document, textDocumentPosition.position, jsonDocument);
return jsonHover.doHover(document, textDocumentPositionParams.position, jsonDocument);
});
connection.onDocumentSymbol((documentSymbolParams: DocumentSymbolParams): Thenable<SymbolInformation[]> => {
connection.onDocumentSymbol(documentSymbolParams => {
let document = documents.get(documentSymbolParams.textDocument.uri);
let jsonDocument = getJSONDocument(document);
return jsonDocumentSymbols.compute(document, jsonDocument);
});
connection.onDocumentFormatting((formatParams: DocumentFormattingParams) => {
connection.onDocumentFormatting(formatParams => {
let document = documents.get(formatParams.textDocument.uri);
return formatJSON(document, null, formatParams.options);
});
connection.onDocumentRangeFormatting((formatParams: DocumentRangeFormattingParams) => {
connection.onDocumentRangeFormatting(formatParams => {
let document = documents.get(formatParams.textDocument.uri);
return formatJSON(document, formatParams.range, formatParams.options);
});