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

Adding the server and client code to the JSON language features extensions to enable JSONC sorting in VS Code (#174352)

Browse Source 
* temporarily changing the funcion onFromat to be able to trigger the sorting on real examples

* adding the DocumentSortingRequest

* accesssing directly the text edits from the request

* added code in order to provide the link between the json sorting capabiliites and vscode

* adapting to the new api output of the sort function

* instead of using await use then inside of the command that registers

* textEditor replaces window.activeTextEditor

* adding changes from review

* update service

* use SortOptions

---------

Co-authored-by: Martin Aeschlimann <martinae@microsoft.com>
This commit is contained in:
Aiday Marlen Kyzy
2023-02-17 19:49:05 +01:00
committed by GitHub
parent b4e6254d60
commit eee87af252
7 changed files with 113 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
extensions/json-language-features/server/src/jsonServer.ts
View File

@@ -11,7 +11,7 @@ import {
import { runSafe, runSafeAsync } from './utils/runner';
import { DiagnosticsSupport, registerDiagnosticsPullSupport, registerDiagnosticsPushSupport } from './utils/validation';
import { TextDocument, JSONDocument, JSONSchema, getLanguageService, DocumentLanguageSettings, SchemaConfiguration, ClientCapabilities, Range, Position } from 'vscode-json-languageservice';
import { TextDocument, JSONDocument, JSONSchema, getLanguageService, DocumentLanguageSettings, SchemaConfiguration, ClientCapabilities, Range, Position, SortOptions } from 'vscode-json-languageservice';
import { getLanguageModelCache } from './languageModelCache';
import { Utils, URI } from 'vscode-uri';
@@ -39,6 +39,20 @@ namespace LanguageStatusRequest {
export const type: RequestType<string, JSONLanguageStatus, any> = new RequestType('json/languageStatus');
}
export interface DocumentSortingParams {
/**
* The uri of the document to sort.
*/
uri: string;
/**
* The format options
*/
options: SortOptions;
}
namespace DocumentSortingRequest {
export const type: RequestType<DocumentSortingParams, TextEdit[], any> = new RequestType('json/sort');
}
const workspaceContext = {
resolveRelativePath: (relativePath: string, resource: string) => {
@@ -112,9 +126,7 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
let jsonColorDecoratorLimit = Number.MAX_VALUE;
let jsoncColorDecoratorLimit = Number.MAX_VALUE;
let formatterMaxNumberOfEdits = Number.MAX_VALUE;
let diagnosticsSupport: DiagnosticsSupport | undefined;
@@ -295,6 +307,16 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
}
});
connection.onRequest(DocumentSortingRequest.type, async params => {
const uri = params.uri;
const options = params.options;
const document = documents.get(uri);
if (document) {
return languageService.sort(document, options);
}
return [];
});
function updateConfiguration() {
const languageSettings = {
validate: validateEnabled,
@@ -403,6 +425,7 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
});
function onFormat(textDocument: TextDocumentIdentifier, range: Range | undefined, options: FormattingOptions): TextEdit[] {
options.keepLines = keepLinesEnabled;
const document = documents.get(textDocument.uri);
if (document) {