Refactor types

src/autocomplete/InlineCompletionRouter.ts

@@ -1,4 +1,4 @@
-import { InlineCompletionList, InlineCompletionParams } from 'vscode-languageserver-protocol';
+import { InlineCompletionList, InlineCompletionParams, InlineCompletionItem } from 'vscode-languageserver-protocol';
 import { ContextManager } from '../context/ContextManager';
 import { Closeable, Configurable, ServerComponents } from '../server/ServerComponents';
 import {
@@ -11,6 +11,7 @@ import {
 import { LoggerFactory } from '../telemetry/LoggerFactory';
 
 export type InlineCompletionProviderType = 'ResourceBlock' | 'PropertyBlock' | 'TemplateSection' | 'AIGenerated';
+type ReturnType = InlineCompletionList | InlineCompletionItem[] | null | undefined;
 
 export class InlineCompletionRouter implements Configurable, Closeable {
     private completionSettings: CompletionSettings = DefaultSettings.completion;
@@ -21,9 +22,7 @@ export class InlineCompletionRouter implements Configurable, Closeable {
 
     constructor(private readonly contextManager: ContextManager) {}
 
-    getInlineCompletions(
-        params: InlineCompletionParams,
-    ): Promise<InlineCompletionList> | InlineCompletionList | undefined {
+    getInlineCompletions(params: InlineCompletionParams): Promise<ReturnType> | ReturnType {
         if (!this.completionSettings.enabled) return;
 
         const context = this.contextManager.getContext(params);

src/handlers/InlineCompletionHandler.ts

@@ -1,14 +1,14 @@
-import { ServerRequestHandler } from 'vscode-languageserver/lib/common/server';
-import { InlineCompletionParams, InlineCompletionList } from 'vscode-languageserver-protocol';
+import { RequestHandler } from 'vscode-languageserver/node';
+import { InlineCompletionParams, InlineCompletionList, InlineCompletionItem } from 'vscode-languageserver-protocol';
 import { ServerComponents } from '../server/ServerComponents';
 import { LoggerFactory } from '../telemetry/LoggerFactory';
 
 const log = LoggerFactory.getLogger('InlineCompletionHandler');
 
 export function inlineCompletionHandler(
     components: ServerComponents,
-): ServerRequestHandler<InlineCompletionParams, InlineCompletionList | undefined | null, never, void> {
-    return (params, _token, _workDoneProgress, _resultProgress) => {
+): RequestHandler<InlineCompletionParams, InlineCompletionList | InlineCompletionItem[] | null | undefined, void> {
+    return (params, _token) => {
         log.debug({
             Handler: 'InlineCompletion',
             Document: params.textDocument.uri,

src/protocol/LspAuthHandlers.ts

@@ -1,4 +1,4 @@
-import { Connection, RequestHandler, NotificationHandler } from 'vscode-languageserver/node';
+import { Connection, RequestHandler, NotificationHandler } from 'vscode-languageserver';
 import {
     IamCredentialsUpdateRequest,
     BearerCredentialsUpdateRequest,

src/protocol/LspCommunication.ts

@@ -1,12 +1,12 @@
-import { Connection, ShowMessageRequestParams, RemoteConsole } from 'vscode-languageserver/node';
+import { Connection, ShowMessageRequestParams, RemoteConsole } from 'vscode-languageserver';
 import {
     LogMessageParams,
     MessageActionItem,
     ShowMessageParams,
     ShowMessageNotification,
     ShowMessageRequest,
     LogMessageNotification,
-} from 'vscode-languageserver-protocol/lib/common/protocol';
+} from 'vscode-languageserver-protocol';
 
 export class LspCommunication {
     public readonly console: RemoteConsole;

src/protocol/LspDocuments.ts

@@ -1,4 +1,4 @@
-import { TextDocumentChangeEvent } from 'vscode-languageserver/lib/common/textDocuments';
+import { TextDocumentChangeEvent } from 'vscode-languageserver';
 import { TextDocuments, Connection } from 'vscode-languageserver/node';
 import { DidChangeTextDocumentParams, NotificationHandler } from 'vscode-languageserver-protocol';
 import { TextDocument } from 'vscode-languageserver-textdocument';

src/protocol/LspHandlers.ts

@@ -1,4 +1,4 @@
-import { ServerRequestHandler } from 'vscode-languageserver/lib/common/server';
+import { ServerRequestHandler } from 'vscode-languageserver';
 import {
     Connection,
     NotificationHandler,
@@ -30,6 +30,8 @@ import {
     InlineCompletionList,
     InlineCompletionParams,
     SignatureHelpParams,
+    InlineCompletionRequest,
+    InlineCompletionItem,
 } from 'vscode-languageserver-protocol';
 
 export class LspHandlers {
@@ -115,9 +117,13 @@ export class LspHandlers {
     }
 
     onInlineCompletion(
-        handler: ServerRequestHandler<InlineCompletionParams, InlineCompletionList | undefined | null, never, void>,
+        handler: RequestHandler<
+            InlineCompletionParams,
+            InlineCompletionList | InlineCompletionItem[] | null | undefined,
+            void
+        >,
     ) {
-        this.connection.onRequest('textDocument/inlineCompletion', handler);
+        this.connection.onRequest(InlineCompletionRequest.type, handler);
     }
 
     onDidChangeConfiguration(handler: NotificationHandler<DidChangeConfigurationParams>) {

tst/unit/handlers/InlineCompletionHandler.test.ts

@@ -36,7 +36,7 @@ describe('InlineCompletionHandler', () => {
         mockServices.inlineCompletionRouter.getInlineCompletions.returns(mockInlineCompletions);
 
         const handler = inlineCompletionHandler(mockServices);
-        const result = handler(mockParams, CancellationToken.None, undefined as any, undefined as any);
+        const result = handler(mockParams, CancellationToken.None);
 
         expect(mockServices.inlineCompletionRouter.getInlineCompletions.calledOnce).toBe(true);
         expect(mockServices.inlineCompletionRouter.getInlineCompletions.calledWith(mockParams)).toBe(true);
@@ -47,7 +47,7 @@ describe('InlineCompletionHandler', () => {
         mockServices.inlineCompletionRouter.getInlineCompletions.returns(undefined);
 
         const handler = inlineCompletionHandler(mockServices);
-        const result = handler(mockParams, CancellationToken.None, undefined as any, undefined as any);
+        const result = handler(mockParams, CancellationToken.None);
 
         expect(result).toBeUndefined();
     });
@@ -68,7 +68,7 @@ describe('InlineCompletionHandler', () => {
         mockServices.inlineCompletionRouter.getInlineCompletions.returns(Promise.resolve(mockInlineCompletions));
 
         const handler = inlineCompletionHandler(mockServices);
-        const result = await handler(mockParams, CancellationToken.None, undefined as any, undefined as any);
+        const result = await handler(mockParams, CancellationToken.None);
 
         expect(result).toEqual(mockInlineCompletions);
     });
@@ -84,7 +84,7 @@ describe('InlineCompletionHandler', () => {
         mockServices.inlineCompletionRouter.getInlineCompletions.returns({ items: [] });
 
         const handler = inlineCompletionHandler(mockServices);
-        handler(automaticParams, CancellationToken.None, undefined as any, undefined as any);
+        handler(automaticParams, CancellationToken.None);
 
         expect(mockServices.inlineCompletionRouter.getInlineCompletions.calledWith(automaticParams)).toBe(true);
     });
@@ -98,7 +98,7 @@ describe('InlineCompletionHandler', () => {
         mockServices.inlineCompletionRouter.getInlineCompletions.returns({ items: [] });
 
         const handler = inlineCompletionHandler(mockServices);
-        handler(jsonParams, CancellationToken.None, undefined as any, undefined as any);
+        handler(jsonParams, CancellationToken.None);
 
         expect(mockServices.inlineCompletionRouter.getInlineCompletions.calledWith(jsonParams)).toBe(true);
     });
@@ -112,7 +112,7 @@ describe('InlineCompletionHandler', () => {
         mockServices.inlineCompletionRouter.getInlineCompletions.returns({ items: [] });
 
         const handler = inlineCompletionHandler(mockServices);
-        handler(positionParams, CancellationToken.None, undefined as any, undefined as any);
+        handler(positionParams, CancellationToken.None);
 
         expect(mockServices.inlineCompletionRouter.getInlineCompletions.calledWith(positionParams)).toBe(true);
     });