Refactored code to make use of interface generics from monaco-editor

package.json

@@ -14,7 +14,7 @@
   },
   "packageManager": "[email protected]",
   "scripts": {
-    "generate": "rm -rf ./src/proto && node generate.js",
+    "generate": "rm -rf ./src/api/proto && node generate.js",
     "rollup": "rollup -c",
     "clean": "rm -rf node_modules && rm -rf dist",
     "test": "echo \"Error: no test specified\" && exit 1",

src/components/CodeiumEditor/CompletionProvider.ts

@@ -19,29 +19,7 @@ import {
 } from "../../api/proto/exa/codeium_common_pb/codeium_common_pb";
 import { Status } from "./Status";
 import { uuid } from "../../utils/uuid";
-
-class MonacoInlineCompletion implements monaco.languages.InlineCompletion {
-  readonly insertText: string;
-  // TODO(prem): Why is this property needed?
-  readonly text: string;
-  readonly range: monaco.IRange;
-  readonly command: {
-    id: string;
-    title: string;
-    arguments: string[];
-  };
-
-  constructor(insertText: string, range: monaco.IRange, completionId: string) {
-    this.insertText = insertText;
-    this.text = insertText;
-    this.range = range;
-    this.command = {
-      id: "codeium.acceptCompletion",
-      title: "Accept Completion",
-      arguments: [completionId, insertText],
-    };
-  }
-}
+import MonacoInlineCompletion from "./InlineCompletion";
 
 /**
  * CompletionProvider class for Codeium.
@@ -81,8 +59,7 @@ export class MonacoCompletionProvider {
     monacoPosition: monaco.Position,
     token: CancellationToken
   ): Promise<
-    | monaco.languages.InlineCompletions<monaco.languages.InlineCompletion>
-    | undefined
+    monaco.languages.InlineCompletions<MonacoInlineCompletion> | undefined
   > {
     const document = new Document(model);
     const position = Position.fromMonaco(monacoPosition);
@@ -144,7 +121,10 @@ export class MonacoCompletionProvider {
       .map((completionItem) =>
         this.createInlineCompletionItem(completionItem, document)
       )
-      .filter((item) => !!item);
+      .filter(
+        (item?: MonacoInlineCompletion): item is MonacoInlineCompletion =>
+          !!item
+      );
 
     this.setStatus(Status.SUCCESS);
     let message = `Generated ${inlineCompletionItems.length} completions`;
@@ -154,7 +134,7 @@ export class MonacoCompletionProvider {
     this.setMessage(message);
 
     return {
-      items: inlineCompletionItems as monaco.languages.InlineCompletion[],
+      items: inlineCompletionItems,
     };
   }
 

src/components/CodeiumEditor/InlineCompletion.ts

@@ -0,0 +1,26 @@
+import * as monaco from "monaco-editor/esm/vs/editor/editor.api";
+
+export default class MonacoInlineCompletion
+  implements monaco.languages.InlineCompletion
+{
+  readonly insertText: string;
+  // TODO(prem): Why is this property needed?
+  readonly text: string;
+  readonly range: monaco.IRange;
+  readonly command: {
+    id: string;
+    title: string;
+    arguments: string[];
+  };
+
+  constructor(insertText: string, range: monaco.IRange, completionId: string) {
+    this.insertText = insertText;
+    this.text = insertText;
+    this.range = range;
+    this.command = {
+      id: "codeium.acceptCompletion",
+      title: "Accept Completion",
+      arguments: [completionId, insertText],
+    };
+  }
+}

src/components/CodeiumEditor/InlineCompletionProvider.ts

@@ -4,6 +4,7 @@ import { PromiseClient } from "@connectrpc/connect";
 import { Status } from "./Status";
 import { MonacoCompletionProvider } from "./CompletionProvider";
 import { LanguageServerService } from "../../api/proto/exa/language_server_pb/language_server_connect";
+import MonacoInlineCompletion from "./InlineCompletion";
 
 declare module "monaco-editor" {
   namespace editor {
@@ -14,7 +15,10 @@ declare module "monaco-editor" {
 }
 
 export class InlineCompletionProvider
-  implements monaco.languages.InlineCompletionsProvider
+  implements
+    monaco.languages.InlineCompletionsProvider<
+      monaco.languages.InlineCompletions<MonacoInlineCompletion>
+    >
 {
   private numCompletionsProvided: number;
   readonly completionProvider: MonacoCompletionProvider;

tsconfig.json

@@ -15,7 +15,7 @@
     "declarationDir": "types",
     "sourceMap": true,
     "outDir": "dist",
-    "moduleResolution": "node",
+    "moduleResolution": "Bundler",
     "allowSyntheticDefaultImports": true,
     "emitDeclarationOnly": true
   }