daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleaning the code

pull/191809/head
Aiday Marlen Kyzy 2023-08-31 15:34:10 +02:00
parent 06fdc0a633
commit 7069433804
No known key found for this signature in database
GPG Key ID: 24A8B53DBD26FF4E
2 changed files with 16 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
extensions/json-language-features/client/src/jsonClient.ts
View File

@ -8,12 +8,12 @@ export type JSONLanguageStatus = { schemas: string[] };
import {
workspace, window, languages, commands, ExtensionContext, extensions, Uri, ColorInformation,
Diagnostic, StatusBarAlignment, TextEditor, TextDocument, FormattingOptions, CancellationToken, FoldingRange,
ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n, CodeActionContext, CodeAction, Command, CodeActionProvider, Selection, CodeActionKind,
ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n
} from 'vscode';
import {
LanguageClientOptions, RequestType, NotificationType, FormattingOptions as LSPFormattingOptions,
DidChangeConfigurationNotification, HandleDiagnosticsSignature, ResponseError, DocumentRangeFormattingParams,
DocumentRangeFormattingRequest, ProvideCompletionItemsSignature, ProvideHoverSignature, BaseLanguageClient, ProvideFoldingRangeSignature, ProvideDocumentSymbolsSignature, ProvideDocumentColorsSignature, ProvideCodeActionsSignature
DocumentRangeFormattingRequest, ProvideCompletionItemsSignature, ProvideHoverSignature, BaseLanguageClient, ProvideFoldingRangeSignature, ProvideDocumentSymbolsSignature, ProvideDocumentColorsSignature
} from 'vscode-languageclient';
@ -190,35 +190,6 @@ export async function startClient(context: ExtensionContext, newLanguageClient:
}
}));
class JSONCodeActionProvider implements CodeActionProvider {
provideCodeActions(document: TextDocument, range: Range | Selection, context: CodeActionContext, token: CancellationToken): ProviderResult<(CodeAction | Command)[]> {
console.log('inside of provide code actions');
const codeActions: CodeAction[] = [];
const sortCodeAction = new CodeAction('Sort JSON', CodeActionKind.Source);
sortCodeAction.command = {
command: 'json.sort',
title: 'Sort JSON'
};
return codeActions;
}
}
languages.registerCodeActionsProvider('*', new JSONCodeActionProvider());
// connection.onCodeAction((_codeActionParams, token) => {
// return runSafe(runtime, () => {
// console.log('Inside of on code action');
// const codeActions: CodeAction[] = [];
// const sortCodeAction = CodeAction.create('Sort JSON', CodeActionKind.Source);
// sortCodeAction.command = {
// command: 'json.sort',
// title: 'Sort JSON'
// };
// return codeActions;
// }, [], `Error while retrieving code actions`, token);
// });
// Options to control the language client
const clientOptions: LanguageClientOptions = {
// Register the server for json documents
@ -331,17 +302,7 @@ export async function startClient(context: ExtensionContext, newLanguageClient:
return r.then(checkLimit);
}
return checkLimit(r);
},
// provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken, next: ProvideCodeActionsSignature) {
// console.log('inside of provide code actions');
// console.log('next : ', next);
// const r = next(document, range, context, token);
// console.log('r : ', r);
// if (isThenable<(Command | CodeAction)[] | null | undefined>(r)) {
// return r;
// }
// return r;
// }
}
}
};

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

@ -425,25 +425,21 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
}, [], `Error while computing document symbols for ${documentSymbolParams.textDocument.uri}`, token);
});
//
connection.onCodeAction((_codeActionParams, token) => {
return runSafe(runtime, () => {
console.log('Inside of on code action');
const codeActions: CodeAction[] = [];
const sortCodeAction = CodeAction.create('Sort JSON', CodeActionKind.Source);
sortCodeAction.command = {
command: 'json.sort',
title: 'Sort JSON'
};
return codeActions;
}, [], `Error while retrieving code actions`, token);
connection.onCodeAction((codeActionParams, token) => {
return runSafeAsync(runtime, async () => {
const document = documents.get(codeActionParams.textDocument.uri);
if (document) {
const sortCodeAction = CodeAction.create('Sort JSON', CodeActionKind.Source);
sortCodeAction.command = {
command: 'json.sort',
title: 'Sort JSON'
};
return [sortCodeAction];
}
return [];
}, [], `Error while computing code actions for ${codeActionParams.textDocument.uri}`, token);
});
connection.onCodeActionResolve(async (codeAction, token) => {
return codeAction;
});
//
function onFormat(textDocument: TextDocumentIdentifier, range: Range | undefined, options: FormattingOptions): TextEdit[] {
options.keepLines = keepLinesEnabled;