From 16afcb199747eb21684c596dac8bc5cf1defb8e8 Mon Sep 17 00:00:00 2001
From: Andy Zhang <andzhng@gmail.com>
Date: Tue, 13 Feb 2024 12:05:04 -0800
Subject: [PATCH 01/12] Add extension version

---
 rollup.config.js      | 9 ++++++++-
 src/utils/identity.ts | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/rollup.config.js b/rollup.config.js
index 344c7cf..f22f04e 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -5,6 +5,9 @@ import dts from "rollup-plugin-dts";
 import banner2 from 'rollup-plugin-banner2'
 import packageJson from "./package.json" assert { type: "json" };
 
+const version = packageJson.version ?? null;
+
+
 export default [
   {
     input: "src/index.ts",
@@ -26,7 +29,11 @@ export default [
       commonjs(),
       typescript({ tsconfig: "./tsconfig.json" }),
       banner2(() => `
-        "use client";
+"use client";
+
+if (typeof window !== "undefined") {
+  window.CODEIUM_REACT_CODE_VERSION = ${version ? `${JSON.stringify(version)}` : null};
+}
       `)
     ],
   },
diff --git a/src/utils/identity.ts b/src/utils/identity.ts
index 9590ebc..7b1ff39 100644
--- a/src/utils/identity.ts
+++ b/src/utils/identity.ts
@@ -23,7 +23,8 @@ export const getBrowserVersion = () => {
  */
 export const getPackageVersion = () => {
   try {
-    return require('../../package.json').version;
+    // @ts-ignore
+    return window.CODEIUM_REACT_CODE_VERSION ? window.CODEIUM_REACT_CODE_VERSION : null;
   } catch (e) {
     return null;
   }

From 436c248eae17f82d70ee040d6d06acc4da40a694 Mon Sep 17 00:00:00 2001
From: Kevin Hou <k@exafunction.com>
Date: Tue, 13 Feb 2024 13:54:10 -0800
Subject: [PATCH 02/12] Removing logging

---
 src/components/CodeiumEditor/CompletionProvider.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/CodeiumEditor/CompletionProvider.ts b/src/components/CodeiumEditor/CompletionProvider.ts
index b0df60e..4c14c9a 100644
--- a/src/components/CodeiumEditor/CompletionProvider.ts
+++ b/src/components/CodeiumEditor/CompletionProvider.ts
@@ -131,10 +131,6 @@ export class MonacoCompletionProvider {
       );
       includedOtherDocs = includedOtherDocs.slice(0, 10);
     }
-    console.log(
-      `Included other documents: ${includedOtherDocs.length}`,
-      includedOtherDocs.map((d) => d.toJson()),
-    );
 
     // Get completions.
     let getCompletionsResponse: GetCompletionsResponse;

From d3700a9d71984baeb09433382ca4cfd94b114909 Mon Sep 17 00:00:00 2001
From: Kevin Hou <k@exafunction.com>
Date: Tue, 13 Feb 2024 14:13:21 -0800
Subject: [PATCH 03/12] Merge user settings with defaults

---
 .../CodeiumEditor/CodeiumEditor.tsx           | 41 ++++++++++---------
 src/utils/merge.ts                            | 31 ++++++++++++++
 2 files changed, 53 insertions(+), 19 deletions(-)
 create mode 100644 src/utils/merge.ts

diff --git a/src/components/CodeiumEditor/CodeiumEditor.tsx b/src/components/CodeiumEditor/CodeiumEditor.tsx
index 3266d3c..5aab388 100644
--- a/src/components/CodeiumEditor/CodeiumEditor.tsx
+++ b/src/components/CodeiumEditor/CodeiumEditor.tsx
@@ -12,6 +12,7 @@ import { LanguageServerService } from '../../api/proto/exa/language_server_pb/la
 import { InlineCompletionProvider } from './InlineCompletionProvider';
 import { CodeiumLogo } from '../CodeiumLogo/CodeiumLogo';
 import { Document } from '../../models';
+import { deepMerge } from '../../utils/merge';
 
 export interface CodeiumEditorProps extends EditorProps {
   language: string;
@@ -184,26 +185,28 @@ export const CodeiumEditor: React.FC<CodeiumEditorProps> = ({
         width={layout.width}
         height={layout.height}
         onMount={handleEditorDidMount}
-        options={{
-          scrollBeyondLastColumn: 0,
-          scrollbar: {
-            alwaysConsumeMouseWheel: false,
+        options={deepMerge<editor.IStandaloneEditorConstructionOptions>(
+          props.options,
+          {
+            scrollBeyondLastColumn: 0,
+            scrollbar: {
+              alwaysConsumeMouseWheel: false,
+            },
+            codeLens: false,
+            // for resizing, but apparently might have "severe performance impact"
+            // automaticLayout: true,
+            minimap: {
+              enabled: false,
+            },
+            quickSuggestions: false,
+            folding: false,
+            foldingHighlight: false,
+            foldingImportsByDefault: false,
+            links: false,
+            fontSize: 14,
+            wordWrap: 'on',
           },
-          codeLens: false,
-          // for resizing, but apparently might have "severe performance impact"
-          // automaticLayout: true,
-          minimap: {
-            enabled: false,
-          },
-          quickSuggestions: false,
-          folding: false,
-          foldingHighlight: false,
-          foldingImportsByDefault: false,
-          links: false,
-          fontSize: 14,
-          wordWrap: 'on',
-          ...props.options,
-        }}
+        )}
       />
     </div>
   );
diff --git a/src/utils/merge.ts b/src/utils/merge.ts
new file mode 100644
index 0000000..df87541
--- /dev/null
+++ b/src/utils/merge.ts
@@ -0,0 +1,31 @@
+/**
+ * Merges a partial object with a fallback object, deeply combining the two.
+ *
+ * @param {Partial<T>} partial - the partial object to merge (can be undefined)
+ * @param {T} fallback - the fallback object to merge with
+ * @return {T} the merged object
+ */
+export function deepMerge<T>(partial: Partial<T> | undefined, fallback: T): T {
+  const merged: any = { ...fallback };
+
+  for (const key in partial) {
+    if (typeof partial[key] === 'object' && !Array.isArray(partial[key])) {
+      if (
+        fallback[key] &&
+        typeof fallback[key] === 'object' &&
+        !Array.isArray(fallback[key])
+      ) {
+        merged[key] = deepMerge(
+          partial[key] as Partial<T> | undefined,
+          fallback[key] as T,
+        );
+      } else {
+        merged[key] = { ...partial[key] };
+      }
+    } else {
+      merged[key] = partial[key];
+    }
+  }
+
+  return merged;
+}

From 64ad4b4d7ab779ea45dab2ce64aeb132ef0ea95d Mon Sep 17 00:00:00 2001
From: Kevin Hou <k@exafunction.com>
Date: Tue, 13 Feb 2024 14:19:57 -0800
Subject: [PATCH 04/12] Working options merge

---
 src/stories/CodeiumEditor.stories.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/stories/CodeiumEditor.stories.tsx b/src/stories/CodeiumEditor.stories.tsx
index 717f6e8..2d78b7d 100644
--- a/src/stories/CodeiumEditor.stories.tsx
+++ b/src/stories/CodeiumEditor.stories.tsx
@@ -167,6 +167,11 @@ export const MultiFileContext: Story = {
   args: {
     ...baseParams,
     language: 'javascript',
+    options: {
+      scrollbar: {
+        vertical: 'hidden',
+      },
+    },
     value: `// You have context over a sample HTML page.
 // Codeium's generation will take this context into account when suggesting.
 

From 788bae38304e88c4f95bcaaa7ca21e94c029574a Mon Sep 17 00:00:00 2001
From: Andy Zhang <andzhng@gmail.com>
Date: Tue, 13 Feb 2024 14:24:49 -0800
Subject: [PATCH 05/12] Update version to 1.0.9

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 89a2b6b..d5860a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codeium/react-code-editor",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "AI-powered React component",
   "main": "dist/index.js",
   "type": "module",

From 9aa1bec425d451d121513d6c51d3e311bbe0a9ef Mon Sep 17 00:00:00 2001
From: Andy Zhang <andzhng@gmail.com>
Date: Tue, 13 Feb 2024 14:36:08 -0800
Subject: [PATCH 06/12] Update version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d5860a2..dd765ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codeium/react-code-editor",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "AI-powered React component",
   "main": "dist/index.js",
   "type": "module",

From 95abf18947f13a0e85f2903adf5f75511d32fc96 Mon Sep 17 00:00:00 2001
From: Kevin Hou <k@exafunction.com>
Date: Thu, 15 Feb 2024 16:52:52 -0800
Subject: [PATCH 07/12] Plain text editor

---
 .../CodeiumEditor/CodeiumEditor.tsx           | 14 ++++
 src/stories/CodeiumEditor.stories.tsx         | 68 +++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/src/components/CodeiumEditor/CodeiumEditor.tsx b/src/components/CodeiumEditor/CodeiumEditor.tsx
index 5aab388..2b78e7a 100644
--- a/src/components/CodeiumEditor/CodeiumEditor.tsx
+++ b/src/components/CodeiumEditor/CodeiumEditor.tsx
@@ -34,6 +34,16 @@ export interface CodeiumEditorProps extends EditorProps {
    * documents.
    */
   otherDocuments?: Document[];
+
+  /**
+   * Optional classname for the container.
+   */
+  containerClassName?: string;
+
+  /**
+   * Optional styles for the container.
+   */
+  containerStyle?: React.CSSProperties;
 }
 
 /**
@@ -43,6 +53,8 @@ export interface CodeiumEditorProps extends EditorProps {
 export const CodeiumEditor: React.FC<CodeiumEditorProps> = ({
   languageServerAddress = 'https://web-backend.codeium.com',
   otherDocuments = [],
+  containerClassName = '',
+  containerStyle = {},
   ...props
 }) => {
   const editorRef = useRef<editor.IStandaloneCodeEditor | null>(null);
@@ -166,7 +178,9 @@ export const CodeiumEditor: React.FC<CodeiumEditorProps> = ({
       style={{
         ...layout,
         position: 'relative',
+        ...containerStyle,
       }}
+      className={containerClassName}
     >
       <a
         href={'https://codeium.com?referrer=codeium-editor'}
diff --git a/src/stories/CodeiumEditor.stories.tsx b/src/stories/CodeiumEditor.stories.tsx
index 3a0f308..48bad39 100644
--- a/src/stories/CodeiumEditor.stories.tsx
+++ b/src/stories/CodeiumEditor.stories.tsx
@@ -137,6 +137,74 @@ export const MarkdownEditor: Story = {
   },
 };
 
+export const PlainTextEditor: Story = {
+  decorators: (Story) => (
+    <div>
+      <h1>Plain Text</h1>
+      <textarea
+        style={{
+          width: '700px',
+          height: '100px',
+          border: '1px solid black',
+          borderRadius: '2px',
+          padding: '6px',
+          fontFamily: 'sans-serif',
+        }}
+        placeholder="Type something"
+      />
+      <Story />
+    </div>
+  ),
+  args: {
+    ...baseParams,
+    language: 'markdown',
+    value: 'This is a test textarea. Lorem',
+    containerStyle: {
+      border: '1px solid black',
+      borderRadius: '2px',
+      padding: '6px',
+    },
+    options: {
+      scrollbar: {
+        vertical: 'hidden',
+        horizontal: 'hidden',
+      },
+      renderControlCharacters: false,
+      glyphMargin: false,
+      rulers: [],
+      overviewRulerLanes: 0,
+      overviewRulerBorder: false,
+      wordWrap: 'on',
+      renderLineHighlight: 'none',
+      lineNumbers: 'off',
+      renderWhitespace: 'none',
+      hideCursorInOverviewRuler: true,
+      scrollBeyondLastLine: false,
+      smoothScrolling: true,
+      folding: false,
+      fontFamily: 'Helvetica',
+      fontSize: 13,
+      language: 'plaintext',
+      lineDecorationsWidth: 0,
+      minimap: {
+        enabled: false,
+      },
+      occurrencesHighlight: 'off',
+      cursorStyle: 'line-thin',
+      hover: {
+        enabled: false,
+      },
+      selectionHighlight: false,
+      find: {
+        seedSearchStringFromSelection: 'never',
+      },
+      multiCursorLimit: 1,
+      links: false,
+      matchBrackets: 'never',
+    },
+  },
+};
+
 const HTML_SNIPPET = `<html>
   <head>
     <title>Contact Form</title>

From 0ff9dcf04fc24ee4469d3c0062d7b9eae3a1ee1c Mon Sep 17 00:00:00 2001
From: Kevin Hou <k@exafunction.com>
Date: Fri, 16 Feb 2024 08:43:29 -0500
Subject: [PATCH 08/12] Add multiline model proto

---
 exa/language_server_pb/language_server.proto | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/exa/language_server_pb/language_server.proto b/exa/language_server_pb/language_server.proto
index a324f08..e620593 100644
--- a/exa/language_server_pb/language_server.proto
+++ b/exa/language_server_pb/language_server.proto
@@ -15,6 +15,12 @@ service LanguageServerService {
   rpc GetAuthToken(GetAuthTokenRequest) returns (GetAuthTokenResponse) {}
 }
 
+message MultilineConfig {
+  // Multiline model threshold. 0-1, higher = more single line, lower = more multiline,
+  // 0.0 = only_multiline, default is 0.5
+  float threshold = 1;
+}
+
 // Next ID: 9, Previous field: disable_cache.
 message GetCompletionsRequest {
   codeium_common_pb.Metadata metadata = 1 [(validate.rules).message.required = true];
@@ -24,6 +30,7 @@ message GetCompletionsRequest {
   ExperimentConfig experiment_config = 7;
 
   string model_name = 10;
+  MultilineConfig multiline_config = 13;
 }
 
 // Next ID: 5, Previous field: latency_info.

From 4baf9309bc562bdeba86cab4ec1529447181b518 Mon Sep 17 00:00:00 2001
From: Kevin Hou <k@exafunction.com>
Date: Fri, 16 Feb 2024 08:52:15 -0500
Subject: [PATCH 09/12] New prop for multiline model threshold

---
 src/components/CodeiumEditor/CodeiumEditor.tsx           | 8 ++++++++
 src/components/CodeiumEditor/CompletionProvider.ts       | 6 ++++++
 src/components/CodeiumEditor/InlineCompletionProvider.ts | 2 ++
 3 files changed, 16 insertions(+)

diff --git a/src/components/CodeiumEditor/CodeiumEditor.tsx b/src/components/CodeiumEditor/CodeiumEditor.tsx
index 2b78e7a..fe21e13 100644
--- a/src/components/CodeiumEditor/CodeiumEditor.tsx
+++ b/src/components/CodeiumEditor/CodeiumEditor.tsx
@@ -44,6 +44,13 @@ export interface CodeiumEditorProps extends EditorProps {
    * Optional styles for the container.
    */
   containerStyle?: React.CSSProperties;
+
+  /**
+   * Optional multiline model threshold. Should not be needed for most use cases.
+   * Numerical value between 0-1, higher = more single line, lower = more multiline,
+   * 0.0 = only_multiline, default is 0.5.
+   */
+  multilineModelThreshold?: number;
 }
 
 /**
@@ -86,6 +93,7 @@ export const CodeiumEditor: React.FC<CodeiumEditorProps> = ({
       setCodeiumStatus,
       setCodeiumStatusMessage,
       props.apiKey,
+      props.multilineModelThreshold,
     );
   }, []);
 
diff --git a/src/components/CodeiumEditor/CompletionProvider.ts b/src/components/CodeiumEditor/CompletionProvider.ts
index 4c14c9a..2972970 100644
--- a/src/components/CodeiumEditor/CompletionProvider.ts
+++ b/src/components/CodeiumEditor/CompletionProvider.ts
@@ -62,6 +62,7 @@ export class MonacoCompletionProvider {
     readonly setStatus: (status: Status) => void,
     readonly setMessage: (message: string) => void,
     readonly apiKey?: string | undefined,
+    readonly multilineModelThreshold?: number | undefined,
   ) {
     this.sessionId = `react-editor-${uuid()}`;
     this.client = grpcClient;
@@ -141,6 +142,11 @@ export class MonacoCompletionProvider {
           document: documentInfo,
           editorOptions: editorOptions,
           otherDocuments: includedOtherDocs,
+          multilineConfig: this.multilineModelThreshold
+            ? {
+                threshold: this.multilineModelThreshold,
+              }
+            : undefined,
         },
         {
           signal,
diff --git a/src/components/CodeiumEditor/InlineCompletionProvider.ts b/src/components/CodeiumEditor/InlineCompletionProvider.ts
index c44b91d..f8be118 100644
--- a/src/components/CodeiumEditor/InlineCompletionProvider.ts
+++ b/src/components/CodeiumEditor/InlineCompletionProvider.ts
@@ -26,6 +26,7 @@ export class InlineCompletionProvider
     setCodeiumStatus: Dispatch<SetStateAction<Status>>,
     setCodeiumStatusMessage: Dispatch<SetStateAction<string>>,
     apiKey?: string | undefined,
+    multilineModelThreshold?: number | undefined,
   ) {
     this.numCompletionsProvided = 0;
     this.completionProvider = new MonacoCompletionProvider(
@@ -33,6 +34,7 @@ export class InlineCompletionProvider
       setCodeiumStatus,
       setCodeiumStatusMessage,
       apiKey,
+      multilineModelThreshold,
     );
   }
 

From 9409224bc3710696e75b877a6659187cd504462f Mon Sep 17 00:00:00 2001
From: Kevin Hou <k@exafunction.com>
Date: Fri, 16 Feb 2024 09:07:06 -0500
Subject: [PATCH 10/12] Multiline threshold storybook

---
 src/components/CodeiumEditor/CodeiumEditor.tsx     |  2 +-
 src/components/CodeiumEditor/CompletionProvider.ts | 14 +++++++++-----
 src/stories/CodeiumEditor.stories.tsx              |  1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/CodeiumEditor/CodeiumEditor.tsx b/src/components/CodeiumEditor/CodeiumEditor.tsx
index fe21e13..73911ea 100644
--- a/src/components/CodeiumEditor/CodeiumEditor.tsx
+++ b/src/components/CodeiumEditor/CodeiumEditor.tsx
@@ -48,7 +48,7 @@ export interface CodeiumEditorProps extends EditorProps {
   /**
    * Optional multiline model threshold. Should not be needed for most use cases.
    * Numerical value between 0-1, higher = more single line, lower = more multiline,
-   * 0.0 = only_multiline, default is 0.5.
+   * 0.0 = only_multiline.
    */
   multilineModelThreshold?: number;
 }
diff --git a/src/components/CodeiumEditor/CompletionProvider.ts b/src/components/CodeiumEditor/CompletionProvider.ts
index 2972970..5765362 100644
--- a/src/components/CodeiumEditor/CompletionProvider.ts
+++ b/src/components/CodeiumEditor/CompletionProvider.ts
@@ -4,6 +4,7 @@ import {
   Document as DocumentInfo,
   GetCompletionsResponse,
   CompletionItem,
+  MultilineConfig,
 } from '../../api/proto/exa/language_server_pb/language_server_pb';
 import { Document } from './Document';
 import { Position, Range } from './Location';
@@ -133,6 +134,13 @@ export class MonacoCompletionProvider {
       includedOtherDocs = includedOtherDocs.slice(0, 10);
     }
 
+    let multilineConfig: MultilineConfig | undefined = undefined;
+    if (this.multilineModelThreshold !== undefined) {
+      multilineConfig = new MultilineConfig({
+        threshold: this.multilineModelThreshold,
+      });
+    }
+
     // Get completions.
     let getCompletionsResponse: GetCompletionsResponse;
     try {
@@ -142,11 +150,7 @@ export class MonacoCompletionProvider {
           document: documentInfo,
           editorOptions: editorOptions,
           otherDocuments: includedOtherDocs,
-          multilineConfig: this.multilineModelThreshold
-            ? {
-                threshold: this.multilineModelThreshold,
-              }
-            : undefined,
+          multilineConfig,
         },
         {
           signal,
diff --git a/src/stories/CodeiumEditor.stories.tsx b/src/stories/CodeiumEditor.stories.tsx
index 48bad39..ae69398 100644
--- a/src/stories/CodeiumEditor.stories.tsx
+++ b/src/stories/CodeiumEditor.stories.tsx
@@ -159,6 +159,7 @@ export const PlainTextEditor: Story = {
     ...baseParams,
     language: 'markdown',
     value: 'This is a test textarea. Lorem',
+    multilineModelThreshold: 1.0,
     containerStyle: {
       border: '1px solid black',
       borderRadius: '2px',

From 960d29c1c4279e22b40cb354cf0ee3596b967cf7 Mon Sep 17 00:00:00 2001
From: Andy Zhang <andzhng@gmail.com>
Date: Fri, 16 Feb 2024 10:32:47 -0800
Subject: [PATCH 11/12] Run generate before compiling

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index dd765ed..1232a05 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codeium/react-code-editor",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "AI-powered React component",
   "main": "dist/index.js",
   "type": "module",
@@ -21,7 +21,7 @@
     "storybook": "storybook dev -p 6006 --no-open",
     "build-storybook": "storybook build",
     "format": "prettier --write 'src/**/*.{ts,tsx}'",
-    "prepare": "npm run rollup"
+    "prepare": "pnpm run generate && pnpm run rollup"
   },
   "repository": {
     "type": "git",

From d8c7819b0a40d06c38a1e24c3ceb2947e5badbcd Mon Sep 17 00:00:00 2001
From: Andy Zhang <andzhng@gmail.com>
Date: Fri, 16 Feb 2024 11:13:38 -0800
Subject: [PATCH 12/12] Remove bloat

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1232a05..504987a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codeium/react-code-editor",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "AI-powered React component",
   "main": "dist/index.js",
   "type": "module",